Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	7 Aug 2017 23:48:05 -0000	1.18
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	27 Apr 2022 16:41:46 -0000	1.18.2.1
@@ -1,5 +1,5 @@
   <master>
-    <property name="doc(title)">#calendar.Calendar_Item_Delete#: @cal_item.name;noquote@</property>
+    <property name="doc(title)">#calendar.Calendar_Item_Delete#: @cal_item.name;literal@</property>
     <property name="context">#calendar.Delete#</property>
 
     <div id="viewadp-mini-calendar">
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.42.2.2 -r1.42.2.3
--- openacs-4/packages/calendar/www/cal-item-view.adp	1 Apr 2021 08:42:35 -0000	1.42.2.2
+++ openacs-4/packages/calendar/www/cal-item-view.adp	27 Apr 2022 16:41:46 -0000	1.42.2.3
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">#calendar.Calendar_Item#: @cal_item.name;noquote@</property>
+<property name="doc(title)">#calendar.Calendar_Item#: @cal_item.name;literal@</property>
 <property name="context">#calendar.Item#</property>
 <property name="displayed_object_id">@cal_item_id;literal@</property>
 
Index: openacs-4/packages/forums/www/message-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v
diff -u -r1.15.2.1 -r1.15.2.2
--- openacs-4/packages/forums/www/message-email.adp	27 Apr 2022 16:39:36 -0000	1.15.2.1
+++ openacs-4/packages/forums/www/message-email.adp	27 Apr 2022 16:41:46 -0000	1.15.2.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">#forums.Email_Message# @message.forum_name;literal@ - @message.subject;noquote@</property>
+  <property name="doc(title)">#forums.Email_Message# @message.forum_name;literal@ - @message.subject;literal@</property>
   <property name="context">@context;literal@</property>
 
   <p>#forums.lt_Email_a_copy_of_the_f#</p>
Index: openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.adp	17 Jul 2018 18:41:14 -0000	1.3
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.adp	27 Apr 2022 16:42:41 -0000	1.3.2.1
@@ -1,11 +1,11 @@
 <master src="/www/blank-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
 
 <if @signatory@ defined>
-    <property name="signatory">@signatory;noquote@</property>
+    <property name="signatory">@signatory;literal@</property>
 </if>
 <if @focus@ defined>
     <property name="focus">@focus;literal@</property>
Index: openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.adp	20 Feb 2017 09:49:14 -0000	1.1
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.adp	27 Apr 2022 16:42:41 -0000	1.1.4.1
@@ -1,6 +1,6 @@
 <master src="/www/blank-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
-<if @streaming_head@ defined><property name="streaming_head">@streaming_head;noquote@</property></if>
+<if @streaming_head@ defined><property name="streaming_head">@streaming_head;literal@</property></if>
 
 <div class="container-fluid">
     <!-- START HEADER -->
Index: openacs-4/packages/chat/www/chat-transcript.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/chat/www/chat-transcript.adp	2 Jun 2021 12:23:31 -0000	1.4.2.2
+++ openacs-4/packages/chat/www/chat-transcript.adp	27 Apr 2022 16:43:46 -0000	1.4.2.3
@@ -1,5 +1,5 @@
 <master>
 <property name="context">@context;literal@</property>
-<property name="doc(title)">#chat.transcript_of_room# "@room_name;noquote@"</property>
+<property name="doc(title)">#chat.transcript_of_room# "@room_name;literal@"</property>
 
 <include src="/packages/chat/lib/current-messages" room_id=@room_id;literal@>
Index: openacs-4/packages/chat/www/chat-transcripts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcripts.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/chat-transcripts.adp	17 Jun 2016 17:48:21 -0000	1.5
+++ openacs-4/packages/chat/www/chat-transcripts.adp	27 Apr 2022 16:43:46 -0000	1.5.2.1
@@ -1,6 +1,6 @@
 <master>
 <property name="context">#chat.Transcripts#</property>
