Index: openacs-4/packages/faq/www/categories/categorize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/categorize.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/categories/categorize.adp	3 Jul 2015 10:47:35 -0000	1.2
+++ openacs-4/packages/faq/www/categories/categorize.adp	14 Jul 2015 22:22:27 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/categories/lib/categorize" object_id="@object_id@" container_id="@container_id@">
+<include src="/packages/categories/lib/categorize" object_id="@object_id;literal@" container_id="@container_id;literal@">
Index: openacs-4/packages/faq/www/categories/list-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/list-categories.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/categories/list-categories.adp	3 Jul 2015 10:47:35 -0000	1.2
+++ openacs-4/packages/faq/www/categories/list-categories.adp	14 Jul 2015 22:22:27 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
   <property name="context">@cat_name;literal@</property>
 
-<include src="/packages/categories/lib/list-categories" cat="@cat@" orderby="@orderby@">
+<include src="/packages/categories/lib/list-categories" cat="@cat;literal@" orderby="@orderby;literal@">
Index: openacs-4/packages/faq/www/categories/map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/map.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/categories/map.adp	10 Mar 2005 18:27:41 -0000	1.1
+++ openacs-4/packages/faq/www/categories/map.adp	14 Jul 2015 22:22:27 -0000	1.2
@@ -1 +1 @@
-<include src="/packages/categories/lib/map" object_id="@object_id@" container_id="@container_id@">
+<include src="/packages/categories/lib/map" object_id="@object_id;literal@" container_id="@container_id;literal@">
Index: openacs-4/packages/file-storage/lib/folder-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-admin.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/lib/folder-admin.adp	8 Aug 2006 21:26:48 -0000	1.2
+++ openacs-4/packages/file-storage/lib/folder-admin.adp	14 Jul 2015 22:22:27 -0000	1.3
@@ -1,2 +1,2 @@
 <a class="button" href="@folder_url@">#acs-kernel.common_Add#</a>
-<include src="/packages/file-storage/lib/folder-links" folder_id="@folder_id@" admin_p="@admin_p@" base_url="@base_url@">
\ No newline at end of file
+<include src="/packages/file-storage/lib/folder-links" folder_id="@folder_id;literal@" admin_p="@admin_p;literal@" base_url="@base_url;literal@">
\ No newline at end of file
Index: openacs-4/packages/file-storage/lib/recent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/recent.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/lib/recent.adp	26 Jan 2005 00:31:54 -0000	1.1
+++ openacs-4/packages/file-storage/lib/recent.adp	14 Jul 2015 22:22:27 -0000	1.2
@@ -1,2 +1,2 @@
 <h2><a href="@url@/index?folder%5fid=@fs_folder@">Recent Files</a></h2>
-<include src="../www/folder-chunk" folder_id="@fs_folder@" fs_url="@url@" n_past_days="5" allow_bulk_actions="0" format="list" >
+<include src="../www/folder-chunk" folder_id="@fs_folder;literal@" fs_url="@url;literal@" n_past_days="5" allow_bulk_actions="0" format="list" >
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/file-storage/www/index.adp	3 Jul 2015 10:47:34 -0000	1.36
+++ openacs-4/packages/file-storage/www/index.adp	14 Jul 2015 22:22:27 -0000	1.37
@@ -17,8 +17,8 @@
 
 	</div>
 </if>
-<include src="folder-chunk" folder_id="@folder_id@"
-    n_past_days="@n_past_days@" allow_bulk_actions="1" return_url="@return_url@" category_id="@category_id@">
+<include src="folder-chunk" folder_id="@folder_id;literal@"
+    n_past_days="@n_past_days;literal@" allow_bulk_actions="1" return_url="@return_url;literal@" category_id="@category_id;literal@">
 
 
 <p>@notification_chunk;noquote@</p>
Index: openacs-4/packages/file-storage/www/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/permissions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/permissions.adp	3 Jul 2015 10:47:34 -0000	1.4
+++ openacs-4/packages/file-storage/www/permissions.adp	14 Jul 2015 22:22:27 -0000	1.5
@@ -4,4 +4,4 @@
 
 <h1>@page_title;noquote@ - #file-storage.Permissions#</h1>
 
