Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/attachments/www/attach.adp	29 May 2009 18:13:24 -0000	1.13
+++ openacs-4/packages/attachments/www/attach.adp	3 Jul 2015 10:50:52 -0000	1.14
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>#attachments.lt_You_are_attaching_a_d#</p>
 
Index: openacs-4/packages/attachments/www/detach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/detach.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/attachments/www/detach.adp	27 Oct 2014 16:41:05 -0000	1.3
+++ openacs-4/packages/attachments/www/detach.adp	3 Jul 2015 10:50:52 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   
 <formtemplate id="detach"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/attachments/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/attachments/www/file-add.adp	16 Jun 2015 09:56:50 -0000	1.11
+++ openacs-4/packages/attachments/www/file-add.adp	3 Jul 2015 10:50:52 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#attachments.lt_Upload_New_Attachment#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>#attachments.you_are_attaching_document_to_object#</p>
 
Index: openacs-4/packages/attachments/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/simple-add.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/attachments/www/simple-add.adp	16 Jun 2015 09:56:50 -0000	1.10
+++ openacs-4/packages/attachments/www/simple-add.adp	3 Jul 2015 10:50:52 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#attachments.Attach_URL#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 #attachments.you_are_attaching_url_to_object#
Index: openacs-4/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/general-comments/www/comment-ae-2.adp	17 Jun 2015 07:19:50 -0000	1.11
+++ openacs-4/packages/general-comments/www/comment-ae-2.adp	3 Jul 2015 10:50:52 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 #general-comments.lt_Here_is_how_your_comm#
 
Index: openacs-4/packages/general-comments/www/comment-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/comment-ae.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/general-comments/www/comment-ae.adp	17 Jun 2015 07:19:50 -0000	1.11
+++ openacs-4/packages/general-comments/www/comment-ae.adp	3 Jul 2015 10:50:52 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <property name="focus">comment.title</property>
 
 <form action="@target@" method="post" name="comment" class="margin-form">
Index: openacs-4/packages/general-comments/www/delete-attachment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/delete-attachment.adp	17 Jun 2015 07:19:50 -0000	1.7
+++ openacs-4/packages/general-comments/www/delete-attachment.adp	3 Jul 2015 10:50:52 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 #general-comments.lt_Do_you_really_wish_to_1#
 <p>
Index: openacs-4/packages/general-comments/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/general-comments/www/delete.adp	17 Jun 2015 07:19:50 -0000	1.4
+++ openacs-4/packages/general-comments/www/delete.adp	3 Jul 2015 10:50:52 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 #general-comments.lt_Do_you_really_wish_to#
Index: openacs-4/packages/general-comments/www/file-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/www/file-ae.adp	17 Jun 2015 07:19:50 -0000	1.8
+++ openacs-4/packages/general-comments/www/file-ae.adp	3 Jul 2015 10:50:52 -0000	1.9
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="parent_id">@parent_id;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="parent_id">@parent_id;literal@</property>
 
 <form enctype="multipart/form-data" method=POST action="@target@">
 <div><%= [export_vars -form {attach_id parent_id return_url}] %></div>
