Index: openacs-4/packages/bookmarks/www/bookmark-add-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-add-import.adp	23 Jun 2015 16:24:15 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp	3 Jul 2015 11:19:03 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <include src="bookmark-header">
 <% set hidden_form_vars "<input type="hidden" name="return_url" value="@return_url@">
 <input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-add-one.adp	23 Jun 2015 16:24:15 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp	3 Jul 2015 11:19:03 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <include src="bookmark-header">
 <if @url_unreachable_p@ eq "t">
Index: openacs-4/packages/bookmarks/www/bookmark-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-delete.adp	6 Feb 2004 08:11:49 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-delete.adp	3 Jul 2015 11:19:03 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="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="bookmark-header">
 
Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-edit.adp	23 Jun 2015 16:24:15 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-edit.adp	3 Jul 2015 11:19:03 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 
 <form method=post action=bookmark-edit-2>
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-permissions.adp	23 Jun 2015 16:24:15 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp	3 Jul 2015 11:19:03 -0000	1.7
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
-<property name="viewed_user_id">@viewed_user_id;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="viewed_user_id">@viewed_user_id;literal@</property>
 <include src="bookmark-header">
 <form method=post action=bookmark-permissions-2>
 <input type="hidden" name="root_folder_id" value="@root_folder_id@">
Index: openacs-4/packages/bookmarks/www/bookmark-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-view.adp	22 May 2003 14:21:47 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-view.adp	3 Jul 2015 11:19:03 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="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>
 
 <ul>
 <li> Bookmark Title: @bookmark.local_title@</li>
Index: openacs-4/packages/bookmarks/www/bookmarks-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmarks-export.adp	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmarks-export.adp	3 Jul 2015 11:19:03 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <include src="bookmark-header">
 Clicking on the link below (alternatively you can right click on the link 
 and choose "Save Target As..." or "Save Link As...") will deliver your bookmarks file in a
Index: openacs-4/packages/bookmarks/www/bookmarks-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmarks-import.adp	29 Jun 2004 10:17:48 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmarks-import.adp	3 Jul 2015 11:19:04 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 Here are the results of the import:
 
Index: openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	22 May 2003 14:21:47 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	3 Jul 2015 11:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="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="most-popular">
 
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	6 Feb 2004 08:11:49 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	3 Jul 2015 11:19:04 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="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="bookmark-header">
 
 <if @user_list:rowcount@ eq 0>
Index: openacs-4/packages/bookmarks/www/complaint.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/complaint.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/complaint.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/complaint.adp	3 Jul 2015 11:19:04 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="title">Problem with Your Input</property>
+<property name="doc(title)">Problem with Your Input</property>
 
 We had
 <if @n_errors@ eq 1>
Index: openacs-4/packages/bookmarks/www/error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/error.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/error.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/error.adp	3 Jul 2015 11:19:04 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="title">Application Error</property>
+<property name="doc(title)">Application Error</property>
 
 We had
 <if @n_errors@ eq 1>