-  <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" />
+  <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" />
Index: openacs-4/packages/forums/lib/message/thread-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/lib/message/thread-chunk.adp	16 Sep 2008 17:26:15 -0000	1.7
+++ openacs-4/packages/forums/lib/message/thread-chunk.adp	14 Jul 2015 22:16:44 -0000	1.8
@@ -1,18 +1,18 @@
 <div id="forum-thread">
   <include src="row"
     rownum=0
-    forum_moderated_p=@forum_moderated_p;noquote@
-    moderate_p=@permissions.moderate_p;noquote@
-    presentation_type=@forum.presentation_type@
+    forum_moderated_p="@forum_moderated_p;literal@"
+    moderate_p="@permissions.moderate_p;literal@"
+    presentation_type="@forum.presentation_type;literal@"
     &permissions="permissions"
     &message="message">
     <if @responses:rowcount@ gt 0>
       <multiple name="responses">
         <include src="row"
-          rownum=@responses.rownum@
-          forum_moderated_p=@forum_moderated_p;noquote@
-          moderate_p=@permissions.moderate_p;noquote@
-	  presentation_type=@forum.presentation_type@
+          rownum="@responses.rownum;literal@"
+          forum_moderated_p="@forum_moderated_p;literal@"
+          moderate_p="@permissions.moderate_p;literal@"
+	  presentation_type="@forum.presentation_type;literal@"
           &permissions="permissions"
           &message="responses">
       </multiple>
Index: openacs-4/packages/forums/www/admin/forum-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/forums/www/admin/forum-edit.adp	3 Jul 2015 10:47:33 -0000	1.13
+++ openacs-4/packages/forums/www/admin/forum-edit.adp	14 Jul 2015 22:16:44 -0000	1.14
@@ -11,4 +11,4 @@
 </else>
 <p>
 
-<include src="/packages/forums/lib/forums/edit" &forum="forum" return_url="@return_url@">
+<include src="/packages/forums/lib/forums/edit" &forum="forum" return_url="@return_url;literal@">
Index: openacs-4/packages/forums/www/admin/forum-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/www/admin/forum-new.adp	3 Jul 2015 10:47:33 -0000	1.9
+++ openacs-4/packages/forums/www/admin/forum-new.adp	14 Jul 2015 22:16:44 -0000	1.10
@@ -3,4 +3,4 @@
 <property name="context">@context;literal@</property>
 <property name="focus">forum.name</property>
 
-<include src="/packages/forums/lib/forums/new" name="@name@" return_url="../">
+<include src="/packages/forums/lib/forums/new" name="@name;literal@" return_url="../">
Index: openacs-4/packages/forums/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/permissions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/admin/permissions.adp	3 Jul 2015 10:47:33 -0000	1.4
+++ openacs-4/packages/forums/www/admin/permissions.adp	14 Jul 2015 22:16:44 -0000	1.5
@@ -2,4 +2,4 @@
   <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" privs="read create forum_moderate admin">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" user_add_url="permissions-user-add" privs="read create forum_moderate admin">
Index: openacs-4/packages/forums/www/moderate/forum.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/forum.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/moderate/forum.adp	27 Oct 2014 16:41:40 -0000	1.7
+++ openacs-4/packages/forums/www/moderate/forum.adp	14 Jul 2015 22:16:44 -0000	1.8
@@ -4,4 +4,4 @@
 
 <h3>#forums.Pending_Threads#</h3>
 
-<include src="/packages/forums/lib/message/pending-list-chunk" forum_id="@forum_id@">
+<include src="/packages/forums/lib/message/pending-list-chunk" forum_id="@forum_id;literal@">
Index: openacs-4/packages/forums/www/moderate/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/forums/www/moderate/message-delete.adp	27 Oct 2014 16:41:40 -0000	1.13
+++ openacs-4/packages/forums/www/moderate/message-delete.adp	14 Jul 2015 22:16:44 -0000	1.14
@@ -2,4 +2,4 @@
   <property name="doc(title)">#forums.Confirm_Delete# @message.subject;noquote@</property>
   <property name="context">#forums.delete#</property>
 