Index: openacs-4/packages/general-comments/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/general-comments/www/index.adp	27 Oct 2014 16:41:43 -0000	1.6
+++ openacs-4/packages/general-comments/www/index.adp	3 Jul 2015 10:50:52 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @admin_p@ eq 1>
   [ <a href="admin/">#general-comments.Administer#</a> ]
Index: openacs-4/packages/general-comments/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/test.adp	17 Jun 2015 07:19:50 -0000	1.7
+++ openacs-4/packages/general-comments/www/test.adp	3 Jul 2015 10:50:53 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 <p>
Index: openacs-4/packages/general-comments/www/url-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/www/url-ae.adp	17 Jun 2015 07:19:50 -0000	1.8
+++ openacs-4/packages/general-comments/www/url-ae.adp	3 Jul 2015 10:50:53 -0000	1.9
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="parent_id">@parent_id;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="parent_id">@parent_id;literal@</property>
 
 <form method=POST action= "@target@">
 <div><%= [export_vars -form {attach_id parent_id return_url}] %></div>
Index: openacs-4/packages/general-comments/www/view-comment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/general-comments/www/view-comment.adp	27 Oct 2014 16:41:44 -0000	1.9
+++ openacs-4/packages/general-comments/www/view-comment.adp	3 Jul 2015 10:50:53 -0000	1.10
@@ -1,8 +1,8 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="return_url">@return_url;noquote@</property>
-<property name="object_name">@object_name;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="return_url">@return_url;literal@</property>
+<property name="object_name">@object_name;literal@</property>
 
 <if @return_url@ ne "">
 <p>[<a href="@return_url@">#general-comments.lt_Go_back_to_where_you_#</a>]</p>
Index: openacs-4/packages/general-comments/www/view-image.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-image.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/general-comments/www/view-image.adp	27 Oct 2014 16:41:44 -0000	1.5
+++ openacs-4/packages/general-comments/www/view-image.adp	3 Jul 2015 10:50:53 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="return_url">@return_url;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="return_url">@return_url;literal@</property>
 
 <center>
 <i>@title@</i>
Index: openacs-4/packages/general-comments/www/admin/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/www/admin/delete.adp	17 Jun 2015 07:19:50 -0000	1.8
+++ openacs-4/packages/general-comments/www/admin/delete.adp	3 Jul 2015 10:50:53 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 #general-comments.lt_Do_you_really_wish_to#
Index: openacs-4/packages/general-comments/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/general-comments/www/admin/index.adp	27 Oct 2014 16:41:44 -0000	1.5
+++ openacs-4/packages/general-comments/www/admin/index.adp	3 Jul 2015 10:50:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 @dimensional_bar;noquote@
Index: openacs-4/packages/theme-zen/lib/lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	27 Oct 2014 16:41:59 -0000	1.10
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	3 Jul 2015 10:50:52 -0000	1.11
@@ -1,6 +1,6 @@
 <master src="/www/blank-master">
-  <if @context@ not nil><property name="context">@context;noquote@</property></if>
-    <else><if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if></else>
+  <if @context@ not nil><property name="context">@context;literal@</property></if>
+    <else><if @context_bar@ not nil><property name="context_bar">@context_bar;literal@</property></if></else>
   <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
   <if @doc@ defined><property name="&doc">doc</property></if>
   <if @body@ defined><property name="&body">body</property></if>
Index: openacs-4/packages/theme-zen/www/accessibility.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/accessibility.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/accessibility.adp	9 Nov 2008 23:29:28 -0000	1.2
+++ openacs-4/packages/theme-zen/www/accessibility.adp	3 Jul 2015 10:50:52 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context@</property>
-<property name="title">@title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <h1>#theme-zen.Accessibility#</h1>
 
Index: openacs-4/packages/theme-zen/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/admin/index.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/www/admin/index.adp	3 Jul 2015 10:50:52 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-  <property name="title">#theme-zen.upgrade_intro#</property>
+  <property name="doc(title)">#theme-zen.upgrade_intro#</property>
   #theme-zen.upgrade_intro#
   <p><a href="upgrade" title="#theme-zen.upgrade#" class="button">#theme-zen.upgrade#</a></p>
Index: openacs-4/packages/theme-zen/www/admin/upgrade.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/admin/upgrade.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/admin/upgrade.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/www/admin/upgrade.adp	3 Jul 2015 10:50:52 -0000	1.3
@@ -1,3 +1,3 @@
 <master>
-  <property name="title">#theme-zen.upgrade_finished#</property>
+  <property name="doc(title)">#theme-zen.upgrade_finished#</property>
   #theme-zen.upgrade_finished#
Index: openacs-4/packages/theme-zen/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/doc/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/doc/index.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/www/doc/index.adp	3 Jul 2015 10:50:52 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="title">{Project Zen Documentation}</property>
+<property name="doc(title)">{Project Zen Documentation}</property>
 <property name="context">{Project Zen Documentation}</property>
 
 <ul>