Index: openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-1.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-1.adp	22 May 2003 14:36:35 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="master-1">
-<property name=title>@title@</property>
+<property name=title>@title;noquote@</property>
 
 <table cellspacing=0 height=100%>
  <tr bgcolor=#ffffff>
Index: openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-2.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/templates/demo_articles/article-template-2.adp	22 May 2003 14:36:35 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="master-2">
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 
 <table bgcolor="#FFFFCC" cellpadding=10 cellspacing=0 border=0>
 <tr>
Index: openacs-4/packages/cms-news-demo/templates/demo_articles/master-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/templates/demo_articles/master-1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/templates/demo_articles/master-1.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/templates/demo_articles/master-1.adp	22 May 2003 14:36:35 -0000	1.3
@@ -31,8 +31,8 @@
         <td valign=top bgcolor=#000066>
           <font color=#ffffff>
 	    <include src="article-list" 
-              location="@location@" 
-              title="@title@"
+              location="@location;noquote@" 
+              title="@title;noquote@"
               article_link_color="#CCCCCC"
               location_color="#FFFFFF">
           </font>
Index: openacs-4/packages/cms-news-demo/templates/demo_articles/master-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/templates/demo_articles/master-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/templates/demo_articles/master-2.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/templates/demo_articles/master-2.adp	22 May 2003 14:36:35 -0000	1.3
@@ -19,7 +19,7 @@
   <td bgcolor="#99CCFF" valign=top align=right height=100%>
     <table cellspacing=0 cellpadding=4 border=0 width=100% height=100%>
     <tr><td valign=top>
-      <include src="article-list" location="@location@" title="@title@">
+      <include src="article-list" location="@location;noquote@" title="@title;noquote@">
     </td></tr></table>
     </td>
 
Index: openacs-4/packages/cms-news-demo/www/install-wizard-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/www/install-wizard-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/www/install-wizard-2.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/www/install-wizard-2.adp	22 May 2003 14:38:02 -0000	1.3
@@ -20,7 +20,7 @@
       </if>
       <else>
         <!-- results of creating folders and templates -->
-        @html@
+        @html;noquote@
       </else>
       </ul>
       <p>
Index: openacs-4/packages/cms-news-demo/www/install-wizard-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/www/install-wizard-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/www/install-wizard-3.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/www/install-wizard-3.adp	22 May 2003 14:38:02 -0000	1.3
@@ -20,7 +20,7 @@
     </if>
     <else>
       <!-- results of creating demo users -->
-      @html@
+      @html;noquote@
     </else>
     </ul>
     <p>
Index: openacs-4/packages/cms-news-demo/www/install-wizard-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/www/install-wizard-4.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms-news-demo/www/install-wizard-4.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/cms-news-demo/www/install-wizard-4.adp	22 May 2003 14:38:02 -0000	1.3
@@ -14,7 +14,7 @@
     Granting permissions to demo users...
     <ul>
       <!-- results of granting permissions to demo users -->
-      @html@
+      @html;noquote@
     </ul>
     <p>
 
Index: openacs-4/packages/cronjob/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cronjob/www/index.adp	4 Sep 2002 09:06:09 -0000	1.1
+++ openacs-4/packages/cronjob/www/index.adp	22 May 2003 14:39:12 -0000	1.2
@@ -1,6 +1,6 @@
   <master>
-    <property name="title">@title@</property>
-    <property name="context">@context@</property>
+    <property name="title">@title;noquote@</property>
+    <property name="context">@context;noquote@</property>
 
     <p>This package has no user pages.</p>
     <if @admin_p@ eq 1>
Index: openacs-4/packages/cronjob/www/admin/cronjob.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cronjob/www/admin/cronjob.adp	17 May 2003 10:27:27 -0000	1.3
+++ openacs-4/packages/cronjob/www/admin/cronjob.adp	22 May 2003 14:40:40 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>@page_title@</h3>
 