-  <include src="/packages/forums/lib/message/delete" &message="message" confirm_p="@confirm_p@" return_url="@return_url@" />
+  <include src="/packages/forums/lib/message/delete" &message="message" confirm_p="@confirm_p;literal@" return_url="@return_url;literal@" />
Index: openacs-4/packages/forums/www/moderate/message-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/moderate/message-edit.adp	27 Oct 2014 16:41:40 -0000	1.7
+++ openacs-4/packages/forums/www/moderate/message-edit.adp	14 Jul 2015 22:16:44 -0000	1.8
@@ -2,4 +2,4 @@
 <property name="doc(title)">#forums.Edit_Message# @message.subject;noquote@</property>
 <property name="context">#forums.Edit#</property>
 
-<include src="/packages/forums/lib/message/edit" &forum="forum" &message="message" return_url="@return_url@">
+<include src="/packages/forums/lib/message/edit" &forum="forum" &message="message" return_url="@return_url;literal@">
Index: openacs-4/packages/forums/www/moderate/message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-move.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/moderate/message-move.adp	27 Oct 2014 16:41:40 -0000	1.3
+++ openacs-4/packages/forums/www/moderate/message-move.adp	14 Jul 2015 22:16:44 -0000	1.4
@@ -2,4 +2,4 @@
 <property name="doc(title)">#forums.Confirm_Move_to# @message.subject;noquote@</property>
 <property name="context">#forums.Move_to#</property>
 
-<include src="/packages/forums/lib/message/choose-message-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-message-move" &message="message" confirm_p="@confirm_p;literal@" return_url="@return_url;literal@">
Index: openacs-4/packages/forums/www/moderate/thread-move-thread.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move-thread.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/moderate/thread-move-thread.adp	27 Oct 2014 16:41:41 -0000	1.3
+++ openacs-4/packages/forums/www/moderate/thread-move-thread.adp	14 Jul 2015 22:16:44 -0000	1.4
@@ -2,4 +2,4 @@
 <property name="doc(title)">#forums.Confirm_Move_to# @message.subject;noquote@</property>
 <property name="context">#forums.Move_to#</property>
 
