Index: openacs-4/contrib/packages/irc-logger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/irc-logger/www/index.adp	31 May 2004 07:09:14 -0000	1.3
+++ openacs-4/contrib/packages/irc-logger/www/index.adp	12 Sep 2013 20:34:47 -0000	1.4
@@ -1,6 +1,6 @@
 <!-- @arch-tag: 8956fbd0-2d1a-42d4-95da-978d545b6bdd -->
 <master>
-  <property name="title">@title;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
 
   <table width="100%">
     <tbody>
Index: openacs-4/contrib/packages/irc-logger/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/www/admin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/irc-logger/www/admin/index.adp	31 May 2004 07:09:14 -0000	1.5
+++ openacs-4/contrib/packages/irc-logger/www/admin/index.adp	12 Sep 2013 20:34:47 -0000	1.6
@@ -1,6 +1,6 @@
 <!-- @arch-tag: 503ab846-a1ea-4d60-9780-e9294e41fc1e -->
 <master>
-  <property name="title">@title;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
 
   <table width="100%">
     <tbody>
Index: openacs-4/contrib/packages/irc-logger/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/www/doc/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/irc-logger/www/doc/index.adp	31 May 2004 07:09:14 -0000	1.6
+++ openacs-4/contrib/packages/irc-logger/www/doc/index.adp	12 Sep 2013 20:34:47 -0000	1.7
@@ -1,6 +1,6 @@
 <!-- @arch-tag: ffaabd94-589c-4d32-a36b-1806573a166b -->
 <master>
-  <property name="title">@title;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
   <property name="signatory">@signatory;noquote@</property>
   <property name="context_bar">@context_bar;noquote@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
Index: openacs-4/contrib/packages/irc-logger/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/www/doc/license.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/irc-logger/www/doc/license.adp	31 May 2004 07:09:14 -0000	1.3
+++ openacs-4/contrib/packages/irc-logger/www/doc/license.adp	12 Sep 2013 20:34:47 -0000	1.4
@@ -1,6 +1,6 @@
 <!-- @arch-tag: 7233270e-c77c-4ed8-a46d-f16870590137 -->
 <master>
-  <property name="title">@title;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
   <property name="signatory">@signatory;noquote@</property>
   <property name="context_bar">@context_bar;noquote@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
Index: openacs-4/packages/directory/templates/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/templates/master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/directory/templates/master.adp	22 May 2003 14:41:37 -0000	1.3
+++ openacs-4/packages/directory/templates/master.adp	12 Sep 2013 20:25:58 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title;noquote@</property>
+<property name="doc(title)">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="header_stuff"><style>
 <!--
Index: openacs-4/packages/directory/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/directory/www/index.adp	26 Mar 2004 12:05:33 -0000	1.6
+++ openacs-4/packages/directory/www/index.adp	12 Sep 2013 20:25:58 -0000	1.7
@@ -1,5 +1,5 @@
 <master src="@master_template@">
-<property name="title">@page_title;noquote@</property>
+<property name="doc(title)">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
 <form action=index>
Index: openacs-4/packages/faq/templates/first/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/templates/first/one-faq.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/templates/first/one-faq.adp	22 May 2003 14:53:33 -0000	1.5
+++ openacs-4/packages/faq/templates/first/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="title">@faq_name;noquote@</property>
+<property name="doc(title)">@faq_name;noquote@</property>
 
 <if @one_question:rowcount@ eq 0>
  <i>#faq.lt_no_questions#</i><p>
Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/faq/www/index.adp	15 May 2007 20:14:35 -0000	1.11
+++ openacs-4/packages/faq/www/index.adp	12 Sep 2013 20:28:49 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.FAQs#</property>
+<property name="doc(title)">#faq.FAQs#</property>
 
 <h1>#faq.FAQs#</h1>
 
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/faq/www/one-faq.adp	15 May 2007 20:14:35 -0000	1.17
+++ openacs-4/packages/faq/www/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.18
@@ -1,13 +1,13 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.FAQs#</property>
+<property name="doc(title)">#faq.FAQs#</property>
 
 <h1>@faq_info.faq_name;noquote@</h1>
 
 <p>
       @notification_chunk;noquote@ 
 </p>
-<property name="title">@faq_info.faq_name;noquote@</property>
+<property name="doc(title)">@faq_info.faq_name;noquote@</property>
 <property name="displayed_object_id">@faq_id;noquote@</property>
 
 <table width="70%" border="0">
