Index: openacs-4/packages/acs-admin/www/developer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/developer.adp	12 Jun 2015 21:14:16 -0000	1.5
+++ openacs-4/packages/acs-admin/www/developer.adp	3 Jul 2015 10:25:36 -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>
 
 <div style="float: right;">
   <table style="border: 1px solid #cccccc; border-collapse: collapse; background-color: #eeeeee;">
Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/index.adp	27 Oct 2014 16:38:51 -0000	1.14
+++ openacs-4/packages/acs-admin/www/index.adp	3 Jul 2015 10:25:36 -0000	1.15
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
+  <property name="doc(title)">@page_title;literal@</property>
 
 <div style="float: right;">
   <a href="developer" class="button">Developer's Admin</a>
Index: openacs-4/packages/acs-admin/www/monitor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/monitor.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/monitor.adp	27 Oct 2014 16:38:51 -0000	1.3
+++ openacs-4/packages/acs-admin/www/monitor.adp	3 Jul 2015 10:25:36 -0000	1.4
@@ -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>
   There are a total of @connections:rowcount@ requests being served
Index: openacs-4/packages/acs-admin/www/server-restart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/server-restart.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/server-restart.adp	27 Oct 2014 16:38:51 -0000	1.4
+++ openacs-4/packages/acs-admin/www/server-restart.adp	3 Jul 2015 10:25:36 -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>
 
 <p> The server has been shut down. Normally, it should come back up by itself after a minute or so. </p>
 
Index: openacs-4/packages/acs-admin/www/apm/apm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/apm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/apm.adp	27 Oct 2014 16:38:51 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/apm.adp	3 Jul 2015 10:25:37 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/index.adp	29 May 2015 09:09:02 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/index.adp	3 Jul 2015 10:25:37 -0000	1.4
@@ -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>
 
 <div style="margin: 0 auto;">
      @dimensional_list;noquote@
Index: openacs-4/packages/acs-admin/www/apm/package-load.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-load.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/package-load.adp	27 Oct 2014 16:38:52 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/package-load.adp	3 Jul 2015 10:25:37 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <form action='package-load-2' method='post'>
 
Index: openacs-4/packages/acs-admin/www/apm/parameter-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/parameter-add.adp	17 Sep 2003 18:35:47 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/parameter-add.adp	3 Jul 2015 10:25:37 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/parameter-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/parameter-delete.adp	27 Oct 2014 16:38:52 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/parameter-delete.adp	3 Jul 2015 10:25:37 -0000	1.4
@@ -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>
 
 <formtemplate id="del"></formtemplate>
   
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/parameter-edit.adp	17 Sep 2003 18:35:47 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/parameter-edit.adp	3 Jul 2015 10:25:37 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp	27 Oct 2014 16:38:52 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp	3 Jul 2015 10:25:37 -0000	1.5
@@ -1,5 +1,5 @@
 <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>
 
 <formtemplate id="callback"></formtemplate>
Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp	27 Oct 2014 16:38:53 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp	3 Jul 2015 10:25:37 -0000	1.3
@@ -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 @result@ not nil>
   <h2>Output</h2>
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	19 Jun 2015 09:09:51 -0000	1.8
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	3 Jul 2015 10:25:37 -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>
 
 
 <p><listtemplate name="callbacks"></listtemplate>
Index: openacs-4/packages/acs-admin/www/apm/version-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/version-files.adp	17 Sep 2003 11:20:30 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/version-files.adp	3 Jul 2015 10:25:37 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="title">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp	27 Oct 2014 16:38:53 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp	3 Jul 2015 10:25:37 -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>
   Export complete.
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp	27 Oct 2014 16:38:54 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp	3 Jul 2015 10:25:37 -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>
 
 <p>
   Import complete.
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp	27 Oct 2014 16:38:54 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp	3 Jul 2015 10:25:37 -0000	1.10
@@ -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>
 
 <h3>Import/Export Messages</h3>
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.adp	27 Oct 2014 16:38:54 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.adp	3 Jul 2015 10:25:37 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 @processing_html_result;noquote@
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process.adp	27 Oct 2014 16:38:54 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process.adp	3 Jul 2015 10:25:37 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <p>
   <b>Current File:</b> @file@
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-admin/www/apm/version-i18n.adp	27 Oct 2014 16:38:54 -0000	1.17
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.adp	3 Jul 2015 10:25:37 -0000	1.18
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <p align="center">
   @file_type_filter;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-parameters.adp	27 Oct 2014 16:38:54 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.adp	3 Jul 2015 10:25:37 -0000	1.4
@@ -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>
 
 <blockquote>
 @filter_html;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-reload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-reload.adp	27 Oct 2014 16:38:54 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-reload.adp	3 Jul 2015 10:25:37 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <style type="text/css">
   dl.error, dl.error dt { display:inline; color:red; }
Index: openacs-4/packages/acs-admin/www/apm/version-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/version-view.adp	17 Sep 2003 11:08:09 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/version-view.adp	3 Jul 2015 10:25:37 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-admin/www/auth/authority-parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-parameters.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/auth/authority-parameters.adp	27 Oct 2014 16:38:55 -0000	1.4
+++ openacs-4/packages/acs-admin/www/auth/authority-parameters.adp	3 Jul 2015 10:25:37 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="focus">parameters.@first_param_name;noquote@</property>
 
 <if @has_parameters_p@>
Index: openacs-4/packages/acs-admin/www/auth/authority.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/auth/authority.adp	27 Oct 2014 16:38:55 -0000	1.9
+++ openacs-4/packages/acs-admin/www/auth/authority.adp	3 Jul 2015 10:25:37 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="focus">authority.pretty_name</property>
 
 <if @configure_url@ not nil>
Index: openacs-4/packages/acs-admin/www/auth/batch-action.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-action.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/auth/batch-action.adp	27 Oct 2014 16:38:55 -0000	1.3
+++ openacs-4/packages/acs-admin/www/auth/batch-action.adp	3 Jul 2015 10:25:37 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@page_title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <formtemplate id="batch_action_form"></formtemplate>
Index: openacs-4/packages/acs-admin/www/auth/batch-job-run.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job-run.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/auth/batch-job-run.adp	27 Oct 2014 16:38:55 -0000	1.3
+++ openacs-4/packages/acs-admin/www/auth/batch-job-run.adp	3 Jul 2015 10:25:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
 
 <p> Batch sync completed. </p>
 
Index: openacs-4/packages/acs-admin/www/auth/batch-job.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/auth/batch-job.adp	27 Oct 2014 16:38:55 -0000	1.4
+++ openacs-4/packages/acs-admin/www/auth/batch-job.adp	3 Jul 2015 10:25:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@page_title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <p>
   <formtemplate id="batch_job_form"></formtemplate>
Index: openacs-4/packages/acs-admin/www/auth/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/auth/index.adp	27 Oct 2014 16:38:56 -0000	1.5
+++ openacs-4/packages/acs-admin/www/auth/index.adp	3 Jul 2015 10:25:38 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@page_title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <h1>Authorities</h1>
 
Index: openacs-4/packages/acs-admin/www/cache/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/cache/index.adp	16 Jun 2015 08:41:15 -0000	1.5
+++ openacs-4/packages/acs-admin/www/cache/index.adp	3 Jul 2015 10:25:38 -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>
     <h4>util_memoize caches</h4>
 
     <blockquote>
Index: openacs-4/packages/acs-admin/www/cache/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/cache/one.adp	27 Oct 2014 16:38:56 -0000	1.5
+++ openacs-4/packages/acs-admin/www/cache/one.adp	3 Jul 2015 10:25:38 -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>
 
     <form action="flush" method="post">
       <input type="hidden" name="type" value="one">
Index: openacs-4/packages/acs-admin/www/cache/show-util-memoize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/show-util-memoize.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/cache/show-util-memoize.adp	17 Jun 2015 07:50:07 -0000	1.7
+++ openacs-4/packages/acs-admin/www/cache/show-util-memoize.adp	3 Jul 2015 10:25:38 -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>
 
     Search for <b><code>@pattern@</code></b>:
 
Index: openacs-4/packages/acs-admin/www/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/install/index.adp	27 Oct 2014 16:38:56 -0000	1.8
+++ openacs-4/packages/acs-admin/www/install/index.adp	3 Jul 2015 10:25:38 -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>
 
 <h1>@page_title@</h1>
 <table style="border: 1px solid gray" border="1" cellspacing="0" cellpadding="3">
Index: openacs-4/packages/acs-admin/www/install/install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/install/install-2.adp	27 Oct 2014 16:38:56 -0000	1.3
+++ openacs-4/packages/acs-admin/www/install/install-2.adp	3 Jul 2015 10:25:38 -0000	1.4
@@ -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 @problems_p@ true>
 
Index: openacs-4/packages/acs-admin/www/install/install-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-4.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/install/install-4.adp	27 Oct 2014 16:38:56 -0000	1.3
+++ openacs-4/packages/acs-admin/www/install/install-4.adp	3 Jul 2015 10:25:38 -0000	1.4
@@ -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> Done installing packages. </p>
 
Index: openacs-4/packages/acs-admin/www/install/install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/install/install.adp	27 Oct 2014 16:38:56 -0000	1.3
+++ openacs-4/packages/acs-admin/www/install/install.adp	3 Jul 2015 10:25:38 -0000	1.4
@@ -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>
 
 
 <listfilters name="packages" style="inline-filters"></listfilters>
Index: openacs-4/packages/acs-admin/www/users/bouncing-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/bouncing-users.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/bouncing-users.adp	15 Jun 2015 11:10:10 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/bouncing-users.adp	3 Jul 2015 10:25:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#acs-mail-lite.Bouncing_users#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h2>#acs-mail-lite.Bouncing_users#</h2>
 <listtemplate name="bouncing_users"></listtemplate>
Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	15 Jun 2015 11:10:10 -0000	1.9
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	3 Jul 2015 10:25:38 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Complex User Search</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <if @criteria:rowcount@ eq 0>
   all matching users
Index: openacs-4/packages/acs-admin/www/users/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-admin/www/users/index.adp	17 Jun 2015 07:50:08 -0000	1.17
+++ openacs-4/packages/acs-admin/www/users/index.adp	3 Jul 2015 10:25:38 -0000	1.18
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Users</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <ul>
   <li>total users: <a href="complex-search?target=one&amp;only_authorized_p=0">@n_users@</a> (@n_deleted_users@ deleted).  Last registration on @last_registration@ (<a href="registration-history">history</a>).
Index: openacs-4/packages/acs-admin/www/users/member-state-change.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/users/member-state-change.adp	27 Oct 2014 16:38:57 -0000	1.6
+++ openacs-4/packages/acs-admin/www/users/member-state-change.adp	3 Jul 2015 10:25:39 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@action;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@action;literal@</property>
+<property name="context">@context;literal@</property>
 
 <p>Done.</p>
 <p>You can <a href="../send-email?@export_vars@">send the user email</a> or <a href="@return_url@">go back</a>.</p>
Index: openacs-4/packages/acs-admin/www/users/merge-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/merge-confirm.adp	17 Jun 2015 07:50:08 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.adp	3 Jul 2015 10:25:39 -0000	1.8
@@ -1,6 +1,6 @@
   <master>
     <property name="doc(title)">Merge account system</property>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
     
     <h2>Confirm Merge</h2>
     
Index: openacs-4/packages/acs-admin/www/users/merge-final.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/merge-final.adp	27 Oct 2014 16:38:57 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/merge-final.adp	3 Jul 2015 10:25:39 -0000	1.4
@@ -1,6 +1,6 @@
   <master>
     <property name="doc(title)">Merging ... </property>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
     
     <h2>Merging ...</h2>
 