-<include src="/packages/forums/lib/message/choose-thread-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-thread-move" &message="message" confirm_p="@confirm_p;literal@" return_url="@return_url;literal@">
Index: openacs-4/packages/forums/www/moderate/thread-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/moderate/thread-move.adp	3 Jul 2015 10:47:33 -0000	1.5
+++ openacs-4/packages/forums/www/moderate/thread-move.adp	14 Jul 2015 22:16:44 -0000	1.6
@@ -2,4 +2,4 @@
 <property name="doc(title)">@title;literal@</property>
 <property name="context">{#forums.Move_thread#}</property>
 <h1>@title;noquote@</h1>
-<include src="/packages/forums/lib/message/choose-forum-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-forum-move" &message="message" confirm_p="@confirm_p;literal@" return_url="@return_url;literal@">
Index: openacs-4/packages/news/lib/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/item.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/news/lib/item.adp	3 Jul 2015 11:04:08 -0000	1.4
+++ openacs-4/packages/news/lib/item.adp	14 Jul 2015 22:22:27 -0000	1.5
@@ -9,12 +9,12 @@
   </if>
   <else>
     <include src="/packages/news/www/news"
-      item_id=@item_id;noquote@
-      publish_title=@publish_title;noquote@
-      publish_lead=@publish_lead@
-      publish_body=@publish_body;noquote@
-      publish_image=@publish_image@
-      creator_link=@creator_link;noquote@>
+      item_id="@item_id;literal@"
+      publish_title="@publish_title;literal@"
+      publish_lead="@publish_lead;literal@"
+      publish_body="@publish_body;literal@"
+      publish_image="@publish_image;literal@"
+      creator_link="@creator_link;literal@">
 
       <if @comments@ ne "">
         <h3>#news.Comments#</h3>
Index: openacs-4/packages/news/www/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/news/www/item.adp	11 Jul 2015 16:45:23 -0000	1.20
+++ openacs-4/packages/news/www/item.adp	14 Jul 2015 22:22:27 -0000	1.21
@@ -5,10 +5,10 @@
 <h1>@title;noquote@</h1>
 
 <include src="/packages/news/lib/news"
-    publish_title="@publish_title;noquote@"
-    publish_body="@publish_body;noquote@"
-    publish_format="@publish_format;noquote@"
-    creator_link="@creator_link;noquote@">
+    publish_title="@publish_title;literal@"
+    publish_body="@publish_body;literal@"
+    publish_format="@publish_format;literal@"
+    creator_link="@creator_link;literal@">
 
 <if @comments@ ne "">
   <h2>#news.Comments#</h2>
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/news/www/preview.adp	11 Jul 2015 16:45:23 -0000	1.20
+++ openacs-4/packages/news/www/preview.adp	14 Jul 2015 22:22:27 -0000	1.21
@@ -26,11 +26,11 @@
 
 <div class="news-item-preview">
    <include src="/packages/news/lib/news"
-      publish_body="@publish_body;noquote@"
-      publish_format="@publish_format;noquote@"
-      publish_lead="@publish_lead@"
-      publish_title="@publish_title;noquote@"
-      creator_link="@creator_link;noquote@">
+      publish_body="@publish_body;literal@"
+      publish_format="@publish_format;literal@"
+      publish_lead="@publish_lead;literal@"
+      publish_title="@publish_title;literal@"
+      creator_link="@creator_link;literal@">
 </div>
 
 <div>
Index: openacs-4/packages/news/www/admin/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news/www/admin/revision.adp	3 Jul 2015 11:04:09 -0000	1.12
+++ openacs-4/packages/news/www/admin/revision.adp	14 Jul 2015 22:22:27 -0000	1.13
@@ -15,8 +15,8 @@
 <hr>
 <include src="/packages/news/lib/news"
     publish_title="@publish_title;noquote@ (#news.rev# @revision_no;noquote@)"
-    publish_lead="@publish_lead@"
-    publish_body="@publish_body;noquote@"
-    publish_format="@publish_format;noquote@"
-    creator_link="@creator_link;noquote@"
+    publish_lead="@publish_lead;literal@"
+    publish_body="@publish_body;literal@"
+    publish_format="@publish_format;literal@"
+    creator_link="@creator_link;literal@"
 >
Index: openacs-4/packages/xowiki/www/portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/portlet.adp	13 Sep 2012 16:05:30 -0000	1.3
+++ openacs-4/packages/xowiki/www/portlet.adp	14 Jul 2015 22:19:19 -0000	1.4
@@ -2,5 +2,5 @@
 <span>@title@</span>
 </div>
 <div class="portlet">
-<include src="@portlet@" >
+<include src="@portlet;literal@" >
 </div>
Index: openacs-4/packages/xowiki/www/portlets/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/calendar-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/portlets/calendar-portlet.adp	13 Sep 2012 16:05:35 -0000	1.3
+++ openacs-4/packages/xowiki/www/portlets/calendar-portlet.adp	14 Jul 2015 22:19:19 -0000	1.4
@@ -1,5 +1,5 @@
 <include src="/packages/calendar/www/view-one-day-display" 
-     date="@date@" 
-     url_stub_callback="@url_stub_callback@"
+     date="@date;literal@" 
+     url_stub_callback="@url_stub_callback;literal@"
      page_num="1">
 
Index: openacs-4/packages/xowiki/www/portlets/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/forums-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/portlets/forums-portlet.adp	13 Sep 2012 16:05:35 -0000	1.3
+++ openacs-4/packages/xowiki/www/portlets/forums-portlet.adp	14 Jul 2015 22:19:19 -0000	1.4
@@ -1,2 +1,2 @@
-<include src="/packages/forums-portlet/www/forums-portlet" cf="@cf@">
+<include src="/packages/forums-portlet/www/forums-portlet" cf="@cf;literal@">