Index: openacs-4/packages/bookmarks/www/folder-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/folder-add.adp	23 Jun 2015 16:24:15 -0000	1.6
+++ openacs-4/packages/bookmarks/www/folder-add.adp	3 Jul 2015 11:19:04 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 <include src="bookmark-header">
 
 
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/bookmarks/www/index.adp	27 Jun 2015 12:32:47 -0000	1.17
+++ openacs-4/packages/bookmarks/www/index.adp	3 Jul 2015 11:19:04 -0000	1.18
@@ -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="header_stuff">
     <script runat="client">
       function launch_window(file) {
Index: openacs-4/packages/bookmarks/www/one-host.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/one-host.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/one-host.adp	22 May 2003 14:21:47 -0000	1.3
+++ openacs-4/packages/bookmarks/www/one-host.adp	3 Jul 2015 11:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="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>
 
 <ul>
 <multiple name="user_urls">
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/permissions-reset-all.adp	23 Jun 2015 16:24:15 -0000	1.4
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.adp	3 Jul 2015 11:19:04 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="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>
 
 Are you sure that you want to delete the individual access permissions
 on the following bookmarks to make your default (root) permissions apply?
Index: openacs-4/packages/bookmarks/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/search.adp	21 Jun 2004 22:29:00 -0000	1.7
+++ openacs-4/packages/bookmarks/www/search.adp	3 Jul 2015 11:19:04 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @viewed_user_id@ eq @browsing_user_id@>
 	<listtemplate name="my_list"></listtemplate>
Index: openacs-4/packages/bookmarks/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/admin/index.adp	22 May 2003 14:22:11 -0000	1.3
+++ openacs-4/packages/bookmarks/www/admin/index.adp	3 Jul 2015 11:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="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>
 
 <ul>
 
Index: openacs-4/packages/bookmarks/www/admin/site-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/site-info.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/admin/site-info.adp	22 May 2003 14:22:11 -0000	1.3
+++ openacs-4/packages/bookmarks/www/admin/site-info.adp	3 Jul 2015 11:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="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="../check-include" meta_titles_p="t" return_url="">
 
Index: openacs-4/packages/bug-tracker/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/master.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/bug-tracker/lib/master.adp	19 Sep 2013 15:37:33 -0000	1.15
+++ openacs-4/packages/bug-tracker/lib/master.adp	3 Jul 2015 11:19:06 -0000	1.16
@@ -1,14 +1,14 @@
 <master>
-  <property name="doc(title)">@title;noquote@</property>
-  <if @signatory@ not nil><property name="signatory">@signatory;noquote@</property></if>
-  <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @displayed_object_id@ not nil><property name="displayed_object_id">@displayed_object_id;noquote@</property></if>
+  <property name="doc(title)">@title;literal@</property>
+  <if @signatory@ not nil><property name="signatory">@signatory;literal@</property></if>
+  <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+  <if @displayed_object_id@ not nil><property name="displayed_object_id">@displayed_object_id;literal@</property></if>
   <property name="body_start_include">/packages/bug-tracker/lib/version-bar</property>
   <if @context_bar@ not nil>
-    <property name="context_bar">@context_bar;noquote@</property>
+    <property name="context_bar">@context_bar;literal@</property>
   </if>
   <if @context@ not nil>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
   </if>
 
 <include src="nav-bar" notification_link="@notification_link;noquote@">
Index: openacs-4/packages/bug-tracker/www/bug-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/bug-tracker/www/bug-add.adp	19 Sep 2013 15:37:33 -0000	1.11
+++ openacs-4/packages/bug-tracker/www/bug-add.adp	3 Jul 2015 11:19:06 -0000	1.12
@@ -1,6 +1,6 @@
 <master src="../lib/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">bug.component_id</property>
 
 <table align="right">
Index: openacs-4/packages/bug-tracker/www/bug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/bug-tracker/www/bug.adp	19 Sep 2013 15:37:33 -0000	1.17
+++ openacs-4/packages/bug-tracker/www/bug.adp	3 Jul 2015 11:19:06 -0000	1.18
@@ -1,9 +1,9 @@
 <master src="../lib/master">
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="displayed_object_id">@bug.bug_id;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="displayed_object_id">@bug.bug_id;literal@</property>
 
-<if @notification_link@ not nil><property name="notification_link">@notification_link;noquote@</property></if>
+<if @notification_link@ not nil><property name="notification_link">@notification_link;literal@</property></if>
 
 <p>
   <formtemplate id="bug"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/bulk-update-op.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bulk-update-op.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/bulk-update-op.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/bulk-update-op.adp	3 Jul 2015 11:19:06 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 <br>
 <formtemplate id="bug"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/bug-tracker/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bug-tracker/www/index.adp	19 Sep 2013 15:37:33 -0000	1.10
+++ openacs-4/packages/bug-tracker/www/index.adp	3 Jul 2015 11:19:06 -0000	1.11
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 <table cellpadding="3" cellspacing="3">
 
Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	19 Sep 2013 15:37:33 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	3 Jul 2015 11:19:06 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../lib/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 @open_bugs:rowcount@ not eq 0>
 #bug-tracker.Select_one_or_more_of#
Index: openacs-4/packages/bug-tracker/www/no-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-bugs.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/no-bugs.adp	19 Sep 2013 15:37:33 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/no-bugs.adp	3 Jul 2015 11:19:06 -0000	1.10
@@ -1,6 +1,6 @@
 <master src="../lib/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>
   <i>#bug-tracker.This_project_is_empty#</i>
Index: openacs-4/packages/bug-tracker/www/no-components.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-components.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/no-components.adp	19 Sep 2013 15:37:33 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/no-components.adp	3 Jul 2015 11:19:06 -0000	1.9
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 #bug-tracker.Before_getting_started#
 
Index: openacs-4/packages/bug-tracker/www/notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/notifications.adp	19 Sep 2013 15:37:33 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/notifications.adp	3 Jul 2015 11:19:06 -0000	1.7
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 <table cellspacing="1" cellpadding="3" class="bt_listing">
   <tr class="bt_listing_header">
Index: openacs-4/packages/bug-tracker/www/patch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/patch-add.adp	19 Sep 2013 15:37:33 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/patch-add.adp	3 Jul 2015 11:19:06 -0000	1.9
@@ -1,6 +1,6 @@
 <master src="../lib/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">patch.summary</property>
 
 <table align="right">
Index: openacs-4/packages/bug-tracker/www/patch-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-list.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/patch-list.adp	19 Sep 2013 15:37:33 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/patch-list.adp	3 Jul 2015 11:19:06 -0000	1.9
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 <table cellpadding="3" cellspacing="3">
 
Index: openacs-4/packages/bug-tracker/www/patch.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/patch.adp	23 Jun 2015 14:53:51 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/patch.adp	3 Jul 2015 11:19:06 -0000	1.10
@@ -1,7 +1,7 @@
 <master src="../lib/master">
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-<property name="displayed_object_id">@patch.patch_id;noquote@</property>
+<property name="doc(title)">@page_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="displayed_object_id">@patch.patch_id;literal@</property>
 
 <formtemplate id="patch"></formtemplate>
 
Index: openacs-4/packages/bug-tracker/www/prefs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/prefs.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/prefs.adp	19 Sep 2013 15:37:33 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/prefs.adp	3 Jul 2015 11:19:06 -0000	1.7
@@ -1,6 +1,6 @@
 <master src="../lib/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">prefs.user_version</property>
 
 <formtemplate id="prefs"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/related-file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/related-file-add.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/related-file-add.adp	3 Jul 2015 11:19:07 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/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">related.upload_file</property>
 
 <formtemplate id="related"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/related-file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/related-file-delete.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/related-file-delete.adp	3 Jul 2015 11:19:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../lib/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="delete_related"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/related-file-properties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-properties.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/related-file-properties.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/related-file-properties.adp	3 Jul 2015 11:19:07 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/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>
 
 <br>
 <listtemplate name="related_file_revisions"></listtemplate>
Index: openacs-4/packages/bug-tracker/www/related-file-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-update.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/related-file-update.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/related-file-update.adp	3 Jul 2015 11:19:07 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/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">related.upload_file</property>
 
 <formtemplate id="related"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/send-summary-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/send-summary-email.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/send-summary-email.adp	19 Sep 2013 15:37:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/send-summary-email.adp	3 Jul 2015 11:19:07 -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>
 
 <formtemplate id="bug"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/bug-tracker/www/admin/categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/categories.adp	19 Sep 2013 15:37:33 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/categories.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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>
 
 
 <blockquote>
Index: openacs-4/packages/bug-tracker/www/admin/category-defaults.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-defaults.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/admin/category-defaults.adp	19 Sep 2013 15:37:33 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/admin/category-defaults.adp	3 Jul 2015 11:19:07 -0000	1.7
@@ -1,5 +1,5 @@
 <master src="../../lib/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>
 
 <formtemplate id="setup"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/category-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/category-edit.adp	19 Sep 2013 15:37:33 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/category-edit.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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>
 <property name="focus">keyword.heading</property>
 
 <formtemplate id="keyword"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/component-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/component-ae.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/component-ae.adp	19 Sep 2013 15:37:34 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/component-ae.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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">component.name</property>
 
 <formtemplate id="component"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/bug-tracker/www/admin/index.adp	19 Sep 2013 15:37:34 -0000	1.12
+++ openacs-4/packages/bug-tracker/www/admin/index.adp	3 Jul 2015 11:19:07 -0000	1.13
@@ -1,6 +1,6 @@
 <master src="../../lib/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>
 
 <blockquote>
 
Index: openacs-4/packages/bug-tracker/www/admin/initial-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/initial-setup.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	19 Sep 2013 15:37:34 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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>
 
 #bug-tracker.Initial_Setup#
 
Index: openacs-4/packages/bug-tracker/www/admin/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/permissions-user-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/permissions-user-add.adp	19 Sep 2013 15:37:34 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/permissions-user-add.adp	3 Jul 2015 11:19:07 -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/bug-tracker/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/permissions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/admin/permissions.adp	19 Sep 2013 15:37:34 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/admin/permissions.adp	3 Jul 2015 11:19:07 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../../lib/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="@object_id@" user_add_url="permissions-user-add">
 
Index: openacs-4/packages/bug-tracker/www/admin/project-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/project-edit.adp	19 Sep 2013 15:37:34 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/project-edit.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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">project.name</property>
 
 <formtemplate id="project"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp	19 Sep 2013 15:37:34 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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">project_maintainer.maintainer</property>
 
 <formtemplate id="project_maintainer"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/version-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-ae.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/version-ae.adp	19 Sep 2013 15:37:34 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/version-ae.adp	3 Jul 2015 11:19:07 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="../../lib/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">version.version_name</property>
 
 <formtemplate id="version"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/version-release.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-release.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/admin/version-release.adp	19 Sep 2013 15:37:34 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/admin/version-release.adp	3 Jul 2015 11:19:07 -0000	1.7
@@ -1,6 +1,6 @@
 <master src="../../lib/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">version.actual_release_date</property>
 
 <formtemplate id="version"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/versions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/versions.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/admin/versions.adp	19 Sep 2013 15:37:34 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/admin/versions.adp	3 Jul 2015 11:19:07 -0000	1.10
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
 <property name="doc(title)">@project_name;noquote@ Versions</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context_bar">@context_bar;literal@</property>
 
 <h3>#bug-tracker.In_Development#</h3>
 
Index: openacs-4/packages/directory/templates/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/templates/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/directory/templates/master.adp	12 Sep 2013 20:25:58 -0000	1.4
+++ openacs-4/packages/directory/templates/master.adp	3 Jul 2015 11:19:10 -0000	1.5
@@ -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="header_stuff"><style>
 <!--
 pre, code { 
Index: openacs-4/packages/directory/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/directory/www/index.adp	23 Jun 2015 16:41:43 -0000	1.9
+++ openacs-4/packages/directory/www/index.adp	3 Jul 2015 11:19:10 -0000	1.10
@@ -1,6 +1,6 @@
 <master src="@master_template@">
-<property name="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=index>
  @search_vars;noquote@
Index: openacs-4/packages/download/www/archive-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/archive-add.adp	23 Jun 2015 16:26:04 -0000	1.8
+++ openacs-4/packages/download/www/archive-add.adp	3 Jul 2015 11:19:05 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Add a New Software Archive</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-add-2">
 <%= [export_vars -form {archive_type_id return_url}]%>
Index: openacs-4/packages/download/www/archive-version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-version-add.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/archive-version-add.adp	23 Jun 2015 16:26:04 -0000	1.8
+++ openacs-4/packages/download/www/archive-version-add.adp	3 Jul 2015 11:19:05 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Add a New Software Archive</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-version-add-2">
 <%= [export_vars -form {archive_id return_url}]%>
Index: openacs-4/packages/download/www/download-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/download/www/download-verify.adp	12 Sep 2013 22:02:06 -0000	1.10
+++ openacs-4/packages/download/www/download-verify.adp	3 Jul 2015 11:19:05 -0000	1.11
@@ -1,6 +1,6 @@
   <master>
     <property name="doc(title)">Download @archive_name;noquote@ @version_name;noquote@</property>
-    <property name="context">@context;noquote@</property>
+    <property name="context">@context;literal@</property>
 
     <h3>#download.lt_Download_archive_name_1#</h3>
     <table>
Index: openacs-4/packages/download/www/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/help.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/help.adp	1 Jul 2015 18:41:28 -0000	1.8
+++ openacs-4/packages/download/www/help.adp	3 Jul 2015 11:19:05 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Help on @title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 @help_text@
 
Index: openacs-4/packages/download/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/download/www/index.adp	1 Jul 2015 18:41:28 -0000	1.14
+++ openacs-4/packages/download/www/index.adp	3 Jul 2015 11:19:05 -0000	1.15
@@ -1,6 +1,6 @@
 
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name="context"></property>
 
 <if @master_admin_p@ eq 1>
Index: openacs-4/packages/download/www/one-archive.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-archive.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/one-archive.adp	23 Jun 2015 16:26:04 -0000	1.8
+++ openacs-4/packages/download/www/one-archive.adp	3 Jul 2015 11:19:05 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">One Archive: @archive_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <if @master_admin_p@ eq 1>
 <table align="right"><tr><td><a href="admin/">#download.Administration#</a></td></tr></table>
Index: openacs-4/packages/download/www/one-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-metadata.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/www/one-metadata.adp	23 Jun 2015 16:26:04 -0000	1.6
+++ openacs-4/packages/download/www/one-metadata.adp	3 Jul 2015 11:19:05 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">One @pretty_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h4>@pretty_name@</h4>
 
Index: openacs-4/packages/download/www/one-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/download/www/one-revision.adp	24 Jun 2015 05:17:33 -0000	1.12
+++ openacs-4/packages/download/www/one-revision.adp	3 Jul 2015 11:19:05 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">One Revision: @archive_name;noquote@ ver. @version_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <if @master_admin_p@ eq 1>
 <table align="right"><tr><td><a href="admin/">#download.Administration#</a></td></tr></table>
Index: openacs-4/packages/download/www/admin/approve-or-reject.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	23 Jun 2015 16:26:04 -0000	1.9
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	3 Jul 2015 11:19:05 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">@pretty_noun;noquote@ @archive_name;noquote@ @version_name;noquote@</property>
-<property name="context">@pretty_noun;noquote@</property>
+<property name="context">@pretty_noun;literal@</property>
 
   <table>
   <form action=approve-or-reject-2.tcl>
Index: openacs-4/packages/download/www/admin/report-by-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/download/www/admin/report-by-ip.adp	1 Jul 2015 18:41:28 -0000	1.12
+++ openacs-4/packages/download/www/admin/report-by-ip.adp	3 Jul 2015 11:19:06 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#download.Downloads_by_IP#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 <form method="post" action="spam-users">
Index: openacs-4/packages/download/www/admin/report-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/download/www/admin/report-by-user.adp	1 Jul 2015 18:41:28 -0000	1.11
+++ openacs-4/packages/download/www/admin/report-by-user.adp	3 Jul 2015 11:19:06 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#download.Downloads_by_User#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 <form method="post" action="spam-users">
Index: openacs-4/packages/download/www/admin/report-one-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/download/www/admin/report-one-ip.adp	12 Sep 2013 22:02:07 -0000	1.10
+++ openacs-4/packages/download/www/admin/report-one-ip.adp	3 Jul 2015 11:19:06 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Downloads by IP @download_ip;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 <form method="post" action="spam-users">
Index: openacs-4/packages/download/www/admin/report-one-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/download/www/admin/report-one-user.adp	12 Sep 2013 22:02:07 -0000	1.9
+++ openacs-4/packages/download/www/admin/report-one-user.adp	3 Jul 2015 11:19:06 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Downloads by User @first_names;noquote@ @last_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 @dimensional_html;noquote@
 
Index: openacs-4/packages/download/www/admin/report-version-downloads.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/download/www/admin/report-version-downloads.adp	12 Sep 2013 22:02:07 -0000	1.10
+++ openacs-4/packages/download/www/admin/report-version-downloads.adp	3 Jul 2015 11:19:06 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">@archive_name;noquote@ Download History</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
 <form method="post" action="spam-users">
Index: openacs-4/packages/download/www/admin/repository-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/admin/repository-metadata.adp	1 Jul 2015 18:41:29 -0000	1.7
+++ openacs-4/packages/download/www/admin/repository-metadata.adp	3 Jul 2015 11:19:06 -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>
 
 <formtemplate id="add_metadata"></formtemplate>
 
Index: openacs-4/packages/download/www/admin/repository-reasons-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/admin/repository-reasons-edit.adp	12 Sep 2013 22:02:08 -0000	1.5
+++ openacs-4/packages/download/www/admin/repository-reasons-edit.adp	3 Jul 2015 11:19:06 -0000	1.6
@@ -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>
 
 <formtemplate id="edit_reason"></formtemplate>
Index: openacs-4/packages/download/www/admin/repository-reasons.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/admin/repository-reasons.adp	1 Jul 2015 18:41:29 -0000	1.7
+++ openacs-4/packages/download/www/admin/repository-reasons.adp	3 Jul 2015 11:19:06 -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>#download.lt_Add_a_new_Download_Re#</h3>
 
Index: openacs-4/packages/download/www/admin/repository-types-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/admin/repository-types-edit.adp	12 Sep 2013 22:02:08 -0000	1.5
+++ openacs-4/packages/download/www/admin/repository-types-edit.adp	3 Jul 2015 11:19:06 -0000	1.6
@@ -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>
 
 <formtemplate id="edit_type"></formtemplate>
Index: openacs-4/packages/download/www/admin/repository-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/admin/repository-types.adp	1 Jul 2015 18:41:29 -0000	1.7
+++ openacs-4/packages/download/www/admin/repository-types.adp	3 Jul 2015 11:19:06 -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>
 
 <formtemplate id="add_type"></formtemplate>
 
Index: openacs-4/packages/edit-this-page/templates/article-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-content.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/article-content.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/article-content.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 @pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/article-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/article-index.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/article-index.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <if @pa.content@ not nil>
 @pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/faq-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-content.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/faq-content.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/faq-content.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="/packages/edit-this-page/www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <blockquote>
 <b>Q:</b> <em>@pa.title@</em>
Index: openacs-4/packages/edit-this-page/templates/faq-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/faq-index.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/faq-index.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="/packages/edit-this-page/www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <p>
 
Index: openacs-4/packages/edit-this-page/templates/journal-article.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-article.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/journal-article.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/journal-article.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 @pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/journal-issue.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-issue.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/journal-issue.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/journal-issue.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <if @pa.content@ not nil>
 @pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/news-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-content.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/templates/news-content.adp	12 Sep 2013 06:30:56 -0000	1.4
+++ openacs-4/packages/edit-this-page/templates/news-content.adp	3 Jul 2015 11:19:01 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <if @pa.subtitle@ not nil>
 <blockquote><b>@pa.subtitle@</b></blockquote>
Index: openacs-4/packages/edit-this-page/templates/news-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/templates/news-index.adp	12 Sep 2013 06:30:56 -0000	1.5
+++ openacs-4/packages/edit-this-page/templates/news-index.adp	3 Jul 2015 11:19:01 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
 <if @pa.content@ not nil>
 @pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/subnav-article-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/subnav-article-content.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/templates/subnav-article-content.adp	12 Sep 2013 06:30:57 -0000	1.3
+++ openacs-4/packages/edit-this-page/templates/subnav-article-content.adp	3 Jul 2015 11:19:01 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
 
       <div id="subnavbar-div">
         <div id="subnavbar-container">
Index: openacs-4/packages/edit-this-page/templates/subnav-article-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/subnav-article-index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/templates/subnav-article-index.adp	12 Sep 2013 06:30:57 -0000	1.3
+++ openacs-4/packages/edit-this-page/templates/subnav-article-index.adp	3 Jul 2015 11:19:01 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="doc(title)">@pa.title;noquote@</property>
-<property name="context">@pa.context;noquote@</property>
+<property name="doc(title)">@pa.title;literal@</property>
+<property name="context">@pa.context;literal@</property>
       <div id="subnavbar-div">
         <div id="subnavbar-container">
           <div id="subnavbar">
Index: openacs-4/packages/edit-this-page/www/etp-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-create.adp	12 Sep 2013 06:30:57 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-create.adp	3 Jul 2015 11:19:01 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="etp-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 method="post" action="etp-create-2">
 <table width="100%" cellspacing="0" cellpadding="6">
Index: openacs-4/packages/edit-this-page/www/etp-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/edit-this-page/www/etp-edit.adp	12 Sep 2013 06:30:57 -0000	1.7
+++ openacs-4/packages/edit-this-page/www/etp-edit.adp	3 Jul 2015 11:19:01 -0000	1.8
@@ -1,4 +1,4 @@
 <master src="etp-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="etp_edit"></formtemplate>
Index: openacs-4/packages/edit-this-page/www/etp-extlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-extlink.adp	12 Sep 2013 06:30:57 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-extlink.adp	3 Jul 2015 11:19:01 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="etp-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 method="post" action="etp-extlink">
 @form_vars;noquote@
Index: openacs-4/packages/edit-this-page/www/etp-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/edit-this-page/www/etp-history.adp	23 Jun 2015 16:10:45 -0000	1.7
+++ openacs-4/packages/edit-this-page/www/etp-history.adp	3 Jul 2015 11:19:01 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="etp-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>
 
 <table width="100%">
   <tr>
Index: openacs-4/packages/edit-this-page/www/etp-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/edit-this-page/www/etp-master.adp	12 Sep 2013 06:30:57 -0000	1.8
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,10 +1,10 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 <if @context_bar@ not nil>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;literal@</property>
 </if>
 <else>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 </else>
 
 <slave>
Index: openacs-4/packages/edit-this-page/www/etp-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/edit-this-page/www/etp-setup.adp	23 Jun 2015 16:10:45 -0000	1.7
+++ openacs-4/packages/edit-this-page/www/etp-setup.adp	3 Jul 2015 11:19:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master src="etp-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>
 
 #edit-this-page.lt_The_ETP_application#
 
Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	12 Sep 2013 06:30:57 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	3 Jul 2015 11:19:02 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="etp-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 method="post" action="etp-subtopic-create">
 @form_vars;noquote@
Index: openacs-4/packages/edit-this-page/www/etp-symlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/www/etp-symlink.adp	23 Jun 2015 16:10:45 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-symlink.adp	3 Jul 2015 11:19:02 -0000	1.7
@@ -1,6 +1,6 @@
 <master src="etp-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>
 
 <multiple name="all_pages">
 e@all_pages.indent;noquote@
Index: openacs-4/packages/edit-this-page/www/etp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/edit-this-page/www/etp.adp	12 Sep 2013 06:30:57 -0000	1.8
+++ openacs-4/packages/edit-this-page/www/etp.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master src="etp-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>
 
 <table width="100%"><tr>
 <td valign="top">
Index: openacs-4/packages/lars-blogger/www/category-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/category-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/www/category-edit.adp	12 Sep 2013 20:36:35 -0000	1.5
+++ openacs-4/packages/lars-blogger/www/category-edit.adp	3 Jul 2015 11:19:04 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title@</property>
+<property name="doc(title)">@page_title;literal@</property>
 <property name="focus">category.name</property>   
-<property name="context">@context@</property>   
+<property name="context">@context;literal@</property>   
 
 <formtemplate id="category"></formtemplate>
 
Index: openacs-4/packages/lars-blogger/www/drafts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/www/drafts.adp	12 Sep 2013 20:36:35 -0000	1.6
+++ openacs-4/packages/lars-blogger/www/drafts.adp	3 Jul 2015 11:19:04 -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>
 
 <p><listtemplate name="entries"></listtemplate></p>
 
Index: openacs-4/packages/lars-blogger/www/entry-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/www/entry-delete.adp	12 Sep 2013 20:36:35 -0000	1.2
+++ openacs-4/packages/lars-blogger/www/entry-delete.adp	3 Jul 2015 11:19:04 -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>
 
 <p>
 Are you sure you want to delete this entry?
Index: openacs-4/packages/lars-blogger/www/entry-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/lars-blogger/www/entry-edit.adp	12 Sep 2013 20:36:35 -0000	1.7
+++ openacs-4/packages/lars-blogger/www/entry-edit.adp	3 Jul 2015 11:19:04 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
-<property name="doc(title)">@page_title@</property>
+<property name="doc(title)">@page_title;literal@</property>
 <property name="focus">entry.title</property>   
-<property name="context">@context@</property>   
+<property name="context">@context;literal@</property>   
 
 <script type="text/javascript">
     function setEntryDateToToday() {
Index: openacs-4/packages/lars-blogger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/lars-blogger/www/index.adp	12 Sep 2013 20:36:35 -0000	1.43
+++ openacs-4/packages/lars-blogger/www/index.adp	3 Jul 2015 11:19:04 -0000	1.44
@@ -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 class="lars_blogger_body">
 
Index: openacs-4/packages/lars-blogger/www/one-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/lars-blogger/www/one-entry.adp	12 Sep 2013 20:36:35 -0000	1.21
+++ openacs-4/packages/lars-blogger/www/one-entry.adp	3 Jul 2015 11:19:04 -0000	1.22
@@ -1,7 +1,7 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>   
-  <property name="displayed_object_id">@entry_id;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>   
+  <property name="displayed_object_id">@entry_id;literal@</property>
 
 <div class="lars_blogger_body">
   <include src="entry-chunk" &="blog" screen_name="@screen_name@" perma_p="1" max_content_length="0" manageown_p="@manageown_p@" unpublish_p="@unpublish_p@" />
Index: openacs-4/packages/lars-blogger/www/screen-name-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/screen-name-setup.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/screen-name-setup.adp	12 Sep 2013 20:36:35 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/screen-name-setup.adp	3 Jul 2015 11:19:05 -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>   
 
 <p>
   #lars-blogger.lt_Before_you_can_start_#
Index: openacs-4/packages/lars-blogger/www/admin/blogroll-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/blogroll-ae.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/admin/blogroll-ae.adp	12 Sep 2013 20:36:35 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/admin/blogroll-ae.adp	3 Jul 2015 11:19:05 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
   <property name="doc(title)">#lars-blogger.lt_blog_namenoquote_Blog#</property>
-  <property name="context">@context;noquote@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">entry_form.name</property>
 
 <formtemplate id="entry_form"></formtemplate>
Index: openacs-4/packages/lars-blogger/www/admin/blogroll.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/blogroll.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/admin/blogroll.adp	12 Sep 2013 20:36:35 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/admin/blogroll.adp	3 Jul 2015 11:19:05 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#lars-blogger.blog_name_Blogroll#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <listtemplate name="links"></listtemplate>
 
Index: openacs-4/packages/lars-blogger/www/admin/bookmarklet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/bookmarklet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/admin/bookmarklet.adp	12 Sep 2013 20:36:35 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/admin/bookmarklet.adp	3 Jul 2015 11:19:05 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#lars-blogger.lt_blog_name_Bookmarklet#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
     #lars-blogger.lt_Drag_the_bookmarklet_#
Index: openacs-4/packages/lars-blogger/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/lars-blogger/www/admin/index.adp	12 Sep 2013 20:36:35 -0000	1.19
+++ openacs-4/packages/lars-blogger/www/admin/index.adp	3 Jul 2015 11:19:05 -0000	1.20
@@ -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>
 
 <ul class="action-links">
   <li><a href="../entry-edit" title="Add new blog entry" class="action_link">#lars-blogger.Add_new_blog_entry#</a></li>
Index: openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp	12 Sep 2013 20:36:35 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp	3 Jul 2015 11:19:05 -0000	1.5
@@ -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>
 #lars-blogger.lt_This_utility_script_w#
 <p>
 #lars-blogger.lt_Proceed_only_if_you_a#
Index: openacs-4/packages/lars-blogger/www/admin/ping-url-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-url-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/admin/ping-url-add.adp	12 Sep 2013 20:36:35 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/admin/ping-url-add.adp	3 Jul 2015 11:19:05 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#lars-blogger.lt_blog_name_Add_Ping_UR#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <property name="focus">ping_url_add.ping_url</property>
 
 <formtemplate id="ping_url_add"></formtemplate>
Index: openacs-4/packages/lars-blogger/www/admin/ping-urls.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-urls.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/admin/ping-urls.adp	12 Sep 2013 20:36:36 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/admin/ping-urls.adp	3 Jul 2015 11:19:05 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#lars-blogger.lt_blog_namenoquote_Ping#</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <p>
     #lars-blogger.lt_Whenever_you_update_y#
Index: openacs-4/packages/oct-election/www/election-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/oct-election/www/election-edit.adp	12 Sep 2013 11:33:41 -0000	1.2
+++ openacs-4/packages/oct-election/www/election-edit.adp	3 Jul 2015 11:19:02 -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>
   
 <formtemplate id="election"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/oct-election/www/election.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/oct-election/www/election.adp	12 Sep 2013 11:33:41 -0000	1.4
+++ openacs-4/packages/oct-election/www/election.adp	3 Jul 2015 11:19:02 -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>Election: @label@
 <p>Number of OCT vacancies: @number_of_candidates@
Index: openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp	12 Sep 2013 11:33:41 -0000	1.3
+++ openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp	3 Jul 2015 11:19:02 -0000	1.4
@@ -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>
   
 <multiple name="users">
 
Index: openacs-4/packages/oct-election/www/find-match-cvs-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/oct-election/www/find-match-cvs-users.adp	12 Sep 2013 11:33:41 -0000	1.3
+++ openacs-4/packages/oct-election/www/find-match-cvs-users.adp	3 Jul 2015 11:19:02 -0000	1.4
@@ -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>
   
 <form method="get" action="find-match-cvs-users-2">
    Find a user match for cvs user: @cvs_user@ <input type="text" name="search_text"><input type="submit" value="Search">
Index: openacs-4/packages/oct-election/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/oct-election/www/index.adp	12 Sep 2013 11:33:41 -0000	1.3
+++ openacs-4/packages/oct-election/www/index.adp	3 Jul 2015 11:19:02 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="context">"@context;noquote@"</property>
 
 <listtemplate name="elections"></listtemplate>
Index: openacs-4/packages/oct-election/www/match-cvs-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/match-cvs-users.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/oct-election/www/match-cvs-users.adp	12 Sep 2013 11:33:41 -0000	1.3
+++ openacs-4/packages/oct-election/www/match-cvs-users.adp	3 Jul 2015 11:19:02 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   
 <listtemplate name="users_info"></listtemplate>
Index: openacs-4/packages/oct-election/www/user-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/user-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/oct-election/www/user-list.adp	12 Sep 2013 11:33:41 -0000	1.3
+++ openacs-4/packages/oct-election/www/user-list.adp	3 Jul 2015 11:19:02 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
   <property name="context">"@context;noquote@"</property>
 
 <listtemplate name="voters_foo"></listtemplate>
Index: openacs-4/packages/oct-election/www/vote.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/vote.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/oct-election/www/vote.adp	12 Sep 2013 11:33:41 -0000	1.2
+++ openacs-4/packages/oct-election/www/vote.adp	3 Jul 2015 11:19:02 -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>Vote for up to @number_of_candidates@ candidates.  (Extra votes will be ignored.)  Ballots are anonymous and cannot be revoked or altered.</p>
 <form action="vote-process">
Index: openacs-4/packages/photo-album/www/album-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/album-add.adp	12 Sep 2013 20:39:23 -0000	1.5
+++ openacs-4/packages/photo-album/www/album-add.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#photo-album.Create_a_New_Album#</property>
-<property name="context">@context_list@</property>
+<property name="context">@context_list;literal@</property>
 <property name="focus">album_add.title</property>
 
 <formtemplate id="album_add"></formtemplate>
Index: openacs-4/packages/photo-album/www/album-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/album-delete.adp	23 Jun 2015 16:34:08 -0000	1.6
+++ openacs-4/packages/photo-album/www/album-delete.adp	3 Jul 2015 11:19:08 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 
 <form method=POST action=album-delete>
 <input type="hidden" name="album_id" value="@album_id@">
Index: openacs-4/packages/photo-album/www/album-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/album-edit.adp	12 Sep 2013 20:39:24 -0000	1.4
+++ openacs-4/packages/photo-album/www/album-edit.adp	3 Jul 2015 11:19:08 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 <p>#photo-album.Edit_the_Album#
 <formtemplate id=edit_album></formtemplate>
 
Index: openacs-4/packages/photo-album/www/album-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-move.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/album-move.adp	12 Sep 2013 20:39:24 -0000	1.4
+++ openacs-4/packages/photo-album/www/album-move.adp	3 Jul 2015 11:19:08 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 <p>#photo-album.lt_Move_Album_to_new_fol#
 <formtemplate id=move_album></formtemplate>
Index: openacs-4/packages/photo-album/www/album.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/album.adp	12 Sep 2013 20:39:24 -0000	1.7
+++ openacs-4/packages/photo-album/www/album.adp	3 Jul 2015 11:19:08 -0000	1.8
@@ -1,8 +1,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>
 <property name="header_suppress">1</property>
-<property name="displayed_object_id">@album_id@</property>
+<property name="displayed_object_id">@album_id;literal@</property>
 @page_nav;noquote@
 @message;noquote@
 <h2>@photographer@</h2>
Index: openacs-4/packages/photo-album/www/base-photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/base-photo.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/base-photo.adp	12 Sep 2013 20:39:24 -0000	1.6
+++ openacs-4/packages/photo-album/www/base-photo.adp	3 Jul 2015 11:19:08 -0000	1.7
@@ -1,8 +1,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>
 <property name="header_suppress">1</property>
-<property name="displayed_object_id">@photo_id@</property>
+<property name="displayed_object_id">@photo_id;literal@</property>
 @photo_nav_html;noquote@
 <div style="text-align: center">
 <img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@">
Index: openacs-4/packages/photo-album/www/clipboard-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/clipboard-view.adp	12 Sep 2013 20:39:24 -0000	1.5
+++ openacs-4/packages/photo-album/www/clipboard-view.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -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>
 
 
     <p>
Index: openacs-4/packages/photo-album/www/folder-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/folder-add.adp	12 Sep 2013 20:39:24 -0000	1.5
+++ openacs-4/packages/photo-album/www/folder-add.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#photo-album.Create_a_New_Folder#</property>
-<property name="context">@context_list@</property>
+<property name="context">@context_list;literal@</property>
 <property name="focus">folder_add.label</property>
 
 <formtemplate id="folder_add"></formtemplate>
Index: openacs-4/packages/photo-album/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/folder-delete.adp	23 Jun 2015 16:34:08 -0000	1.6
+++ openacs-4/packages/photo-album/www/folder-delete.adp	3 Jul 2015 11:19:08 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 
 <form method=POST action=folder-delete>
 <input type="hidden" name="folder_id" value="@folder_id@">
Index: openacs-4/packages/photo-album/www/folder-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/folder-edit.adp	12 Sep 2013 20:39:24 -0000	1.4
+++ openacs-4/packages/photo-album/www/folder-edit.adp	3 Jul 2015 11:19:08 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 <p>#photo-album.Edit_the_Folder#
 <formtemplate id=folder_edit></formtemplate>
 
Index: openacs-4/packages/photo-album/www/folder-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/folder-move.adp	12 Sep 2013 20:39:24 -0000	1.5
+++ openacs-4/packages/photo-album/www/folder-move.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 <p>#photo-album.lt_Move_folder_to_new_fo#
 <formtemplate id=move_folder></formtemplate>
Index: openacs-4/packages/photo-album/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/photo-album/www/index.adp	23 Jun 2015 16:34:08 -0000	1.10
+++ openacs-4/packages/photo-album/www/index.adp	3 Jul 2015 11:19:08 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@folder_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@folder_name;literal@</property>
+<property name="context">@context;literal@</property>
 
 <if @folder_description@ not nil>
 <p>@folder_description;noquote@</p>
Index: openacs-4/packages/photo-album/www/photo-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/photo-add.adp	12 Sep 2013 20:39:25 -0000	1.5
+++ openacs-4/packages/photo-album/www/photo-add.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#photo-album.Upload_a_Photo#</property>
-<property name="context">@context_list@</property>
+<property name="context">@context_list;literal@</property>
 <property name="focus">photo_upload.upload_file</property>
 
 <formtemplate id=photo_upload></formtemplate>
Index: openacs-4/packages/photo-album/www/photo-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/photo-delete.adp	23 Jun 2015 16:34:08 -0000	1.5
+++ openacs-4/packages/photo-album/www/photo-delete.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 
 <image src="images/@path@" height=@height@ width=@width@>
 <form method=POST action=photo-delete>
Index: openacs-4/packages/photo-album/www/photo-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/photo-edit.adp	23 Jun 2015 16:34:08 -0000	1.5
+++ openacs-4/packages/photo-album/www/photo-edit.adp	3 Jul 2015 11:19:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 <image src="images/@path@" height=@height@ width=@width@>
 <p>
 
Index: openacs-4/packages/photo-album/www/photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/photo-album/www/photo.adp	23 Jun 2015 16:34:08 -0000	1.12
+++ openacs-4/packages/photo-album/www/photo.adp	3 Jul 2015 11:19:08 -0000	1.13
@@ -1,8 +1,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>
     <property name="header_suppress">1</property>
-    <property name="displayed_object_id">@photo_id@</property>
+    <property name="displayed_object_id">@photo_id;literal@</property>
 
     @photo_nav_html;noquote@
     <div style="text-align: center; margin: 1em;">
Index: openacs-4/packages/photo-album/www/photos-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/photos-add.adp	12 Sep 2013 20:39:25 -0000	1.3
+++ openacs-4/packages/photo-album/www/photos-add.adp	3 Jul 2015 11:19:08 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
 <property name="doc(title)">#photo-album.lt_Upload_a_Photo_collec#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <formtemplate id=photos_upload></formtemplate>
Index: openacs-4/packages/photo-album/www/photos-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/photos-edit-2.adp	12 Sep 2013 20:39:25 -0000	1.4
+++ openacs-4/packages/photo-album/www/photos-edit-2.adp	3 Jul 2015 11:19:08 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 
 #photo-album.lt_Your_text_updates_hav#
 <p>
Index: openacs-4/packages/photo-album/www/photos-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/photos-edit.adp	23 Jun 2015 16:34:08 -0000	1.8
+++ openacs-4/packages/photo-album/www/photos-edit.adp	3 Jul 2015 11:19:08 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context_list@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context_list;literal@</property>
 
 <p>#photo-album.Name#: @title@ 
 <if @description@ not nil>
Index: openacs-4/packages/schema-browser/www/function-body.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/function-body.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/schema-browser/www/function-body.adp	12 Sep 2013 20:41:52 -0000	1.2
+++ openacs-4/packages/schema-browser/www/function-body.adp	3 Jul 2015 11:19:10 -0000	1.3
@@ -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>
 
 
 <blockquote><pre>
Index: openacs-4/packages/schema-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/schema-browser/www/index.adp	12 Sep 2013 20:41:52 -0000	1.2
+++ openacs-4/packages/schema-browser/www/index.adp	3 Jul 2015 11:19:10 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@page_title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <if @table_description@ not nil>
 @table_description;noquote@
Index: openacs-4/packages/static-pages/www/admin/commentability.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/static-pages/www/admin/commentability.adp	23 Jun 2015 16:38:12 -0000	1.8
+++ openacs-4/packages/static-pages/www/admin/commentability.adp	3 Jul 2015 11:19:09 -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>
 
 <p>Click to toggle.</p>
 
Index: openacs-4/packages/static-pages/www/admin/fs-scan.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/fs-scan.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/static-pages/www/admin/fs-scan.adp	12 Sep 2013 20:43:45 -0000	1.6
+++ openacs-4/packages/static-pages/www/admin/fs-scan.adp	3 Jul 2015 11:19:09 -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>
 
 <ul>
 <multiple name=file_items>
Index: openacs-4/packages/static-pages/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/static-pages/www/admin/index.adp	12 Sep 2013 20:43:45 -0000	1.7
+++ openacs-4/packages/static-pages/www/admin/index.adp	3 Jul 2015 11:19:09 -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>
 
 <p>There @are@ @n_static_pages@ static @pages@ in the 
 tree rooted at <code>@fs_root@</code>.</p>
Index: openacs-4/packages/static-pages/www/templates/static.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/templates/static.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/static-pages/www/templates/static.adp	12 Sep 2013 20:43:45 -0000	1.5
+++ openacs-4/packages/static-pages/www/templates/static.adp	3 Jul 2015 11:19:10 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="sp_scripts">@sp_scripts;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
-<property name="displayed_object_id">@page_id@</property>
+<property name="sp_scripts">@sp_scripts;literal@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="displayed_object_id">@page_id;literal@</property>
 @body;noquote@
 <div>Last modified: @file_mtime@</div>
Index: openacs-4/packages/workflow/www/admin/workflow-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-ae.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/admin/workflow-ae.adp	17 Sep 2013 16:49:07 -0000	1.3
+++ openacs-4/packages/workflow/www/admin/workflow-ae.adp	3 Jul 2015 11:19:09 -0000	1.4
@@ -1,4 +1,4 @@
 <master>
-<property name="doc(title)">@title@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name=context>@context@</property>
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp	17 Sep 2013 16:49:07 -0000	1.3
+++ openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp	3 Jul 2015 11:19:09 -0000	1.4
@@ -1,4 +1,4 @@
 <master>
-<property name="doc(title)">@title@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name=context>@context@</property>
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp	3 Jul 2015 11:19:09 -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>
 <h2>Elementary Private Law Template</h2>
 
 <h3>Roles</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp	3 Jul 2015 11:19:09 -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>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Properties</h3>
 <formtemplate id="task"></formtemplate>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Enabled If</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp	3 Jul 2015 11:19:09 -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>
 <h2>Elementary Private Law Template</h2>
 
 <h3>Roles</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp	23 Jun 2015 09:41:53 -0000	1.4
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp	3 Jul 2015 11:19:09 -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>
 
 <h3>Roles</h3>
 <include src="/packages/workflow/www/doc/roles-includelet-1"></include>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp	23 Jun 2015 09:41:53 -0000	1.5
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp	17 Sep 2013 16:49:07 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp	3 Jul 2015 11:19:09 -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>
 
 <h3>Roles</h3>
 <include src="/packages/workflow/www/doc/roles-includelet-2"></include>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp	23 Jun 2015 09:41:53 -0000	1.5
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp	23 Jun 2015 09:41:53 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp	23 Jun 2015 09:41:53 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp	23 Jun 2015 09:41:53 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp	3 Jul 2015 11:19:09 -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>
   
   <table cellpadding="3" cellspacing="1" border="0">
     <tr class="form-element">
Index: openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp	3 Jul 2015 11:19:09 -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>
 <h2>TIP Process</h2>
 
 <h3>Roles</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp	17 Sep 2013 16:49:07 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp	3 Jul 2015 11:19:09 -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>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Properties</h3>
 <formtemplate id="task"></formtemplate>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Enabled If</h3>
Index: openacs-4/packages/wp-slim/www/add-edit-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-presentation.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/add-edit-presentation.adp	12 Sep 2013 20:46:42 -0000	1.2
+++ openacs-4/packages/wp-slim/www/add-edit-presentation.adp	3 Jul 2015 11:19:02 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
 <property name="doc(title)">#wp-slim.Create_Presentation#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 <formtemplate id="add-edit-presentation"></formtemplate>
Index: openacs-4/packages/wp-slim/www/add-edit-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-slide.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/add-edit-slide.adp	12 Sep 2013 20:46:42 -0000	1.2
+++ openacs-4/packages/wp-slim/www/add-edit-slide.adp	3 Jul 2015 11:19:02 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Create_A_Slide#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <script language=javascript>
  
Index: openacs-4/packages/wp-slim/www/attach-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/attach-detail.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/attach-detail.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Details#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 #wp-slim.lt_Revision_in_font_colo#
 
Index: openacs-4/packages/wp-slim/www/attach-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/wp-slim/www/attach-list.adp	23 Jun 2015 16:19:30 -0000	1.9
+++ openacs-4/packages/wp-slim/www/attach-list.adp	3 Jul 2015 11:19:02 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.List_of_Attachments#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 <ul>
 <multiple name="att">
 <li>@att.name@ (<a href="attach-del?slide_item_id=@slide_item_id@&amp;attach_item_id=@att.item_id@&amp;pres_item_id=@pres_item_id@">#wp-slim.remove#</a> | <a href="attach-detail?slide_item_id=@slide_item_id@&amp;attach_item_id=@att.item_id@&amp;file_name=@att.name@&amp;pres_item_id=@pres_item_id@">#wp-slim.details#</a>)
Index: openacs-4/packages/wp-slim/www/delete-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/delete-presentation.adp	23 Jun 2015 16:19:30 -0000	1.7
+++ openacs-4/packages/wp-slim/www/delete-presentation.adp	3 Jul 2015 11:19:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Delete_Presentation#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form method=post action="delete-presentation-2">
 
Index: openacs-4/packages/wp-slim/www/delete-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/delete-slide.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/delete-slide.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Delete_a_Slide#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form>
 
Index: openacs-4/packages/wp-slim/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/wp-slim/www/index.adp	23 Jun 2015 16:19:30 -0000	1.12
+++ openacs-4/packages/wp-slim/www/index.adp	3 Jul 2015 11:19:02 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.WimpyPoint#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <table border="0" width="100%">
 <tr><td align="left">
Index: openacs-4/packages/wp-slim/www/invite-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/invite-2.adp	12 Sep 2013 20:46:42 -0000	1.6
+++ openacs-4/packages/wp-slim/www/invite-2.adp	3 Jul 2015 11:19:02 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Email_Sent#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 #wp-slim.lt_name_email_has_been_i#
 
Index: openacs-4/packages/wp-slim/www/invite.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/invite.adp	23 Jun 2015 16:19:30 -0000	1.7
+++ openacs-4/packages/wp-slim/www/invite.adp	3 Jul 2015 11:19:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Invite_User#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form action="invite-2" method=post>
 
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	23 Jun 2015 16:19:30 -0000	1.7
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	3 Jul 2015 11:19:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Confirm_Add_User#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form action="presentation-acl-add-3">
 
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	23 Jun 2015 16:19:30 -0000	1.7
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	3 Jul 2015 11:19:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Confirm_Add_Users#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 <form action="presentation-acl-add-group-3">
 
 <input type="hidden" name="pres_item_id" value="@pres_item_id@">
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Add_Group#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form action="presentation-acl-add-group-2">
 
Index: openacs-4/packages/wp-slim/www/presentation-acl-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/wp-slim/www/presentation-acl-add.adp	23 Jun 2015 16:19:30 -0000	1.10
+++ openacs-4/packages/wp-slim/www/presentation-acl-add.adp	3 Jul 2015 11:19:02 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Add_User#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 <form action="search">
 
 @params;noquote@
Index: openacs-4/packages/wp-slim/www/presentation-acl.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/presentation-acl.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/presentation-acl.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Authorization#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form name=f>
 
Index: openacs-4/packages/wp-slim/www/presentation-print-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/presentation-print-view.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/presentation-print-view.adp	3 Jul 2015 11:19:02 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@pres_title@</property>
-<property name="context">@context@</property>
+<property name="doc(title)">@pres_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h2>@pres_title@</h2>
 #wp-slim.lt_a_Wimpy_Point_Present# <a href="/shared/community-member?user_id=@owner_id@">@owner_name@</a>
Index: openacs-4/packages/wp-slim/www/presentation-revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/presentation-revisions.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/presentation-revisions.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.lt_All_Revisions_of_This#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 
 #wp-slim.lt_Revision_in_font_colo#
Index: openacs-4/packages/wp-slim/www/presentation-top.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/wp-slim/www/presentation-top.adp	23 Jun 2015 16:19:30 -0000	1.11
+++ openacs-4/packages/wp-slim/www/presentation-top.adp	3 Jul 2015 11:19:03 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@presentation_title@</property>
-<property name="context">@context@</property>
+<property name="doc(title)">@presentation_title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h3>#wp-slim.The_Slides#</h3>
    <if  @slides:rowcount@ eq 0>
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	23 Jun 2015 16:19:30 -0000	1.10
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	3 Jul 2015 11:19:03 -0000	1.11
@@ -1,9 +1,9 @@
 <master src="wp-presentation-master">
-<property name="doc(title)">@pres_title@</property>
-<property name="context">@context@</property>
-<property name="style_id">@style@</property>
-<property name="page_signature">@page_signature@</property>
-<property name="copyright_notice">@copyright_notice@</property>
+<property name="doc(title)">@pres_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="style_id">@style;literal@</property>
+<property name="page_signature">@page_signature;literal@</property>
+<property name="copyright_notice">@copyright_notice;literal@</property>
 
 <h3>#wp-slim.One_Revision#</h3>
 
Index: openacs-4/packages/wp-slim/www/serve-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	23 Jun 2015 16:19:30 -0000	1.14
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	3 Jul 2015 11:19:03 -0000	1.15
@@ -1,9 +1,9 @@
 <master src="wp-presentation-master">
-<property name="doc(title)">@pres_title@</property>
+<property name="doc(title)">@pres_title;literal@</property>
 <property name="context">#wp-slim.One_Presentation#</property>
-<property name="style_id">@style@</property>
-<property name="page_signature">@page_signature@</property>
-<property name="copyright_notice">@copyright_notice@</property>
+<property name="style_id">@style;literal@</property>
+<property name="page_signature">@page_signature;literal@</property>
+<property name="copyright_notice">@copyright_notice;literal@</property>
 
 <table align="right">
 <tr>
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/wp-slim/www/serve-slide-revision.adp	23 Jun 2015 16:19:30 -0000	1.9
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp	3 Jul 2015 11:19:03 -0000	1.10
@@ -1,9 +1,9 @@
 <master src="wp-presentation-master">
-<property name="doc(title)">@slide_title@</property>
-<property name="context">@context@</property>
-<property name="style_id">@style@</property>
-<property name="page_signature">@page_signature@</property>
-<property name="copyright_notice">@copyright_notice@</property>
+<property name="doc(title)">@slide_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="style_id">@style;literal@</property>
+<property name="page_signature">@page_signature;literal@</property>
+<property name="copyright_notice">@copyright_notice;literal@</property>
 
 <if @show_modified_p@ eq t>
 <i>#wp-slim.lt_Last_modified_modifie#</i>
Index: openacs-4/packages/wp-slim/www/serve-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/wp-slim/www/serve-slide.adp	23 Jun 2015 16:19:30 -0000	1.16
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	3 Jul 2015 11:19:03 -0000	1.17
@@ -1,9 +1,9 @@
 <master src="wp-presentation-master">
-<property name="doc(title)">@slide_title@</property>
-<property name="context">@context@</property>
-<property name="style_id">@style@</property>
-<property name="page_signature">@page_signature@</property>
-<property name="copyright_notice">@copyright_notice@</property>
+<property name="doc(title)">@slide_title;literal@</property>
+<property name="context">@context;literal@</property>
+<property name="style_id">@style;literal@</property>
+<property name="page_signature">@page_signature;literal@</property>
+<property name="copyright_notice">@copyright_notice;literal@</property>
 
 <table align="right">
 <tr>
Index: openacs-4/packages/wp-slim/www/slide-revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/wp-slim/www/slide-revisions.adp	23 Jun 2015 16:19:30 -0000	1.9
+++ openacs-4/packages/wp-slim/www/slide-revisions.adp	3 Jul 2015 11:19:03 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.lt_All_Revisions_of_This_1#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <blockquote>
 
Index: openacs-4/packages/wp-slim/www/slides-reorder.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/slides-reorder.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/slides-reorder.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Reorder_Slides#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form name=f>
 #wp-slim.lt_To_move_a_slide_in_yo# <i>#wp-slim.Save_Changes#</i>.
Index: openacs-4/packages/wp-slim/www/style-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/style-delete.adp	23 Jun 2015 16:19:30 -0000	1.5
+++ openacs-4/packages/wp-slim/www/style-delete.adp	3 Jul 2015 11:19:03 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Delete_name#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form action=style-delete-2.tcl>
 #wp-slim.lt_form_varsAre_you_sure#
Index: openacs-4/packages/wp-slim/www/style-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/style-edit.adp	23 Jun 2015 16:19:30 -0000	1.8
+++ openacs-4/packages/wp-slim/www/style-edit.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.role_Style#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <a href="/wp-slim"> Done </a>
 <form name=f action=style-edit-2 method=post enctype=multipart/form-data>
Index: openacs-4/packages/wp-slim/www/style-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-list.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/style-list.adp	23 Jun 2015 16:19:31 -0000	1.6
+++ openacs-4/packages/wp-slim/www/style-list.adp	3 Jul 2015 11:19:03 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Your_Styles#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 <a href="/wp-slim"> Done </a>
 <p><center>
 
Index: openacs-4/packages/wp-slim/www/style-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-view.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/style-view.adp	23 Jun 2015 16:19:31 -0000	1.8
+++ openacs-4/packages/wp-slim/www/style-view.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.One_Style#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="/wp-slim">Done</a>
 <form name=f action=style-image-add method=post enctype=multipart/form-data>
 
Index: openacs-4/packages/wp-slim/www/upload-attachments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/upload-attachments.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/upload-attachments.adp	23 Jun 2015 16:19:31 -0000	1.8
+++ openacs-4/packages/wp-slim/www/upload-attachments.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Upload_Attachments#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 <form enctype=multipart/form-data action=attach method=post>
 <input type="hidden" name="slide_item_id" value="@slide_item_id@">
Index: openacs-4/packages/wp-slim/www/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/users.adp	12 Sep 2013 20:46:43 -0000	1.8
+++ openacs-4/packages/wp-slim/www/users.adp	3 Jul 2015 11:19:03 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">#wp-slim.Wimpy_Point_Users#</property>
-<property name="context">@context@</property>
+<property name="context">@context;literal@</property>
 
 #wp-slim.lt_Select_an_author_from#