-<property name="doc(title)">#chat.transcripts_of_room# "@room_name;noquote@"</property>
+<property name="doc(title)">#chat.transcripts_of_room# "@room_name;literal@"</property>
 
 <if @active@ eq "t">
 <p><a class="button" href="chat-transcript?room_id=@room_id@">#chat.current_transcript#</a></p>
Index: openacs-4/packages/acs-service-contract/www/binding-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-display.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-service-contract/www/binding-display.adp	15 Sep 2017 07:21:12 -0000	1.4
+++ openacs-4/packages/acs-service-contract/www/binding-display.adp	27 Apr 2022 16:46:24 -0000	1.4.2.1
@@ -1,6 +1,6 @@
   <master>
-  <property name="doc(title)">Contract @contract_name;noquote@</property>
-  <property name="context">{@contract_name;noquote@}</property>
+  <property name="doc(title)">Contract @contract_name;literal@</property>
+  <property name="context">{@contract_name;literal@}</property>
 
   <h2>Binding @contract_name@</h2>
   <p><listtemplate name="binding"></listtemplate></p>
Index: openacs-4/packages/acs-service-contract/www/contract-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/contract-display.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-service-contract/www/contract-display.adp	15 Sep 2017 07:21:12 -0000	1.8
+++ openacs-4/packages/acs-service-contract/www/contract-display.adp	27 Apr 2022 16:46:24 -0000	1.8.2.1
@@ -1,6 +1,6 @@
   <master>
-    <property name="doc(title)">Contract @contract_name;noquote@</property>
-    <property name="context">{@contract_name;noquote@}</property>
+    <property name="doc(title)">Contract @contract_name;literal@</property>
+    <property name="context">{@contract_name;literal@}</property>
 
     <ul>
       <multiple name=contract>
Index: openacs-4/packages/assessment/www/asm-admin/admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-master.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/www/asm-admin/admin-master.adp	7 Aug 2017 23:48:04 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/admin-master.adp	27 Apr 2022 16:46:57 -0000	1.5.2.1
@@ -24,7 +24,7 @@
   <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
   <if @context@ not nil><property name="context">@context;literal@</property></if>
     <else><if @context_bar@ not nil><property name="context">@context_bar;literal@</property></if></else>
-  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
+  <if @doc_type@ not nil><property name="doc_type">@doc_type;literal@</property></if>
   <if @title@ not nil><property name="doc(title)">@title;literal@</property></if>
 
 <slave>
Index: openacs-4/packages/rss-support/www/subscr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.adp,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/rss-support/www/subscr-ae.adp	7 Aug 2017 23:48:29 -0000	1.12
+++ openacs-4/packages/rss-support/www/subscr-ae.adp	27 Apr 2022 16:47:24 -0000	1.12.2.1
@@ -1,5 +1,5 @@
 <master>
-<property name="doc(title)">@pretty_action;noquote@ a Subscription</property>
+<property name="doc(title)">@pretty_action;literal@ a Subscription</property>
 <property name="context">@context;literal@</property>
 
 <form action=subscr-ae-2>
Index: openacs-4/packages/ajaxhelper/www/doc/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/default-master.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/ajaxhelper/www/doc/default-master.adp	7 Aug 2017 23:48:03 -0000	1.2
+++ openacs-4/packages/ajaxhelper/www/doc/default-master.adp	27 Apr 2022 16:47:57 -0000	1.2.2.1
@@ -4,8 +4,8 @@
 <if @script:rowcount@ not nil><property name="&script">script</property></if>
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
 <property name="skip_link">#content-wrapper</property>
 
 <div id="wrapper">
Index: openacs-4/packages/ajaxhelper/www/doc/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/site-master.adp,v
diff -u -r1.1 -r1.1.6.1
--- openacs-4/packages/ajaxhelper/www/doc/site-master.adp	8 Sep 2007 14:21:22 -0000	1.1
+++ openacs-4/packages/ajaxhelper/www/doc/site-master.adp	27 Apr 2022 16:47:57 -0000	1.1.6.1
@@ -1,6 +1,6 @@
 <master src="/www/blank-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
 
 <slave>