Index: openacs-4/packages/acs-admin/www/users/merge.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/merge.adp	27 Oct 2014 16:38:57 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/merge.adp	3 Jul 2015 10:25:39 -0000	1.6
@@ -1,6 +1,6 @@
   <master>
     <property name="doc(title)">Merge account system</property>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
 
     <h2>User Account Merge</h2>
     
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-admin/www/users/one.adp	15 Jun 2015 20:47:09 -0000	1.23
+++ openacs-4/packages/acs-admin/www/users/one.adp	3 Jul 2015 10:25:39 -0000	1.24
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">@user_info.first_names;noquote@ @user_info.last_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h2>Basic Information</h2>
 
Index: openacs-4/packages/acs-admin/www/users/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-update.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/password-update.adp	27 Oct 2014 16:38:58 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/password-update.adp	3 Jul 2015 10:25:39 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Update Password</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <include src="/packages/acs-admin/lib/password-update" return_url=@return_url@ user_id=@user_id@ >
 
Index: openacs-4/packages/acs-admin/www/users/registration-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/registration-history.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/registration-history.adp	27 Oct 2014 16:38:58 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/registration-history.adp	3 Jul 2015 10:25:39 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Registration History</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <table>
   <tr><th>Year</th><th align="left">Month</th><th>Registrations</th></tr>
 <multiple name="user_rows">
Index: openacs-4/packages/acs-admin/www/users/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/search.adp	15 Jun 2015 11:10:10 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/search.adp	3 Jul 2015 10:25:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @search_type@ eq "keyword">
   for name or email matching "@keyword@"
Index: openacs-4/packages/acs-admin/www/users/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/user-add-2.adp	27 Oct 2014 16:38:58 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/user-add-2.adp	3 Jul 2015 10:25:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Add a user</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 
 <p>
Index: openacs-4/packages/acs-admin/www/users/user-add-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/user-add-3.adp	27 Oct 2014 16:38:58 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/user-add-3.adp	3 Jul 2015 10:25:40 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Email sent</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 @first_names@ @last_name@ has been notified.
Index: openacs-4/packages/acs-admin/www/users/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/users/user-add.adp	27 Oct 2014 16:38:58 -0000	1.10
+++ openacs-4/packages/acs-admin/www/users/user-add.adp	3 Jul 2015 10:25:40 -0000	1.11
@@ -1,7 +1,7 @@
 <master>
 <property name="doc(title)">Add a user</property>
 <property name="focus">register.email</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <include src="@user_new_template@" next_url="@next_url;noquote@" self_register_p="0"/>
 
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/users/user-batch-add.adp	17 Jun 2015 07:50:08 -0000	1.11
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.adp	3 Jul 2015 10:25:40 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Add a batch of users</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <form method="post" action="user-batch-add-2">
 <p>Add these users to @system_name@, one user per line.
Index: openacs-4/packages/acs-api-browser/www/content-page-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-api-browser/www/content-page-view.adp	27 Oct 2014 16:38:59 -0000	1.11
+++ openacs-4/packages/acs-api-browser/www/content-page-view.adp	3 Jul 2015 10:25:40 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
 
   @script_documentation;noquote@
 
Index: openacs-4/packages/acs-api-browser/www/deprecated.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/deprecated.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-api-browser/www/deprecated.adp	17 Jun 2015 07:54:46 -0000	1.7
+++ openacs-4/packages/acs-api-browser/www/deprecated.adp	3 Jul 2015 10:25:40 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h3>Deprecated Procedures:</h3>
 <ul>
Index: openacs-4/packages/acs-api-browser/www/display-sql.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/display-sql.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/display-sql.adp	27 Oct 2014 16:38:59 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/display-sql.adp	3 Jul 2015 10:25:40 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <pre>
 @sql@
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-api-browser/www/index.adp	15 Jun 2015 11:15:55 -0000	1.20
+++ openacs-4/packages/acs-api-browser/www/index.adp	3 Jul 2015 10:25:40 -0000	1.21
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <div style="float: right;">
   <include src="/packages/acs-api-browser/lib/search">
Index: openacs-4/packages/acs-api-browser/www/package-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/package-view.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/package-view.adp	19 Jun 2015 19:49:02 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/package-view.adp	3 Jul 2015 10:25:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <property name="head">
 <style type="text/css">
 td.wide {width:35%;}
Index: openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp	1 Jul 2015 08:58:05 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp	3 Jul 2015 10:25:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @package_slider_list@ ne "">
 <div style='float: right;'>
Index: openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp	27 Oct 2014 16:38:59 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp	3 Jul 2015 10:25:40 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">All PL/SQL Subprograms</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <multiple name="all_subprograms">
 <h2>@all_subprograms.type@</h2>
Index: openacs-4/packages/acs-api-browser/www/proc-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-browse.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-api-browser/www/proc-browse.adp	1 Jul 2015 08:58:05 -0000	1.9
+++ openacs-4/packages/acs-api-browser/www/proc-browse.adp	3 Jul 2015 10:25:40 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @dimensional_slider;noquote@
 
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	15 Jun 2015 11:15:55 -0000	1.13
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	3 Jul 2015 10:25:40 -0000	1.14
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <div style="float: right;">
   <include src="/packages/acs-api-browser/lib/search" query_string="@query_string@">
Index: openacs-4/packages/acs-api-browser/www/proc-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-api-browser/www/proc-view.adp	15 Jun 2015 11:15:55 -0000	1.11
+++ openacs-4/packages/acs-api-browser/www/proc-view.adp	3 Jul 2015 10:25:40 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @error_msg@ ne "">
 @error_msg;noquote@