Index: openacs-4/packages/cronjob/www/admin/cronjobs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjobs.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cronjob/www/admin/cronjobs.adp	4 Sep 2002 09:17:10 -0000	1.2
+++ openacs-4/packages/cronjob/www/admin/cronjobs.adp	22 May 2003 14:40:40 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>@page_title@</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.2 -r1.3
--- openacs-4/packages/directory/templates/master.adp	4 Sep 2002 09:38:03 -0000	1.2
+++ openacs-4/packages/directory/templates/master.adp	22 May 2003 14:41:37 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</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.2 -r1.3
--- openacs-4/packages/directory/www/index.adp	4 Sep 2002 09:38:04 -0000	1.2
+++ openacs-4/packages/directory/www/index.adp	22 May 2003 14:43:46 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="@master_template@">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action=index>
  @search_vars@
@@ -57,7 +57,7 @@
      <tr>
       <td class="HighlightColor">
         <table border="0" cellpadding="3" cellspacing="1" align="center" width="100%">
-          @row_range_html@
+          @row_range_html;noquote@
          <tr class="HighlightColor">
           <th>@name_header@</th>
           <th>@email_header@</th>
Index: openacs-4/packages/download/www/all-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/all-metadata.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/all-metadata.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">All @pretty_name@</property>
+<property name="title">All @pretty_name;noquote@</property>
 <property name="context">All Metadata</property>
 @table@
 
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.3 -r1.4
--- openacs-4/packages/download/www/archive-add.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/archive-add.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Add a New Software Archive</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-add-2">
 <%= [export_form_vars 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.3 -r1.4
--- openacs-4/packages/download/www/archive-version-add.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/archive-version-add.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Add a New Software Archive</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-version-add-2">
 <%= [export_form_vars 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.4 -r1.5
--- openacs-4/packages/download/www/download-verify.adp	6 Sep 2002 21:50:31 -0000	1.4
+++ openacs-4/packages/download/www/download-verify.adp	22 May 2003 14:45:12 -0000	1.5
@@ -1,6 +1,6 @@
   <master>
-    <property name="title">Download @archive_name@ @version_name@</property>
-    <property name="context">@context@</property>
+    <property name="title">Download @archive_name;noquote@ @version_name;noquote@</property>
+    <property name="context">@context;noquote@</property>
 
     <h3>Download @archive_name@ @version_name@</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.4 -r1.5
--- openacs-4/packages/download/www/help.adp	30 Nov 2002 17:30:24 -0000	1.4
+++ openacs-4/packages/download/www/help.adp	22 May 2003 14:45:12 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Help on @title@</property>
-<property name="context">@context@</property>
+<property name="title">Help on @title;noquote@</property>
+<property name="context">@context;noquote@</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.5 -r1.6
--- openacs-4/packages/download/www/index.adp	30 Nov 2002 17:30:24 -0000	1.5
+++ openacs-4/packages/download/www/index.adp	22 May 2003 14:45:12 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 <property name="context"></property>
 
 <if @master_admin_p@ eq 1>
@@ -17,7 +17,7 @@
 
 <h3>Available Software:</h3> 
 
-@dimensional_html@
+@dimensional_html;noquote@
 <br /><br />
 @table@
 
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.3 -r1.4
--- openacs-4/packages/download/www/one-archive.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/one-archive.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">One Archive: @archive_name@</property>
-<property name="context">@context@</property>
+<property name="title">One Archive: @archive_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @master_admin_p@ eq 1>
 <table align="right"><tr><td><a href="admin/">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.3 -r1.4
--- openacs-4/packages/download/www/one-metadata.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/one-metadata.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">One @pretty_name@</property>
-<property name="context">@context@</property>
+<property name="title">One @pretty_name;noquote@</property>
+<property name="context">@context;noquote@</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.3 -r1.4
--- openacs-4/packages/download/www/one-revision.adp	6 Sep 2002 21:50:31 -0000	1.3
+++ openacs-4/packages/download/www/one-revision.adp	22 May 2003 14:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">One Revision: @archive_name@ ver. @version_name@</property>
-<property name="context">@context@</property>
+<property name="title">One Revision: @archive_name;noquote@ ver. @version_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @master_admin_p@ eq 1>
 <table align="right"><tr><td><a href="admin/">Administration</a></td></tr></table>