Index: openacs-4/packages/faq/www/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/one-question.adp	15 May 2007 20:14:35 -0000	1.8
+++ openacs-4/packages/faq/www/one-question.adp	12 Sep 2013 20:28:49 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.One_Question#</property>
+<property name="doc(title)">#faq.One_Question#</property>
 <property name="displayed_object_id">@entry_id;noquote@</property>
 
 <h1>@faq_name;noquote@</h1>
Index: openacs-4/packages/faq/www/admin/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/configure.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/configure.adp	12 Aug 2004 14:00:52 -0000	1.2
+++ openacs-4/packages/faq/www/admin/configure.adp	12 Sep 2013 20:28:49 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
+<property name="doc(title)">@title@</property>
 <property name="context">@context@</property>
 
 <formtemplate id="categories_mode"></formtemplate>
Index: openacs-4/packages/faq/www/admin/faq-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-add-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-add-edit.adp	15 May 2007 20:14:35 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-add-edit.adp	12 Sep 2013 20:28:49 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
+<property name="doc(title)">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">faq_add_edit.faq_name</property>
 <h1>@page_title;noquote@</h1>
Index: openacs-4/packages/faq/www/admin/faq-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/faq-edit.adp	9 Nov 2008 23:29:25 -0000	1.6
+++ openacs-4/packages/faq/www/admin/faq-edit.adp	12 Sep 2013 20:28:49 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="doc(title)">@title;noquote@</property>
 
 <form action="@action@">
  <div><input type="hidden" name="faq_id" value="@faq_id@"></div>
Index: openacs-4/packages/faq/www/admin/faq-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/admin/faq-new.adp	9 Nov 2008 23:29:25 -0000	1.8
+++ openacs-4/packages/faq/www/admin/faq-new.adp	12 Sep 2013 20:28:49 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="doc(title)">@title;noquote@</property>
 <property name="focus">faq.faq_name</property>
 
 <h1>Create an FAQ:</h1>
Index: openacs-4/packages/faq/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/faq/www/admin/index.adp	15 May 2007 20:14:35 -0000	1.13
+++ openacs-4/packages/faq/www/admin/index.adp	12 Sep 2013 20:28:49 -0000	1.14
@@ -1,12 +1,12 @@
 <master>
-<property name="title">@title;noquote@</property>
+<property name="doc(title)">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <h1>@title;noquote@</h1>
 <listtemplate name="faqs"></listtemplate>
 
 <ul class="action-links">
     <li><a href="faq-add-edit" title="#faq.Create_a_new_FAQ#">#faq.Create_a_new_FAQ#</a></li>
-    <li><a href="configure?<%=[export_url_vars return_url]%>" title="#faq.Configure_FAQ_Preferences#">#faq.Configure#</a></li>
+    <li><a href="configure?<%=[export_vars -url {return_url}]%>" title="#faq.Configure_FAQ_Preferences#">#faq.Configure#</a></li>
     <if @use_categories_p@ and @category_container@ eq "package_id">
         <li><a href="@category_map_url@" class="action_link" title="#faq.Site_wide_categories#">#faq.Site_wide_categories#</a></li>
     </if>
Index: openacs-4/packages/faq/www/admin/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/faq/www/admin/one-faq.adp	15 May 2007 20:14:35 -0000	1.14
+++ openacs-4/packages/faq/www/admin/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.15
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+<property name="doc(title)">@title;noquote@</property>
 
 <h1>@title;noquote@</h1>
 <include src="/packages/faq/lib/faq-add-edit" &="faq_id" mode="display">
Index: openacs-4/packages/faq/www/admin/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/www/admin/one-question.adp	29 Jun 2004 10:18:18 -0000	1.7
+++ openacs-4/packages/faq/www/admin/one-question.adp	12 Sep 2013 20:28:49 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.One_Question#</property>
+<property name="doc(title)">#faq.One_Question#</property>
 
 <b>#faq.Q#</b> @question;noquote@
 <P>
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp	29 Mar 2005 21:00:38 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp	12 Sep 2013 20:28:49 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
+<property name="doc(title)">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">new_quest_answ.question</property>
 
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	8 Aug 2006 21:26:46 -0000	1.8
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	12 Sep 2013 20:28:49 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.One_Question#</property>
+<property name="doc(title)">#faq.One_Question#</property>
 
 <form action="@action@" method=post>
 <input type=hidden name=entry_id value=@entry_id@>
Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp	9 Nov 2008 23:29:25 -0000	1.11
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp	12 Sep 2013 20:28:49 -0000	1.12
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@page_title;noquote@</property>
+<property name="doc(title)">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">question.question</property>