Index: openacs-4/packages/acs-api-browser/www/procs-file-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-api-browser/www/procs-file-view.adp	19 Jun 2015 19:49:02 -0000	1.10
+++ openacs-4/packages/acs-api-browser/www/procs-file-view.adp	3 Jul 2015 10:25:40 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="head">
   <style type="text/css">
   td.doc {background: #e4e4e4;}
Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp	17 Jun 2015 07:54:46 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp	3 Jul 2015 10:25:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 Sorry, no Tcl procedures were found with that name.
 
Index: openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp	1 Jul 2015 08:58:05 -0000	1.10
+++ openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp	3 Jul 2015 10:25:40 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 Sorry, no <%= [ns_info name]%> Tcl API procedures were found with that name.
 
Index: openacs-4/packages/acs-api-browser/www/type-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/type-view.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/type-view.adp	27 Oct 2014 16:39:00 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/type-view.adp	3 Jul 2015 10:25:40 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @documentation@
\ No newline at end of file
Index: openacs-4/packages/acs-automated-testing/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-automated-testing/www/index.adp	27 Oct 2014 16:39:02 -0000	1.6
+++ openacs-4/packages/acs-automated-testing/www/index.adp	3 Jul 2015 10:25:40 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <if @servers:rowcount@ gt 0>
   <table border="1" cellspacing="0" cellpadding="3">
Index: openacs-4/packages/acs-automated-testing/www/server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-automated-testing/www/server.adp	27 Oct 2014 16:39:02 -0000	1.5
+++ openacs-4/packages/acs-automated-testing/www/server.adp	3 Jul 2015 10:25:41 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <ul>
   <li>Service:
Index: openacs-4/packages/acs-automated-testing/www/admin/component.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/component.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-automated-testing/www/admin/component.adp	16 Jun 2015 09:03:17 -0000	1.6
+++ openacs-4/packages/acs-automated-testing/www/admin/component.adp	3 Jul 2015 10:25:41 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <html>
   <body>
Index: openacs-4/packages/acs-automated-testing/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/index.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-automated-testing/www/admin/index.adp	16 Jun 2015 09:03:17 -0000	1.16
+++ openacs-4/packages/acs-automated-testing/www/admin/index.adp	3 Jul 2015 10:25:41 -0000	1.17
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
   <table border="0" cellspacing="0" cellpadding="3" width="100%">
     <tr>
       <th style="background-color:#ECECEC">Category</th>
Index: openacs-4/packages/acs-automated-testing/www/admin/record-test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/record-test.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/www/admin/record-test.adp	27 Oct 2014 16:39:03 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/www/admin/record-test.adp	3 Jul 2015 10:25:41 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@title@</property>
-  <property name="focus">@focus@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="focus">@focus;literal@</property>
   
   <formtemplate id="new_test"></formtemplate>
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	16 Jun 2015 09:03:17 -0000	1.15
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	3 Jul 2015 10:25:41 -0000	1.16
@@ -1,6 +1,6 @@
 <master>
   <property name="doc(title)">@title;noquote@ (@package_key@)</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
   <div class="description">
     <dl>
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/extensions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/extensions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/extensions.adp	9 Mar 2010 11:49:46 -0000	1.1
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/extensions.adp	3 Jul 2015 10:25:41 -0000	1.2
@@ -1,6 +1,6 @@
   <master>
   
     <property name="&doc">doc</property>
-    <property name="context">@context@</property>
+    <property name="context">@context;literal@</property>
 
     <listtemplate name="extensions"></listtemplate>
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/index.adp	9 Mar 2010 11:49:46 -0000	1.1
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/index.adp	3 Jul 2015 10:25:41 -0000	1.2
@@ -1,6 +1,6 @@
   <master>
   
     <property name="&doc">doc</property>
-    <property name="context">@context@</property>
+    <property name="context">@context;literal@</property>
 
     <listtemplate name="mime_types"></listtemplate>
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/map.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/map.adp	9 Mar 2010 11:49:46 -0000	1.1
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/map.adp	3 Jul 2015 10:25:41 -0000	1.2
@@ -1,6 +1,6 @@
   <master>
   
     <property name="&doc">doc</property>
-    <property name="context">@context@</property>
+    <property name="context">@context;literal@</property>
 
     <formtemplate id="extension_new"></formtemplate>
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/new.adp	9 Mar 2010 11:49:46 -0000	1.1
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/new.adp	3 Jul 2015 10:25:41 -0000	1.2
@@ -1,6 +1,6 @@
   <master>
   
     <property name="&doc">doc</property>
-    <property name="context">@context@</property>
+    <property name="context">@context;literal@</property>
 
     <formtemplate id="mime_type_new"></formtemplate>
Index: openacs-4/packages/acs-core-docs/www/files/tutorial/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/tutorial/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/files/tutorial/index.adp	27 Oct 2014 16:39:29 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/files/tutorial/index.adp	3 Jul 2015 10:25:41 -0000	1.4
@@ -1,4 +1,4 @@
 <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>
 <include src="/packages/myfirstpackage/lib/note-list">
\ No newline at end of file
Index: openacs-4/packages/acs-core-docs/www/files/tutorial/note-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/tutorial/note-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/files/tutorial/note-edit.adp	27 Oct 2014 16:39:30 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/files/tutorial/note-edit.adp	3 Jul 2015 10:25:41 -0000	1.4
@@ -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">note.title</property>
   
 <formtemplate id="note"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/acs-core-docs/www/sql/display-sql.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/sql/display-sql.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/sql/display-sql.adp	27 Oct 2014 16:39:30 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/sql/display-sql.adp	3 Jul 2015 10:25:41 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
 <property name="doc(title)">SQL Display</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 @text;noquote@
Index: openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/www/doc/examples/Attic/calendar-navigation.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.adp	27 Oct 2014 16:39:33 -0000	1.4
+++ openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.adp	3 Jul 2015 10:25:41 -0000	1.5
@@ -2,8 +2,8 @@
 
 <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>
 
 <pre>dt_widget_calendar_navigation <i>base_url</i> <i>view</i> <i>date</i> <i>pass_in_vars</i> </pre>
 
Index: openacs-4/packages/acs-datetime/www/doc/examples/calendar-widgets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/www/doc/examples/Attic/calendar-widgets.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-datetime/www/doc/examples/calendar-widgets.adp	16 Jun 2015 09:11:19 -0000	1.5
+++ openacs-4/packages/acs-datetime/www/doc/examples/calendar-widgets.adp	3 Jul 2015 10:25:41 -0000	1.6
@@ -2,8 +2,8 @@
 
 <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>
 
 <p>These are the various widgets to generate calendar views.  Note
 that the <a href="calendar-navigation">calendar navigation</a> widget is
Index: openacs-4/packages/acs-datetime/www/doc/examples/datetime-procs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/www/doc/examples/datetime-procs.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-datetime/www/doc/examples/datetime-procs.adp	16 Jun 2015 09:11:19 -0000	1.6
+++ openacs-4/packages/acs-datetime/www/doc/examples/datetime-procs.adp	3 Jul 2015 10:25:41 -0000	1.7
@@ -2,8 +2,8 @@
 
 <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>
 
 <p>The following table offers examples of the various date and time
 functions:</p>
Index: openacs-4/packages/acs-datetime/www/doc/examples/datetime-widgets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/www/doc/examples/Attic/datetime-widgets.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-datetime/www/doc/examples/datetime-widgets.adp	16 Jun 2015 09:11:19 -0000	1.6
+++ openacs-4/packages/acs-datetime/www/doc/examples/datetime-widgets.adp	3 Jul 2015 10:25:41 -0000	1.7
@@ -2,8 +2,8 @@
 
 <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>
 
 <p>There is one main procedure to generate date and time widgets:
 
Index: openacs-4/packages/acs-developer-support/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/www/index.adp	27 Oct 2014 16:39:34 -0000	1.2
+++ openacs-4/packages/acs-developer-support/www/index.adp	3 Jul 2015 10:25:42 -0000	1.3
@@ -1,5 +1,5 @@
 <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>
 
 @body;noquote@
Index: openacs-4/packages/acs-developer-support/www/request-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-developer-support/www/request-info.adp	27 Oct 2014 16:39:34 -0000	1.8
+++ openacs-4/packages/acs-developer-support/www/request-info.adp	3 Jul 2015 10:25:42 -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>
 
   <if @page_fragment_cache_p@ true>
     <p>
Index: openacs-4/packages/acs-developer-support/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-developer-support/www/search.adp	27 Oct 2014 16:39:34 -0000	1.4
+++ openacs-4/packages/acs-developer-support/www/search.adp	3 Jul 2015 10:25:42 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
   <property name="doc(title)">Search</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
   <p>
       <form name="searchfrags" action="search">
Index: openacs-4/packages/acs-developer-support/www/shell.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/shell.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-developer-support/www/shell.adp	27 Oct 2014 16:39:34 -0000	1.3
+++ openacs-4/packages/acs-developer-support/www/shell.adp	3 Jul 2015 10:25:42 -0000	1.4
@@ -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>
 
 <formtemplate id="shell"></formtemplate>
 <h3>Result</h3>
Index: openacs-4/packages/acs-lang/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/www/index.adp	27 Oct 2014 16:39:38 -0000	1.10
+++ openacs-4/packages/acs-lang/www/index.adp	3 Jul 2015 10:25:42 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@instance_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@instance_name;literal@</property>
+  <property name="context_bar">@context_bar;literal@</property>
 
 <if @admin_p@>
   <div style="float: right;">
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/batch-editor.adp	19 Jun 2015 17:58:53 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.adp	3 Jul 2015 10:25:42 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="head">
   <style type="text/css">
   table.plain {background: #dddddd; border-spacing: 1px; border-collapse: separate;}
Index: openacs-4/packages/acs-lang/www/admin/edit-description.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-description.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/edit-description.adp	27 Oct 2014 16:39:38 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/edit-description.adp	3 Jul 2015 10:25:42 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
- <property name="doc(title)">@page_title@</property>
- <property name="context">@context;noquote@</property>
+ <property name="doc(title)">@page_title;literal@</property>
+ <property name="context">@context;literal@</property>
  <property name="focus">description.description</property>
 
 <formtemplate id="description"></formtemplate>
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	19 Jun 2015 17:58:53 -0000	1.15
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	3 Jul 2015 10:25:42 -0000	1.16
@@ -1,6 +1,6 @@
 <master>
  <property name="doc(title)">Edit a message</property>
- <property name="context">@context;noquote@</property>
+ <property name="context">@context;literal@</property>
  <property name="focus">message.message</property>
 
 <!-- TODO: Remove 'style' when we've merged 4.6.4 back onto HEAD -->
Index: openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp	27 Oct 2014 16:39:38 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp	3 Jul 2015 10:25:42 -0000	1.4
@@ -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>
   Export finished.
Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/export-messages.adp	27 Oct 2014 16:39:38 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/export-messages.adp	3 Jul 2015 10:25:42 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
 
 <p>#acs-lang.Export_results_for#</p>
 
Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp	27 Oct 2014 16:39:39 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp	3 Jul 2015 10:25:42 -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>
 
 <p>
   Import finished.
Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/import-messages.adp	27 Oct 2014 16:39:39 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/import-messages.adp	3 Jul 2015 10:25:42 -0000	1.9
@@ -1,5 +1,5 @@
 <master>
- <property name="doc(title)">@page_title;noquote@</property>
+ <property name="doc(title)">@page_title;literal@</property>
 
 Import results for
 <if @package_key@ nil>
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-lang/www/admin/index.adp	27 Oct 2014 16:39:39 -0000	1.19
+++ openacs-4/packages/acs-lang/www/admin/index.adp	3 Jul 2015 10:25:42 -0000	1.20
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-lang/lib/conflict-link" />
 
Index: openacs-4/packages/acs-lang/www/admin/locale-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-delete.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/www/admin/locale-delete.adp	27 Oct 2014 16:39:39 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/locale-delete.adp	3 Jul 2015 10:25:42 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <h1>Delete @locale_label@</h1>
 
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/locale-edit.adp	17 Oct 2010 21:06:08 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/locale-edit.adp	3 Jul 2015 10:25:42 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
   <property name="&doc">doc</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">locale_editing.country</property>
 
 <h1>Editing locale @locale_label@</h1>
Index: openacs-4/packages/acs-lang/www/admin/locale-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/locale-new.adp	27 Oct 2014 16:39:39 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/locale-new.adp	3 Jul 2015 10:25:42 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">locale_creation.country</property>
 
 <p>Please fill in the fields to create a new locale.</p>
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.adp	27 Oct 2014 16:39:39 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.adp	3 Jul 2015 10:25:42 -0000	1.10
@@ -1,7 +1,7 @@
 <master>
  <property name="doc(title)">Edit a message</property>
- <property name="context">@context;noquote@</property>
- <property name="focus">@focus;noquote@</property>
+ <property name="context">@context;literal@</property>
+ <property name="focus">@focus;literal@</property>
 
 <formtemplate id="message_new"></formtemplate>
 
Index: openacs-4/packages/acs-lang/www/admin/lookup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookup.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/lookup.adp	27 Oct 2014 16:39:39 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/lookup.adp	3 Jul 2015 10:25:43 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">lookup.key</property>
 
 <h1>#acs-lang.Look_up_message#</h1>
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	15 Jun 2015 11:11:01 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	3 Jul 2015 10:25:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <p>
   This page lists conflicts resulting from message catalog imports that need manual resolution by a translator
Index: openacs-4/packages/acs-lang/www/admin/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-delete.adp	27 Oct 2014 16:39:39 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-delete.adp	3 Jul 2015 10:25:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</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/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	19 Jun 2015 17:58:53 -0000	1.14
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	3 Jul 2015 10:25:43 -0000	1.15
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <div style="float: right;">
     <formtemplate id="locale_form">
       @form_vars;noquote@
Index: openacs-4/packages/acs-lang/www/admin/message-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-search.adp	27 Oct 2014 16:39:39 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-search.adp	3 Jul 2015 10:25:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">search.q</property>
 
 <formtemplate id="search">
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	15 Jun 2015 11:11:01 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	3 Jul 2015 10:25:43 -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>
 
 <formtemplate id="search">
 <p>Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	15 Jun 2015 11:11:02 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	3 Jul 2015 10:25:43 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <p>
   Here's what the configuration looks like at this point:
Index: openacs-4/packages/acs-mail-lite/www/restore-bounce.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/www/restore-bounce.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-mail-lite/www/restore-bounce.adp	27 Oct 2014 16:39:42 -0000	1.2
+++ openacs-4/packages/acs-mail-lite/www/restore-bounce.adp	3 Jul 2015 10:25:43 -0000	1.3
@@ -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>#acs-mail-lite.Bounce_disabled#</p>
 
Index: openacs-4/packages/acs-reference/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-reference/www/index.adp	27 Oct 2014 16:39:42 -0000	1.5
+++ openacs-4/packages/acs-reference/www/index.adp	3 Jul 2015 10:25:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context_bar;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 <h2>@title@;noquote</h2>
 
 <ul>
Index: openacs-4/packages/acs-reference/www/reference-data-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/reference-data-list.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-reference/www/reference-data-list.adp	27 Oct 2014 16:39:43 -0000	1.4
+++ openacs-4/packages/acs-reference/www/reference-data-list.adp	3 Jul 2015 10:25:43 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context_bar;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <if @data:rowcount@ eq 0>
 <i>You have no reference data in the database right now.</i><p>
Index: openacs-4/packages/acs-reference/www/table-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/table-detail.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-reference/www/table-detail.adp	27 Oct 2014 16:39:43 -0000	1.4
+++ openacs-4/packages/acs-reference/www/table-detail.adp	3 Jul 2015 10:25:43 -0000	1.5
@@ -1,3 +1,3 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context_bar;literal@</property>
+<property name="doc(title)">@title;literal@</property>
Index: openacs-4/packages/acs-reference/www/view-one-reference.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/view-one-reference.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-reference/www/view-one-reference.adp	16 Jun 2015 09:15:07 -0000	1.4
+++ openacs-4/packages/acs-reference/www/view-one-reference.adp	3 Jul 2015 10:25:43 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <table>
 <tr><th valign="top" align="right">Table Name</th>
Index: openacs-4/packages/acs-service-contract/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-service-contract/www/index.adp	15 Jun 2015 11:11:55 -0000	1.9
+++ openacs-4/packages/acs-service-contract/www/index.adp	3 Jul 2015 10:25:43 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">ACS Service Contract</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h2>Defined Contracts</h2>
 
Index: openacs-4/packages/acs-subsite/lib/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/lib/login.adp	21 Nov 2007 14:08:43 -0000	1.12
+++ openacs-4/packages/acs-subsite/lib/login.adp	3 Jul 2015 10:25:43 -0000	1.13
@@ -1,4 +1,4 @@
-<property name="focus">@focus;noquote@</property>
+<property name="focus">@focus;literal@</property>
 
 <div id="register-login">
 <formtemplate id="login"></formtemplate>
Index: openacs-4/packages/acs-subsite/lib/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/message.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/message.adp	27 Oct 2014 16:39:45 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/message.adp	3 Jul 2015 10:25:43 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
 
   @message;noquote@
Index: openacs-4/packages/acs-subsite/lib/user-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/lib/user-info.adp	5 Jan 2010 11:09:26 -0000	1.10
+++ openacs-4/packages/acs-subsite/lib/user-info.adp	3 Jul 2015 10:25:43 -0000	1.11
@@ -1,4 +1,4 @@
-<property name="focus">@focus;noquote@</property>
+<property name="focus">@focus;literal@</property>
 <formtemplate id="user_info"></formtemplate>
 
 <if @edit_mode_p@ true and @read_only_notice_p@ true>
Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/www/group-master.adp	3 Dec 2007 20:17:35 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/group-master.adp	3 Jul 2015 10:25:43 -0000	1.18
@@ -1,9 +1,9 @@
 <master src="/www/site-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-<property name="skip_link">@skip_link;noquote@</property>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+<property name="skip_link">@skip_link;literal@</property>
 
 <div id="wrapper">
   <div id="system-name">
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-subsite/www/index.adp	13 Jun 2015 20:05:01 -0000	1.28
+++ openacs-4/packages/acs-subsite/www/index.adp	3 Jul 2015 10:25:43 -0000	1.29
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@subsite_name;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@subsite_name;literal@</property>
 
 
 <table>
Index: openacs-4/packages/acs-subsite/www/admin/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/configure.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/configure.adp	27 Oct 2014 16:39:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/configure.adp	3 Jul 2015 10:25:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">name.instance_name</property>
 
 <formtemplate id="name"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-subsite/www/admin/index.adp	15 Apr 2011 09:50:52 -0000	1.28
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	3 Jul 2015 10:25:44 -0000	1.29
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <h1>@title;noquote@</h1>
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/manage-email-privacy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/manage-email-privacy.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/manage-email-privacy.adp	9 Jun 2015 07:57:52 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/manage-email-privacy.adp	3 Jul 2015 10:25:44 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
   <property name="doc(title)">#acs-subsite.manage_users_email#</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
 <formtemplate id="private-email"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/admin/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/permissions-user-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/permissions-user-add.adp	27 Oct 2014 16:39:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/permissions-user-add.adp	3 Jul 2015 10:25:44 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-user-add-include">
Index: openacs-4/packages/acs-subsite/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/permissions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/permissions.adp	27 Oct 2014 16:39:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/permissions.adp	3 Jul 2015 10:25:44 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@subsite_id@" user_add_url="permissions-user-add">
Index: openacs-4/packages/acs-subsite/www/admin/subsite-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/subsite-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/subsite-add.adp	27 Oct 2014 16:39:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/subsite-add.adp	3 Jul 2015 10:25:44 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">subsite.instance_name</property>
 
 <formtemplate id="subsite"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/subsite-convert-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/subsite-convert-type.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/subsite-convert-type.adp	27 Oct 2014 16:39:47 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/subsite-convert-type.adp	3 Jul 2015 10:25:44 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">subsite.instance_name</property>
 
 <formtemplate id="subsite"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp	27 Oct 2014 16:39:47 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp	3 Jul 2015 10:25:44 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
-  <property name="focus">@focus;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+  <property name="focus">@focus;literal@</property>
 
 <formtemplate id="application"></formtemplate>
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/application-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/applications/application-delete.adp	27 Oct 2014 16:39:48 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-delete.adp	3 Jul 2015 10:25:44 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <h2>@page_title@</h2>
 @listing;noquote@
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/applications/index.adp	27 Oct 2014 16:39:48 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.adp	3 Jul 2015 10:25:44 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <listtemplate name="applications"></listtemplate>
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp	15 Apr 2011 10:29:16 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp	3 Jul 2015 10:25:44 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@doc.title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@doc.title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">application.package_key</property>
 
 <formtemplate id="application"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.adp	27 Oct 2014 16:39:48 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.adp	3 Jul 2015 10:25:44 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-user-add-include">
Index: openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp	27 Oct 2014 16:39:48 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp	3 Jul 2015 10:25:44 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@package_id@" user_add_url="permissions-user-add">
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/add.adp	9 Jun 2015 08:40:41 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add.adp	3 Jul 2015 10:25:44 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add attribute to @object_pretty_name;noquote@</property>
 <property name="focus">main_form.pretty_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	27 Oct 2014 16:39:48 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	3 Jul 2015 10:25:44 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @attribute_pretty_name;noquote@</property>
 
 Are you sure you want to permanently remove this attribute? Doing so will also remove any values previously specified for this attribute for any object of type "@object_type@."
Index: openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp	27 Oct 2014 16:39:48 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp	3 Jul 2015 10:25:44 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Edit @attribute_pretty_name;noquote@</property>
-<property name="focus">@focus;noquote@</property>
+<property name="focus">@focus;literal@</property>
 
 <formtemplate id="edit_attribute"></formtemplate>
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	9 Jun 2015 08:40:41 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	3 Jul 2015 10:25:44 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Specify values for @attribute_pretty_name;noquote@</property>
 
 Note: Every value must have a unique name. Duplicate names will be ignored.
Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	16 Jun 2015 08:39:03 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	3 Jul 2015 10:25:44 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@attribute.pretty_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@attribute.pretty_name;literal@</property>
 	
 <b>Properties:</b>			   
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	27 Oct 2014 16:39:49 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete value @pretty_name;noquote@</property>
 
 Are you sure you want to permanently remove this attribute value?
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp	9 Jun 2015 08:40:41 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@group_type_pretty_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@group_type_pretty_name;literal@</property>
 
 <blockquote>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	15 Jun 2015 11:14:17 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Relationship types exist that depend on this group type</property>
 
 You must remove all of the following relationship types before you can
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp	9 Jun 2015 08:40:41 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Subtypes exist!</property>
 
 You must remove all subtypes of the group type
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	27 Oct 2014 16:39:49 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @group_type_pretty_name;noquote@</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	27 Oct 2014 16:39:50 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">All groups of type @group_type_pretty_name;noquote@</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	15 Apr 2011 11:43:48 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@doc.title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@doc.title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.adp	15 Apr 2011 11:43:48 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@doc.title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@doc.title;literal@</property>
 <property name="focus">group_type.object_type</property>
 
 <h1>@doc.title@</h1>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	15 Apr 2011 11:43:48 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	3 Jul 2015 10:25:45 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@doc.title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@doc.title;literal@</property>
 				   
 <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	15 Jun 2015 11:14:17 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	3 Jul 2015 10:25:45 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@doc.title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@doc.title;literal@</property>
 				  
 
 <h1>#acs-subsite.Add_relationship_for_group__group_type#</h1>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	27 Oct 2014 16:39:50 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Remove @rel_pretty_name;noquote@</property>
 
 Are you sure you want to remove @rel_pretty_name@ from the list of allowable relations for groups of type @group_type_pretty_name@?
Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@group_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@group_name;literal@</property>
 
 <blockquote>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	27 Oct 2014 16:39:50 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Constraints on relationship type</property>
 
 Relational segments allows you to treat all parties that have a
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	15 Jun 2015 11:14:17 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @group_name;noquote@</property>
 
 Are you sure you want to permanently, and irreversibly, remove this
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	15 Jun 2015 11:14:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	3 Jul 2015 10:25:45 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">@role_pretty_plural;noquote@ of @group_name;noquote@</property>
 
 <include src="elements-display-list" group_id="@group_id;noquote@" rel_type="@rel_type;noquote@" member_state="@member_state;noquote@">
Index: openacs-4/packages/acs-subsite/www/admin/groups/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/index.adp	18 Apr 2011 17:24:30 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/index.adp	3 Jul 2015 10:25:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@doc.title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@doc.title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/new.adp	27 Oct 2014 16:39:51 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
   <property name="doc(title)">Add a group of type @group_type_pretty_name;noquote@</property>
   <property name="focus">add_group.group.group_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	15 Jun 2015 11:14:18 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	3 Jul 2015 10:25:45 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@group_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@group_name;literal@</property>
 
 <h3>Attributes</h3>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	9 Jun 2015 08:40:42 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	3 Jul 2015 10:25:45 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add relation type</property>
 				   
 <if @primary_rels:rowcount@ eq "0">
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	15 Jun 2015 11:14:18 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	3 Jul 2015 10:25:45 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Remove @rel_pretty_name;noquote@</property>
 
 Are you sure you want to remove @rel_pretty_name@ from the list of
Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/index.adp	19 Apr 2011 21:22:47 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/index.adp	3 Jul 2015 10:25:46 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <h1>@page_title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp	18 Apr 2011 17:24:30 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp	3 Jul 2015 10:25:46 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@doc.title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@doc.title;literal@</property>
+  <property name="context">@context;literal@</property>
 
  <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/object-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/object-types/index.adp	18 Apr 2011 17:24:30 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/object-types/index.adp	3 Jul 2015 10:25:46 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@doc.title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@doc.title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <h1>@doc.title@</h1>
  <p><a href="alphabetical-index" class="button">#acs-subsite.View_Alphabetical_Index#</a></p>
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.adp	15 Jun 2015 11:14:18 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.adp	3 Jul 2015 10:25:46 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <ul class="action-links">
  <li><a href="index">View Hierarchical Index</a> | <a href="alphabetical-index">View Alphabetical Index</a></li>
Index: openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	15 Jun 2015 11:14:18 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	3 Jul 2015 10:25:46 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Select specific @object_type_pretty_name;noquote@ type</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	16 Jun 2015 08:39:03 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	3 Jul 2015 10:25:46 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Create a new user</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/parties/new.adp	27 Oct 2014 16:39:52 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.adp	3 Jul 2015 10:25:46 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add a party of type @party_type_pretty_name;noquote@</property>
 
 <formtemplate id="add_party"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/parties/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/parties/one.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/parties/one.adp	3 Jul 2015 10:25:46 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@party_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@party_name;literal@</property>
 
 <h3>Attributes</h3>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	27 Oct 2014 16:39:52 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	3 Jul 2015 10:25:46 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Remove segment</property>
 
 Are you sure you want to remove the relational segment @segment_name@?
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/edit.adp	27 Oct 2014 16:39:52 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/edit.adp	3 Jul 2015 10:25:46 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="context">@context@</property>
+  <property name="context">@context;literal@</property>
   <property name="doc(title)">Edit Segment Name</property>
   <property name="focus">segment.segment_name</property>
 				   
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	27 Oct 2014 16:39:52 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	3 Jul 2015 10:25:46 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@segment_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@segment_name;literal@</property>
 
 <include src="elements-display" segment_id="@segment_id;noquote@" segment_name="@segment_name;noquote@" group_id=@group_id;noquote@ role="@role_pretty_plural;noquote@">
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	18 Apr 2011 17:24:30 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	3 Jul 2015 10:25:46 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@doc.title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@doc.title;literal@</property>
 
 <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	15 Jun 2015 11:14:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	3 Jul 2015 10:25:47 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Create relational segment</property>
 <property name="focus">segment_new.segment_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add Constraint on @segment_name;noquote@</property>
 
 Now that you have created a relational segment, you can create
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Create relational segment</property>
 <property name="focus">segment_new.segment_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	15 Jun 2015 11:14:18 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	3 Jul 2015 10:25:47 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Segment "@props.segment_name;noquote@"</property>
 				   
 <h4>Properties of this segment</h4>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @constraint_name;noquote@</property>
 
 Are you sure you want to delete the constraint @constraint_name@ on segment @segment_name@?
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	15 Jun 2015 11:14:18 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Relational Constraint Administration</property>
 
 Currently, the system is able to handle the following relational constraints:
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add constraint to @segment_name;noquote@</property>
 <property name="focus">constraint_new.constraint_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	15 Jun 2015 11:14:18 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@props.constraint_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@props.constraint_name;literal@</property>
 
 All elements in side @props.rel_side@ of the segment 
   <a href="../one?segment_id=@props.segment_id@">@props.segment_name@</a> 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	15 Jun 2015 11:14:18 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Violations exists</property>
 
 The following relations are in violation of the constraint you are
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add group type</property>
 				   
 <if primary_rels:rowcount eq 0> 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Subtypes exist!</property>
 
 You must remove all subtypes of the relationship type
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	27 Oct 2014 16:39:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @rel_type_pretty_name;noquote@</property>
 
 Are you sure you want to delete this relationship type? Doing so will:
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	19 Apr 2011 21:22:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">#acs-subsite.Relationship_types_administration#</property>
 
 <h1>#acs-subsite.Relationship_types_administration#</h1>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp	27 Oct 2014 16:39:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Create relation type (child of @supertype_pretty_name;noquote@)</property>
 <property name="focus">rel_type.rel_type</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp	9 Jun 2015 08:40:42 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp	3 Jul 2015 10:25:47 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">#acs-subsite.Create_relation_type#</property>
 
 <h1>#acs-subsite.Create_relation_type#</h1>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	16 Jun 2015 08:39:03 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	3 Jul 2015 10:25:47 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Relationship Type "@rel_type_pretty_name;noquote@"</property>
 				   
 <h4>Relations of this type</h4>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	27 Oct 2014 16:39:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">All relations of type "@rel_type_pretty_name;noquote@"</property>
 				   
 <if @rels:rowcount@ eq 0>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	27 Oct 2014 16:39:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Delete @pretty_name;noquote@</property>
 
 Are you sure you want to delete this role? 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp	27 Oct 2014 16:39:54 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Edit @role;noquote@</property>
 <property name="focus">role_form.role</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Roles</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp	27 Oct 2014 16:39:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp	3 Jul 2015 10:25:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Create role</property>
 <property name="focus">role_form.role</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	3 Jul 2015 10:25:47 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@role_props.pretty_name;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@role_props.pretty_name;literal@</property>
 
 <p><b>Properties:</b>
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	16 Jun 2015 08:39:03 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add @role_pretty_name;noquote@ to @group_name;noquote@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/add.adp	16 Jun 2015 08:39:04 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add @role_pretty_name;noquote@ to @group_name;noquote@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/relations/one.adp	15 Jun 2015 11:14:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.adp	3 Jul 2015 10:25:48 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">One relation</property>
 				   
 <h3>Attributes</h3>
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp	27 Oct 2014 16:39:55 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Dependent relations exist</property>
 
 You must remove the following dependent relations before you can
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	15 Jun 2015 11:14:18 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Remove relation</property>
 
 Are you sure you want to remove the @rel.rel_type_pretty_name@
Index: openacs-4/packages/acs-subsite/www/admin/site-map/application-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/application-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/application-new.adp	27 Oct 2014 16:39:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/application-new.adp	3 Jul 2015 10:25:48 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">application.package_key</property>
 
 <formtemplate id="application"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.adp	18 Apr 2011 17:24:30 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@doc.title@</property>
-<property name="context">@context;noquote@</property>
-<property name="javascript">@javascript;noquote@</property>
+<property name="doc(title)">@doc.title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="javascript">@javascript;literal@</property>
 
 <h1>@doc.title@</h1>
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp	27 Oct 2014 16:39:56 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp	3 Jul 2015 10:25:48 -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>
 
 <p>
   Please select one of the following packages to mount on <code><b>@site_node_url@</b></code>.
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.adp	27 Oct 2014 16:39:56 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.adp	3 Jul 2015 10:25:48 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.adp	27 Oct 2014 16:39:56 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.adp	3 Jul 2015 10:25:48 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="javascript">@javascript;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="javascript">@javascript;literal@</property>
 <script type="text/javascript">
 
 <!--
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp	27 Oct 2014 16:39:57 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp	3 Jul 2015 10:25:48 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
   The following application packages are not mounted anywhere.  You can delete an unmounted package by clicking the "delete" option.
 
Index: openacs-4/packages/acs-subsite/www/admin/users/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/users/new.adp	27 Oct 2014 16:39:57 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/users/new.adp	3 Jul 2015 10:25:48 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="doc(title)">Add a user</property>
 
 <formtemplate id="add_user"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/members/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/members/index.adp	27 Oct 2014 16:39:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/members/index.adp	3 Jul 2015 10:25:48 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context@</property>
-<property name="doc(title)">@page_title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <if @show_member_list_p@ true>
   <table cellpadding="3" cellspacing="3">
Index: openacs-4/packages/acs-subsite/www/members/member-invite.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-invite.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/members/member-invite.adp	27 Oct 2014 16:39:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/members/member-invite.adp	3 Jul 2015 10:25:48 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="focus">user_search.user_id</property>
 
 <h1>#acs-subsite.Invite_a_user#</h1>
Index: openacs-4/packages/acs-subsite/www/members/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/members/user-batch-add.adp	17 Jun 2015 07:47:59 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add.adp	3 Jul 2015 10:25:48 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Add a batch of users</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <form method="post" action="user-batch-add-2">
 <p>
Index: openacs-4/packages/acs-subsite/www/members/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/members/user-new.adp	27 Oct 2014 16:39:59 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/members/user-new.adp	3 Jul 2015 10:25:48 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="focus">register.first_names</property>
 
 <include src="@user_new_template@"
Index: openacs-4/packages/acs-subsite/www/permissions/grant.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/permissions/grant.adp	27 Oct 2014 16:39:59 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/permissions/grant.adp	3 Jul 2015 10:25:48 -0000	1.8
@@ -1,6 +1,6 @@
 <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="grant">
Index: openacs-4/packages/acs-subsite/www/permissions/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/permissions/index.adp	15 Jun 2015 11:14:19 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/permissions/index.adp	3 Jul 2015 10:25:49 -0000	1.7
@@ -1,6 +1,6 @@
   <master>
     <property name="doc(title)">#acs-subsite.Permissions#</property>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
 
     <if @objects:rowcount@ gt 0> 
       #acs-subsite.You_have_admin_rights_on#
Index: openacs-4/packages/acs-subsite/www/permissions/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/permissions/one.adp	17 Jun 2015 07:47:59 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/permissions/one.adp	3 Jul 2015 10:25:49 -0000	1.13
@@ -1,6 +1,6 @@
   <master>
   <property name="doc(title)">#acs-subsite.Permissions_for_name#</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
   <h3>#acs-subsite.lt_Inherited_Permissions#</h3>
   <if @inherited:rowcount@ gt 0>
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add.adp	27 Oct 2014 16:39:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add.adp	3 Jul 2015 10:25:49 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="perm-user-add-include">
Index: openacs-4/packages/acs-subsite/www/permissions/revoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/permissions/revoke.adp	27 Oct 2014 16:39:59 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/permissions/revoke.adp	3 Jul 2015 10:25:49 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/pvt/alerts.adp	27 Oct 2014 16:39:59 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.adp	3 Jul 2015 10:25:49 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @discussion_forum_alert_p@ eq 1>
 
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	27 Oct 2014 16:40:00 -0000	1.26
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	3 Jul 2015 10:25:49 -0000	1.27
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">user_info.first_names</property>
   <property name="displayed_object_id">@user_id@</property>
 
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	27 Oct 2014 16:40:00 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	3 Jul 2015 10:25:49 -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>
 
 <p> #acs-subsite.Account_at_system_closed# </p>
 
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	27 Oct 2014 16:40:00 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	3 Jul 2015 10:25:49 -0000	1.11
@@ -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>
 
     #acs-subsite.Close_account_explanation#
 
Index: openacs-4/packages/acs-subsite/www/register/account-closed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-closed.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/account-closed.adp	27 Oct 2014 16:40:00 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/account-closed.adp	3 Jul 2015 10:25:49 -0000	1.4
@@ -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>
 
 
 
Index: openacs-4/packages/acs-subsite/www/register/account-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-message.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/account-message.adp	27 Oct 2014 16:40:00 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/account-message.adp	3 Jul 2015 10:25:49 -0000	1.4
@@ -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> @message;noquote@ </p>
 
Index: openacs-4/packages/acs-subsite/www/register/display-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/display-message.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/register/display-message.adp	27 Oct 2014 16:40:01 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/register/display-message.adp	3 Jul 2015 10:25:49 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <p> @message;noquote@ </p>
 
Index: openacs-4/packages/acs-subsite/www/register/recover-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/register/recover-password.adp	27 Oct 2014 16:40:01 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/register/recover-password.adp	3 Jul 2015 10:25:49 -0000	1.9
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
-  <property name="focus">@focus;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+  <property name="focus">@focus;literal@</property>
 
 <if @recover_info.password_message@ nil>
   <p> #acs-subsite.Enter_your_username_to# </p>
Index: openacs-4/packages/acs-subsite/www/register/restore-bounce.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-bounce.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/restore-bounce.adp	27 Oct 2014 16:40:01 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/restore-bounce.adp	3 Jul 2015 10:25:49 -0000	1.3
@@ -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>#acs-mail-lite.Bounce_disabled#</p>
 
Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/register/restore-user.adp	27 Oct 2014 16:40:01 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/register/restore-user.adp	3 Jul 2015 10:25:49 -0000	1.11
@@ -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>#acs-subsite.Account_reopened_message#</p>
 
Index: openacs-4/packages/acs-subsite/www/register/user-join.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/register/user-join.adp	27 Oct 2014 16:40:01 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/register/user-join.adp	3 Jul 2015 10:25:49 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#acs-subsite.Join_group_name#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="join"></formtemplate>
 
Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	27 Oct 2014 16:40:01 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	3 Jul 2015 10:25:49 -0000	1.18
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
-  <property name="displayed_object_id">@user_id;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+  <property name="displayed_object_id">@user_id;literal@</property>
 
 <if @inline_portrait_state@ eq "inline">
       <div style="float:right">
Index: openacs-4/packages/acs-subsite/www/shared/confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/confirm.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/shared/confirm.adp	27 Oct 2014 16:40:01 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/shared/confirm.adp	3 Jul 2015 10:25:49 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name="context">#acs-subsite.Confirm#</property>
 
 @message@
Index: openacs-4/packages/acs-subsite/www/shared/parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/shared/parameters.adp	19 Jun 2015 19:52:03 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/shared/parameters.adp	3 Jul 2015 10:25:49 -0000	1.7
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
-  <property name="focus">@focus;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+  <property name="focus">@focus;literal@</property>
 
 <if @global_param_url@ defined>
 <h2>Global parameters</h2> 
Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/shared/portrait.adp	31 Mar 2009 14:58:07 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/shared/portrait.adp	3 Jul 2015 10:25:50 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <div style="padding: 1em; text-align: center;">
   <img @widthheight_param@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@" alt="#acs-subsite.lt_Portrait_of_first_last#">
Index: openacs-4/packages/acs-subsite/www/shared/send-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/shared/send-email.adp	27 Oct 2014 16:40:02 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/shared/send-email.adp	3 Jul 2015 10:25:50 -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>
 
 	
 <h4>#acs-subsite.mail_a_message_to# @first_names@ @last_name@</h4>
Index: openacs-4/packages/acs-subsite/www/shared/whos-online.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/shared/whos-online.adp	13 Sep 2009 23:54:41 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/shared/whos-online.adp	3 Jul 2015 10:25:50 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h1>#acs-subsite.Whos_Online_link_label#</h1>
 <listtemplate name="online_users"></listtemplate>
Index: openacs-4/packages/acs-subsite/www/site-map/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/site-map/index.adp	27 Oct 2014 16:40:02 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/site-map/index.adp	3 Jul 2015 10:25:50 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>	
-<property name="javascript">@javascript;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>	
+<property name="javascript">@javascript;literal@</property>
 <script type="text/javascript">
 
 <!--
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	27 Oct 2014 16:40:02 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	3 Jul 2015 10:25:50 -0000	1.17
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <h1>#acs-subsite.Your_Account#</h1>
 
Index: openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp	31 Mar 2009 14:43:06 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
   <property name="&doc">doc</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
 <formtemplate id=private-email></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/user/password-reset.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-reset.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/password-reset.adp	27 Oct 2014 16:40:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/password-reset.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
   <property name="doc(title)">#acs-subsite.Reset_Password#</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
 <if @message@ not nil>
   <div class="general-message">@message@</div>
Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	27 Oct 2014 16:40:03 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	3 Jul 2015 10:25:50 -0000	1.18
@@ -1,7 +1,7 @@
 <master>
   <property name="doc(title)">#acs-subsite.Update_Password#</property>
-  <property name="context">@context;noquote@</property>
-  <property name="focus">@focus;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="focus">@focus;literal@</property>
 
 <if @message@ not nil>
   <div class="general-message">@message@</div>
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	31 Mar 2009 14:39:45 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	3 Jul 2015 10:25:50 -0000	1.11
@@ -1,5 +1,5 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="comment_edit"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	31 Mar 2009 14:39:45 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	3 Jul 2015 10:25:50 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <if @admin_p@ eq 0>
   <p>#acs-subsite.lt_Sure_erase_your_por#</p>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	31 Mar 2009 14:39:45 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	3 Jul 2015 10:25:50 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <switch @return_code@>
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	31 Mar 2009 14:39:45 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	3 Jul 2015 10:25:50 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 
 <p>#acs-subsite.lt_How_would_you_like_the#</p>
Index: openacs-4/packages/acs-tcl/lib/ad-return-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/ad-return-error.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/lib/ad-return-error.adp	9 Feb 2010 22:39:47 -0000	1.3
+++ openacs-4/packages/acs-tcl/lib/ad-return-error.adp	3 Jul 2015 10:25:50 -0000	1.4
@@ -1,6 +1,6 @@
-<master>
-  <property name="doc(title)">@title;noquote@</property>
-
-<div id="user-message">
-	<p>@explanation;noquote@</p>
-</div>
+<master>
+  <property name="doc(title)">@title;literal@</property>
+
+<div id="user-message">
+	<p>@explanation;noquote@</p>
+</div>
Index: openacs-4/packages/acs-templating/www/doc/demo/list3/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list3/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list3/index.adp	27 Oct 2014 16:40:19 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list3/index.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="notes"></listtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list4/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list4/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list4/index.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list4/index.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="notes"></listtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list4/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list4/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list4/view-one.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list4/view-one.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@<br>
 @color@
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/demo/list5/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list5/add-edit.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list5/add-edit.adp	3 Jul 2015 10:25:50 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="add-edit"></formtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list5/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list5/index.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list5/index.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="notes"></listtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list5/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list5/view-one.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list5/view-one.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@<br>
 @color@
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list6/add-edit.adp	27 Oct 2014 16:40:20 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/add-edit.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="add-edit"></formtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list6/index.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/index.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="notes"></listtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list6/view-one.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/view-one.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@<br>
 @color@
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="add-edit"></formtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list7/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list7/index.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list7/index.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <table cellpadding="3" cellspacing="3">
   <tr>
Index: openacs-4/packages/acs-templating/www/doc/demo/list7/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list7/view-one.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list7/view-one.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/demo/list8/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list8/add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list8/add-edit.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list8/add-edit.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="add-edit"></formtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list8/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list8/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list8/index.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list8/index.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <table cellpadding="3" cellspacing="3">
   <tr>
Index: openacs-4/packages/acs-templating/www/doc/demo/list8/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list8/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list8/view-one.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list8/view-one.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/demo/list9/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list9/add-edit.adp	27 Oct 2014 16:40:21 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list9/add-edit.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="add-edit"></formtemplate>
 
Index: openacs-4/packages/acs-templating/www/doc/demo/list9/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list9/index.adp	27 Oct 2014 16:40:22 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list9/index.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Notes</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <table cellpadding="3" cellspacing="3">
   <tr>
Index: openacs-4/packages/acs-templating/www/doc/demo/list9/view-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/view-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/list9/view-one.adp	27 Oct 2014 16:40:22 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list9/view-one.adp	3 Jul 2015 10:25:51 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 @body;noquote@
\ No newline at end of file
Index: openacs-4/packages/assessment/lib/feedback.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/feedback.adp	15 May 2007 20:14:15 -0000	1.4
+++ openacs-4/packages/assessment/lib/feedback.adp	3 Jul 2015 10:33:37 -0000	1.5
@@ -1,5 +1,5 @@
-<property name="title">@assessment_data.html_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@assessment_data.html_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@: Feedback</h2></if>
 
Index: openacs-4/packages/assessment/lib/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/finish.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/finish.adp	1 Dec 2008 16:57:02 -0000	1.2
+++ openacs-4/packages/assessment/lib/finish.adp	3 Jul 2015 10:33:37 -0000	1.3
@@ -1,4 +1,4 @@
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <p><a href="session?session_id=@session_id@">#assessment.View_results#</a></p>
Index: openacs-4/packages/assessment/www/assessment-consent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-consent.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/assessment-consent.adp	1 Dec 2008 16:57:02 -0000	1.5
+++ openacs-4/packages/assessment/www/assessment-consent.adp	3 Jul 2015 10:33:37 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <p>
   @assessment_data.consent_page;noquote@
Index: openacs-4/packages/assessment/www/assessment-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-password.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/assessment-password.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/assessment-password.adp	3 Jul 2015 10:33:37 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="assessment_password"></formtemplate>
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	17 Jun 2015 07:57:55 -0000	1.27
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	3 Jul 2015 10:33:37 -0000	1.28
@@ -1,6 +1,6 @@
 
-<property name="title">@assessment_data.html_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@assessment_data.html_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 <!-- Pretty output starts here -->
Index: openacs-4/packages/assessment/www/assessment-single-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/assessment-single-submit.adp	17 Jun 2015 07:57:55 -0000	1.11
+++ openacs-4/packages/assessment/www/assessment-single-submit.adp	3 Jul 2015 10:33:37 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@assessment_data.html_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@assessment_data.html_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3"><!-- @assessment_data.html_title;noquote@ --></th></tr>
Index: openacs-4/packages/assessment/www/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/finish.adp	1 Dec 2008 16:57:02 -0000	1.6
+++ openacs-4/packages/assessment/www/finish.adp	3 Jul 2015 10:33:37 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @total_pages@ defined>
   <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages@" current="@current_page@" finish="1" />
Index: openacs-4/packages/assessment/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment/www/index.adp	1 Dec 2008 16:57:02 -0000	1.15
+++ openacs-4/packages/assessment/www/index.adp	3 Jul 2015 10:33:37 -0000	1.16
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <if @admin_p@ eq "1"><p style="text-align: right;"><a href="asm-admin/"><img src="/resources/assessment/admin.gif" style="border:0" alt="#acs-kernel.common_Administration#"></a></p></if>
 
Index: openacs-4/packages/assessment/www/instructions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/instructions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/instructions.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/instructions.adp	3 Jul 2015 10:33:37 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 @assessment_data.entry_page;noquote@
 <p>
   @assessment_data.instructions;noquote@
Index: openacs-4/packages/assessment/www/last-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/last-session.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/last-session.adp	22 Dec 2004 10:05:49 -0000	1.2
+++ openacs-4/packages/assessment/www/last-session.adp	3 Jul 2015 10:33:37 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Assessment</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="sessions"></listtemplate>
 
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/assessment/www/session.adp	1 Dec 2008 16:57:02 -0000	1.33
+++ openacs-4/packages/assessment/www/session.adp	3 Jul 2015 10:33:37 -0000	1.34
@@ -1,4 +1,4 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <include src="/packages/assessment/lib/session" session_id="@session_id@">
Index: openacs-4/packages/assessment/www/sessions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/sessions.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/sessions.adp	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/sessions.adp	3 Jul 2015 10:33:37 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <listtemplate name="sessions"></listtemplate>
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/www/admin/asm-action-admin.adp	1 Dec 2008 16:57:02 -0000	1.8
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.adp	3 Jul 2015 10:33:37 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#assessment.action_admin#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="actions"></listtemplate>
 <div><a href="asm-action-new">#assessment.add_new_action#</a></div>
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/asm-action-delete.adp	1 Dec 2008 16:57:02 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.adp	3 Jul 2015 10:33:37 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
 <property name="title">Action Delete</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="action_delete"></formtemplate>
Index: openacs-4/packages/assessment/www/admin/asm-action-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/asm-action-new.adp	1 Dec 2008 16:57:02 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/asm-action-new.adp	3 Jul 2015 10:33:37 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="action_admin"></formtemplate>
 
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	16 Jun 2015 09:26:25 -0000	1.8
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	3 Jul 2015 10:33:37 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="parameter_admin"></formtemplate>
 
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp	1 Dec 2008 16:57:02 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp	3 Jul 2015 10:33:37 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Param Delete</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="parameter_delete"></formtemplate>
 
Index: openacs-4/packages/assessment/www/admin/set-reg-assessment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/set-reg-assessment.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/set-reg-assessment.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/set-reg-assessment.adp	3 Jul 2015 10:33:37 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <if @asm_p@ eq 0>
 	#acs-subsite.no_assessment#
 </if>
Index: openacs-4/packages/assessment/www/asm-admin/action-params.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-params.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/action-params.adp	7 Apr 2005 23:08:18 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/action-params.adp	3 Jul 2015 10:33:37 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="title">@title;literal@</property>
 <formtemplate id="get_params"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/action-select.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-select.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/action-select.adp	7 Apr 2005 23:05:43 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/action-select.adp	3 Jul 2015 10:33:37 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="title">@title;literal@</property>
 <formtemplate id="get_action"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/add-edit-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/add-edit-check.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/add-edit-check.adp	7 Apr 2005 23:01:35 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/add-edit-check.adp	3 Jul 2015 10:33:38 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
 <property name="title">@title@ Triggers</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="new_check"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.adp	3 Jul 2015 10:33:38 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
   <property name="title">@title@ Triggers</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
 
 <formtemplate id="new_check"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/admin-master.adp	19 Dec 2007 11:55:07 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/admin-master.adp	3 Jul 2015 10:33:38 -0000	1.3
@@ -20,12 +20,12 @@
 
 <master>
   <property name="link_all">1</property>
-  <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @context@ not nil><property name="context">@context;noquote@</property></if>
-    <else><if @context_bar@ not nil><property name="context">@context_bar;noquote@</property></if></else>
+  <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+  <if @context@ not nil><property name="context">@context;literal@</property></if>
+    <else><if @context_bar@ not nil><property name="context">@context_bar;literal@</property></if></else>
   <if @doc_type@ not nil><property
   name="doc_type">@doc_type;noquote@</property></if>
-  <if @title@ not nil><property name="title">@title;noquote@</property></if>
+  <if @title@ not nil><property name="title">@title;literal@</property></if>
 
 <slave>
 
Index: openacs-4/packages/assessment/www/asm-admin/admin-request.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-request.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/admin-request.adp	16 Jun 2015 09:26:25 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/admin-request.adp	3 Jul 2015 10:33:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="admin-master">
 <property name="title">#assessment.Request# #assessment.Administration#</property>
-<property name="context_bar">@context;noquote@</property>
+<property name="context_bar">@context;literal@</property>
 
 <script type="text/javascript">
 
Index: openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="assessment_copy_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="assessment_delete_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.adp	2 Feb 2008 11:50:55 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.adp	3 Jul 2015 10:33:38 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="assessment_form"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-history.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/assessment-history.adp	15 Apr 2005 18:17:29 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/assessment-history.adp	3 Jul 2015 10:33:38 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="history"></listtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/assessment-new.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/assessment-new.adp	3 Jul 2015 10:33:38 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id=assessment_type></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp	4 Feb 2005 21:14:22 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp	3 Jul 2015 10:33:38 -0000	1.2
@@ -1,6 +1,6 @@
 
 <master>
-<property name="title">@spam_name@</property>
+<property name="title">@spam_name;literal@</property>
 <property name="context_bar">@context_bar@</property>
 <formtemplate id="spam_message"></formtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	3 Jul 2015 10:33:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="objects"></listtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	16 Jun 2015 09:26:25 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	3 Jul 2015 10:33:38 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 <h3>#assessment.Items#</h3>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-search.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/catalog-search.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/catalog-search.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="catalog_search"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	16 Jun 2015 09:26:25 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	3 Jul 2015 10:33:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 <multiple name="sections">
Index: openacs-4/packages/assessment/www/asm-admin/change-timing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/change-timing.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/change-timing.adp	17 Feb 2006 12:13:55 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/change-timing.adp	3 Jul 2015 10:33:38 -0000	1.2
@@ -1,4 +1,4 @@
 <master>
 <property name="title">#assessment.Change_timings#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id="change-timing"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">@title@ #assessment.Administration#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <br>
 <b>On Request (section check)</b>
 <br>
Index: openacs-4/packages/assessment/www/asm-admin/confirm-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/confirm-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/confirm-delete.adp	18 Feb 2005 16:32:29 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/confirm-delete.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="title">@title;literal@</property>
 <include src="/packages/assessment/lib/show-check-info">
 <formtemplate id=delete_checks></formtemplate> 
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/assessment/www/asm-admin/index.adp	1 Dec 2008 16:57:02 -0000	1.12
+++ openacs-4/packages/assessment/www/asm-admin/index.adp	3 Jul 2015 10:33:38 -0000	1.13
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 <if @package_admin_p@ eq 1>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_cb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_f"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_rb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_sa"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_sb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_ta"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_display_tb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_fu"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp	3 Jul 2015 10:33:38 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_mc_choices"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp	1 Dec 2008 16:57:02 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp	3 Jul 2015 10:33:38 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_add_mc_existing"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	3 Jul 2015 10:33:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
     <p>
       <a href="@add_existing_link@">#assessment.add_item_type_mc_existing#</a>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_oq"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_add_sa"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-swcat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-swcat.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-swcat.adp	19 Dec 2007 11:55:07 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-swcat.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
-  <property name="focus">@focus@</property>
+  <property name="title">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
+  <property name="focus">@focus;literal@</property>
   
 <formtemplate id="item-add-swcat"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	9 Sep 2008 17:28:22 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	3 Jul 2015 10:33:39 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id="item-add" style="accessible-forms">
 <!-- Form elements -->
 <fieldset>
Index: openacs-4/packages/assessment/www/asm-admin/item-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-copy.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-copy.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-copy.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_copy_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-create-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-create-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-create-2.adp	1 Dec 2008 16:57:02 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-create-2.adp	3 Jul 2015 10:33:39 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="title">Create a new Item</property>
 
 
Index: openacs-4/packages/assessment/www/asm-admin/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-create.adp	1 Dec 2008 16:57:02 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-create.adp	3 Jul 2015 10:33:39 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="title">Create a new Item</property>
 <formtemplate id="item-add"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-delete.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-delete.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_delete_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_display_cb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_edit_display_f"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_display_rb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_edit_display_sa"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_display_sb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_edit_display_ta"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_display_tb"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_fu"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	2 Sep 2008 16:48:39 -0000	1.8
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	3 Jul 2015 10:33:39 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="item_edit_general">
   <div><formwidget id="__confirmed_p"><formwidget id="__refreshing_p"><formwidget id="assessment_id"><formwidget id="section_id"><formwidget id="__key_signature"><formwidget id="__new_p"><formwidget id="as_item_id">
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp	1 Dec 2008 16:57:02 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp	3 Jul 2015 10:33:39 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_mc_choices"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp	1 Dec 2008 16:57:02 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_edit_mc_existing"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc.adp	7 Feb 2008 16:09:24 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc.adp	3 Jul 2015 10:33:39 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="item_edit_mc"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp	1 Dec 2008 16:57:03 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="item_edit_oq"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp	1 Dec 2008 16:57:03 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp	3 Jul 2015 10:33:39 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit_sa"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit.adp	1 Dec 2008 16:57:03 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="item_edit"></formtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	1 Dec 2008 16:57:03 -0000	1.21
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	3 Jul 2015 10:33:39 -0000	1.22
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@p_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@p_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="front">
 
Index: openacs-4/packages/assessment/www/asm-admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-section.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/one-section.adp	16 Jun 2015 09:26:25 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/one-section.adp	3 Jul 2015 10:33:39 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@section_id@">
 
Index: openacs-4/packages/assessment/www/asm-admin/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/permissions-user-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/permissions-user-add.adp	3 Feb 2005 14:44:51 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/permissions-user-add.adp	3 Jul 2015 10:33:39 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="title">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <formtemplate id="permissions"></formtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/permissions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/permissions.adp	3 Feb 2005 14:44:51 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/permissions.adp	3 Jul 2015 10:33:39 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="title">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" return_url="@return_url@" user_add_url="permissions-user-add">
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	16 Apr 2009 12:38:04 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	3 Jul 2015 10:33:40 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@tab@">
 
Index: openacs-4/packages/assessment/www/asm-admin/request-notification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/request-notification.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/request-notification.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/request-notification.adp	3 Jul 2015 10:33:40 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id=notify></formtemplate>
 <listtemplate name="notify_users"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/results-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/results-edit.adp	26 Sep 2006 00:22:46 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/results-edit.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h1>#assessment.Add_Comment#</h1>
 <h2>#assessment.item_Title#: @item_title;noquote@</h2>
Index: openacs-4/packages/assessment/www/asm-admin/results-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/results-export.adp	1 Dec 2008 16:57:03 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/results-export.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="assessment_export"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/results-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/results-session.adp	12 Feb 2008 11:05:46 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/results-session.adp	3 Jul 2015 10:33:40 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <div class="result">
 <h1>@assessment_data.title@</h1>
Index: openacs-4/packages/assessment/www/asm-admin/results-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/www/asm-admin/results-users.adp	28 Apr 2009 14:56:17 -0000	1.8
+++ openacs-4/packages/assessment/www/asm-admin/results-users.adp	3 Jul 2015 10:33:40 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="results">
 
Index: openacs-4/packages/assessment/www/asm-admin/save-answer-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/save-answer-set.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/save-answer-set.adp	7 Oct 2007 22:36:54 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/save-answer-set.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id="save-answer-set"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/section-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-copy.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/section-copy.adp	1 Dec 2008 16:57:03 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/section-copy.adp	3 Jul 2015 10:33:40 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="section_copy_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/section-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/section-delete.adp	1 Dec 2008 16:57:03 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/section-delete.adp	3 Jul 2015 10:33:40 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
   <formtemplate id="section_delete_confirm"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/section-display-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-display-form.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/section-display-form.adp	1 Dec 2008 16:57:03 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/section-display-form.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="section_display_form"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/section-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/section-form.adp	1 Dec 2008 16:57:03 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/section-form.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="section_form"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/asm-admin/section-preview.adp	16 Jun 2015 09:26:25 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp	3 Jul 2015 10:33:40 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3">@assessment_data.title@</th></tr>
Index: openacs-4/packages/assessment/www/asm-admin/section-select.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-select.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/section-select.adp	7 Apr 2005 23:10:41 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/section-select.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="title">@title;literal@</property>
 <formtemplate id="get_section"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/send-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/send-mail.adp	1 Dec 2008 16:57:03 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/send-mail.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
   <formtemplate id="send-mail"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/session-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/session-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/session-delete.adp	19 Dec 2007 11:55:07 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/session-delete.adp	3 Jul 2015 10:33:40 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id="session-delete"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/sessions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/sessions.adp	31 Jan 2008 16:06:26 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/sessions.adp	3 Jul 2015 10:33:40 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="title">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <if @assessment_data.html_title@ defined><h2>#assessment.lt_Responses_for_assessm#</h2></if>
   <if @person_name@ defined><h2>#assessment.lt_Responses_of_user_per#</h2></if>
 
Index: openacs-4/packages/assessment/www/asm-admin/unzip-file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/unzip-file.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/unzip-file.adp	1 Dec 2008 16:57:03 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/unzip-file.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Assessment</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <p>
 #assessment.Assessment_Imported_Correctly#
 <br>
Index: openacs-4/packages/bulk-mail/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bulk-mail/www/index.adp	27 Oct 2014 16:41:07 -0000	1.8
+++ openacs-4/packages/bulk-mail/www/index.adp	3 Jul 2015 10:33:37 -0000	1.9
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title;noquote@</property>
+<property name="title">@title;literal@</property>
 <property name="context"></property>
 
 <center>
Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/bulk-mail/www/one.adp	11 Mar 2008 15:53:27 -0000	1.12
+++ openacs-4/packages/bulk-mail/www/one.adp	3 Jul 2015 10:33:37 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="title">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @status@ eq "pending">
 #bulk-mail.Message_not_sent_yet#
Index: openacs-4/packages/categories/www/categories-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/categories-browse.adp	23 Jun 2015 14:42:10 -0000	1.7
+++ openacs-4/packages/categories/www/categories-browse.adp	3 Jul 2015 10:33:40 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
 
 <form action="categories-browse">
   #categories.lt_form_varsnoquote__Com# <input type="radio" name="join" value="and"<if @join@ eq "and"> #categories.checked#</if>#categories.AND__# <input type="radio" name="join" value="or"<if @join@ eq "or"> #categories.checked#</if>#categories.OR_#
Index: openacs-4/packages/categories/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/index.adp	27 Oct 2014 16:41:11 -0000	1.6
+++ openacs-4/packages/categories/www/index.adp	3 Jul 2015 10:33:40 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
 
 <if @admin_p@ eq 1>
   <div style="float: right;">
Index: openacs-4/packages/categories/www/search-result.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/search-result.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/search-result.adp	27 Oct 2014 16:41:11 -0000	1.2
+++ openacs-4/packages/categories/www/search-result.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context_bar;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
 
 <listtemplate name="search_result"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/category-delete.adp	20 May 2011 10:41:11 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/category-delete.adp	3 Jul 2015 10:33:40 -0000	1.6
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
   <b>#categories.lt_Are_you_sure_you_want#</b>
Index: openacs-4/packages/categories/www/cadmin/category-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/category-form.adp	9 Nov 2008 23:29:23 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/category-form.adp	3 Jul 2015 10:33:40 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 <property name="focus">category_form.name</property>
 
Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-add-2.adp	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-add-2.adp	3 Jul 2015 10:33:40 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="tree"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/category-link-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-add.adp	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-add.adp	3 Jul 2015 10:33:40 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="trees"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/category-link-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-link-delete.adp	20 May 2011 10:41:11 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/category-link-delete.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
   <b>#categories.lt_Are_you_sure_you_want_1#</b>
Index: openacs-4/packages/categories/www/cadmin/category-links-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-links-view.adp	20 May 2011 10:41:11 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/category-links-view.adp	3 Jul 2015 10:33:40 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="category_links"></listtemplate>
 #categories.lt_Explanation_Any_categ#
Index: openacs-4/packages/categories/www/cadmin/category-parent-change.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-parent-change.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-parent-change.adp	11 Feb 2004 10:01:11 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-parent-change.adp	3 Jul 2015 10:33:40 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="tree"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/category-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/category-usage.adp	23 Jun 2015 14:42:10 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/category-usage.adp	3 Jul 2015 10:33:41 -0000	1.7
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <!-- pagination context bar -->
 <table cellpadding="4" cellspacing="0" border="0" width="95%">
Index: openacs-4/packages/categories/www/cadmin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/index.adp	20 May 2011 10:41:11 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/index.adp	3 Jul 2015 10:33:41 -0000	1.7
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <h3>#categories.Trees_you_can_manage#</h3>
 
Index: openacs-4/packages/categories/www/cadmin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/master.adp	27 Oct 2014 16:41:12 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/master.adp	3 Jul 2015 10:33:41 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context_bar;noquote@</property>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context_bar;literal@</property>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
 
 <if @change_locale@ eq t and @languages@ not nil>
   <div style="float: right;">
Index: openacs-4/packages/categories/www/cadmin/object-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/object-map.adp	20 May 2011 10:41:12 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/object-map.adp	3 Jul 2015 10:33:41 -0000	1.4
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
 <h3>#categories.lt_Category_trees_mapped#</h3>
Index: openacs-4/packages/categories/www/cadmin/permission-manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/permission-manage.adp	20 May 2011 10:41:12 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/permission-manage.adp	3 Jul 2015 10:33:41 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 
 <p>
Index: openacs-4/packages/categories/www/cadmin/synonym-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/synonym-delete.adp	20 May 2011 10:41:12 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/synonym-delete.adp	3 Jul 2015 10:33:41 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
   <b>#categories.lt_Are_you_sure_you_want_2#</b>
Index: openacs-4/packages/categories/www/cadmin/synonym-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-form.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/synonym-form.adp	9 Nov 2008 23:29:23 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/synonym-form.adp	3 Jul 2015 10:33:41 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 <property name="focus">synonym_form.name</property>
 
Index: openacs-4/packages/categories/www/cadmin/synonyms-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/synonyms-view.adp	11 Feb 2004 13:25:28 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/synonyms-view.adp	3 Jul 2015 10:33:41 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="synonyms"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/tree-copy-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-copy-view.adp	11 Feb 2004 10:15:59 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-copy-view.adp	3 Jul 2015 10:33:41 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="tree"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/tree-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-copy.adp	5 Feb 2004 18:58:48 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-copy.adp	3 Jul 2015 10:33:41 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="trees"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	20 May 2011 10:41:12 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	3 Jul 2015 10:33:41 -0000	1.6
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
 <table>
Index: openacs-4/packages/categories/www/cadmin/tree-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-form.adp	9 Nov 2008 23:29:23 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/tree-form.adp	3 Jul 2015 10:33:41 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 <property name="focus">tree_form.tree_name</property>
 
Index: openacs-4/packages/categories/www/cadmin/tree-map-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/tree-map-2.adp	9 Nov 2008 23:29:23 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/tree-map-2.adp	3 Jul 2015 10:33:41 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 <property name="focus">tree_map_form.assign_single_p</property>
 
Index: openacs-4/packages/categories/www/cadmin/tree-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/tree-map.adp	11 Feb 2004 09:35:31 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/tree-map.adp	3 Jul 2015 10:33:41 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <listtemplate name="tree"></listtemplate>
Index: openacs-4/packages/categories/www/cadmin/tree-unmap.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-unmap.adp	20 May 2011 10:41:12 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/tree-unmap.adp	3 Jul 2015 10:33:41 -0000	1.5
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 #categories.lt_Are_you_sure_you_want_4#
 
Index: openacs-4/packages/categories/www/cadmin/tree-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-usage.adp	20 May 2011 10:41:12 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/tree-usage.adp	3 Jul 2015 10:33:41 -0000	1.5
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <p>
 <table>
Index: openacs-4/packages/categories/www/cadmin/tree-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-view.adp	6 Nov 2008 15:50:44 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/tree-view.adp	3 Jul 2015 10:33:41 -0000	1.5
@@ -1,7 +1,7 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
+<property name="locale">@locale;literal@</property>
 
 <include src="/packages/categories/lib/tree-form" &="tree_id" &="locale" &="ctx_id">
 
Index: openacs-4/packages/categories/www/cadmin/trees-code.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/trees-code.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/trees-code.adp	6 Jun 2005 09:43:47 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/trees-code.adp	3 Jul 2015 10:33:42 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="page_title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="page_title">@page_title;literal@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <property name="change_locale">f</property>
 
 <p>#categories.code_necessary#</p>
Index: openacs-4/packages/xotcl-core/www/cache.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/cache.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xotcl-core/www/cache.adp	27 Oct 2014 16:42:02 -0000	1.4
+++ openacs-4/packages/xotcl-core/www/cache.adp	3 Jul 2015 10:30:42 -0000	1.5
@@ -1,7 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @t1@ not nil>
 <h3>Memory Caches</h3>
Index: openacs-4/packages/xotcl-core/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xotcl-core/www/index.adp	27 Oct 2014 16:42:02 -0000	1.3
+++ openacs-4/packages/xotcl-core/www/index.adp	3 Jul 2015 10:30:42 -0000	1.4
@@ -1,7 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <div style='font-size: 70%'>
 @dimensional_slider;noquote@
Index: openacs-4/packages/xotcl-core/www/show-object.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-object.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/xotcl-core/www/show-object.adp	16 Jun 2015 08:33:09 -0000	1.8
+++ openacs-4/packages/xotcl-core/www/show-object.adp	3 Jul 2015 10:30:42 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <style>
 pre.code {
         font-size: 80%;
Index: openacs-4/packages/xotcl-core/www/version-numbers.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/version-numbers.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xotcl-core/www/version-numbers.adp	27 Oct 2014 16:42:02 -0000	1.2
+++ openacs-4/packages/xotcl-core/www/version-numbers.adp	3 Jul 2015 10:30:42 -0000	1.3
@@ -1,7 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h3>@title@</h3>
 <div style=  "font-size: 90%">
Index: openacs-4/packages/xowiki/www/diff.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/diff.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/xowiki/www/diff.adp	18 Jun 2015 19:02:12 -0000	1.8
+++ openacs-4/packages/xowiki/www/diff.adp	3 Jul 2015 10:30:42 -0000	1.9
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
   <property name="&doc">property_doc</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
  
 <property name="head">
 <style type='text/css'>
Index: openacs-4/packages/xowiki/www/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/edit.adp	27 Oct 2014 16:42:06 -0000	1.7
+++ openacs-4/packages/xowiki/www/edit.adp	3 Jul 2015 10:30:42 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@edit_form_page_title;noquote@</property>
+  <property name="doc(title)">@edit_form_page_title;literal@</property>
   <property name="&doc">property_doc</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">note.title</property>
 
 <style type='text/css'>
Index: openacs-4/packages/xowiki/www/error-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/error-template.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/error-template.adp	27 Oct 2014 16:42:06 -0000	1.6
+++ openacs-4/packages/xowiki/www/error-template.adp	3 Jul 2015 10:30:42 -0000	1.7
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="header_stuff">@header_stuff;noquote@
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
   </property>
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.70 -r1.71
--- openacs-4/packages/xowiki/www/oacs-view.adp	27 Apr 2015 15:28:23 -0000	1.70
+++ openacs-4/packages/xowiki/www/oacs-view.adp	3 Jul 2015 10:30:42 -0000	1.71
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.49 -r1.50
--- openacs-4/packages/xowiki/www/oacs-view2.adp	27 Apr 2015 15:28:23 -0000	1.49
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	3 Jul 2015 10:30:42 -0000	1.50
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/xowiki/www/oacs-view3.adp	27 Apr 2015 15:28:23 -0000	1.44
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	3 Jul 2015 10:30:42 -0000	1.45
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/revisions.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/revisions.adp	27 Oct 2014 16:42:06 -0000	1.6
+++ openacs-4/packages/xowiki/www/revisions.adp	3 Jul 2015 10:30:42 -0000	1.7
@@ -1,9 +1,9 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name="&doc">property_doc</property>
-<property name="header">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="displayed_object_id">@page_id;noquote@</property>
+<property name="header">@title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="displayed_object_id">@page_id;literal@</property>
 
 @content;noquote@
 
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	27 Apr 2015 15:28:23 -0000	1.27
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	3 Jul 2015 10:30:42 -0000	1.28
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/xowiki/www/view-book.adp	27 Apr 2015 15:28:23 -0000	1.38
+++ openacs-4/packages/xowiki/www/view-book.adp	3 Jul 2015 10:30:42 -0000	1.39
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.67 -r1.68
--- openacs-4/packages/xowiki/www/view-default.adp	27 Apr 2015 15:28:23 -0000	1.67
+++ openacs-4/packages/xowiki/www/view-default.adp	3 Jul 2015 10:30:42 -0000	1.68
@@ -1,7 +1,7 @@
 <!-- Generated by ::xowiki::ADP_Generator on Mon Feb 09 10:11:44 CET 2015 -->
 <master>
-                  <property name="doc(title)">@title;noquote@</property>
-                  <property name="context">@context;noquote@</property>
+                  <property name="doc(title)">@title;literal@</property>
+                  <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
Index: openacs-4/packages/xowiki/www/admin/import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/www/admin/import.adp	27 Oct 2014 16:42:07 -0000	1.9
+++ openacs-4/packages/xowiki/www/admin/import.adp	3 Jul 2015 10:30:42 -0000	1.10
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>  
+  <property name="doc(title)">@title;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>  
 
 <formtemplate id="upload_form">
 
Index: openacs-4/packages/xowiki/www/admin/importmsg.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/importmsg.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/admin/importmsg.adp	27 Oct 2014 16:42:07 -0000	1.7
+++ openacs-4/packages/xowiki/www/admin/importmsg.adp	3 Jul 2015 10:30:42 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>  
+  <property name="doc(title)">@title;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>  
 
 @msg;noquote@
 <br/><a href="../">Index</a>
Index: openacs-4/packages/xowiki/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/admin/index.adp	27 Oct 2014 16:42:07 -0000	1.11
+++ openacs-4/packages/xowiki/www/admin/index.adp	3 Jul 2015 10:30:42 -0000	1.12
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
 <style  type="text/css">
Index: openacs-4/packages/xowiki/www/admin/list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/admin/list.adp	27 Oct 2014 16:42:07 -0000	1.7
+++ openacs-4/packages/xowiki/www/admin/list.adp	3 Jul 2015 10:30:42 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
 <style  type="text/css">
Index: openacs-4/packages/xowiki/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/permissions.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/admin/permissions.adp	27 Oct 2014 16:42:07 -0000	1.7
+++ openacs-4/packages/xowiki/www/admin/permissions.adp	3 Jul 2015 10:30:42 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-include" &="object_id" &="return_url">