Index: openacs-4/packages/acs-authentication/www/doc/configure-batch-sync.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/configure-batch-sync.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/configure-batch-sync.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/configure-batch-sync.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,12 +1,12 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {Configure Batch Synchronization}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {Configure Batch Synchronization}</property>
 <property name="doc(title)">Configure Batch Synchronization</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="ext-auth-ldap-install" leftLabel="Prev"
-		    title="Installation"
-		    rightLink="ext-auth-design" rightLabel="Next">
-		<div class="sect1" lang="en">
+			leftLink="ext-auth-ldap-install" leftLabel="Prev"
+			title="Installation"
+			rightLink="ext-auth-design" rightLabel="Next">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="configure-batch-sync" id="configure-batch-sync"></a>Configure
 Batch Synchronization</h2></div></div></div><div class="orderedlist"><ol type="1">
@@ -59,12 +59,12 @@
 example in the design document for more details.</p><p>(More information: <a href="ims-sync-driver-design" title="IMS Sync driver design">the section called “IMS Sync driver
 design”</a>, <a href="http://www.imsproject.org/enterprise/" target="_top">The IMS 1.1 spec</a>)</p>
 </li>
-</ol></div><div class="cvstag">($&zwnj;Id: configure-batch-sync.html,v 1.2
-2004/02/19 14:59:42 joela Exp $)</div>
+</ol></div><div class="cvstag">($&zwnj;Id: configure-batch-sync.html,v 1.3
+2017/08/07 23:47:46 gustafn Exp $)</div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="ext-auth-ldap-install" leftLabel="Prev" leftTitle="Installing LDAP support"
-		    rightLink="ext-auth-design" rightLabel="Next" rightTitle="Design"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="ext-auth-install" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="ext-auth-ldap-install" leftLabel="Prev" leftTitle="Installing LDAP support"
+			rightLink="ext-auth-design" rightLabel="Next" rightTitle="Design"
+			homeLink="index" homeLabel="Home" 
+			upLink="ext-auth-install" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/ext-auth-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/ext-auth-design.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/ext-auth-design.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/ext-auth-design.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,12 +1,12 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {Design}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {Design}</property>
 <property name="doc(title)">Design</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="configure-batch-sync" leftLabel="Prev"
-		    title=""
-		    rightLink="ims-sync-driver-design" rightLabel="Next">
-		<div class="article" lang="en">
+			leftLink="configure-batch-sync" leftLabel="Prev"
+			title=""
+			rightLink="ims-sync-driver-design" rightLabel="Next">
+		    <div class="article" lang="en">
 <div class="titlepage">
 <div><div><h2 class="title">
 <a name="ext-auth-design" id="ext-auth-design"></a>Design</h2></div></div><hr>
@@ -18,8 +18,8 @@
 staff.</div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="configure-batch-sync" leftLabel="Prev" leftTitle="Configure Batch Synchronization"
-		    rightLink="ims-sync-driver-design" rightLabel="Next" rightTitle="IMS Sync driver design"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="index" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="configure-batch-sync" leftLabel="Prev" leftTitle="Configure Batch Synchronization"
+			rightLink="ims-sync-driver-design" rightLabel="Next" rightTitle="IMS Sync driver design"
+			homeLink="index" homeLabel="Home" 
+			upLink="index" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/ext-auth-install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/ext-auth-install.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/ext-auth-install.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/ext-auth-install.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,12 +1,12 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {Installation}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {Installation}</property>
 <property name="doc(title)">Installation</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="index" leftLabel="Prev"
-		    title=""
-		    rightLink="ext-auth-pam-install" rightLabel="Next">
-		<div class="article" lang="en">
+			leftLink="index" leftLabel="Prev"
+			title=""
+			rightLink="ext-auth-pam-install" rightLabel="Next">
+		    <div class="article" lang="en">
 <div class="titlepage">
 <div><div><h2 class="title">
 <a name="ext-auth-install" id="ext-auth-install"></a>Installation</h2></div></div><hr>
@@ -24,9 +24,9 @@
 OpenACS documentation staff.</div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="index" leftLabel="Prev" leftTitle="External Authentication"
-		    rightLink="ext-auth-pam-install" rightLabel="Next" rightTitle="Using Pluggable Authentication
+			leftLink="index" leftLabel="Prev" leftTitle="External Authentication"
+			rightLink="ext-auth-pam-install" rightLabel="Next" rightTitle="Using Pluggable Authentication
 Modules (PAM) with OpenACS"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="index" upLabel="Up"> 
-		
\ No newline at end of file
+			homeLink="index" homeLabel="Home" 
+			upLink="index" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/ext-auth-ldap-install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/ext-auth-ldap-install.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-authentication/www/doc/ext-auth-ldap-install.adp	29 Dec 2017 10:05:27 -0000	1.3
+++ openacs-4/packages/acs-authentication/www/doc/ext-auth-ldap-install.adp	30 Apr 2018 08:12:47 -0000	1.4
@@ -1,12 +1,12 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {Using LDAP/Active Directory with OpenACS}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {Using LDAP/Active Directory with OpenACS}</property>
 <property name="doc(title)">Using LDAP/Active Directory with OpenACS</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="ext-auth-pam-install" leftLabel="Prev"
-		    title="Installation"
-		    rightLink="configure-batch-sync" rightLabel="Next">
-		<div class="sect1" lang="en">
+			leftLink="ext-auth-pam-install" leftLabel="Prev"
+			title="Installation"
+			rightLink="configure-batch-sync" rightLabel="Next">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="ext-auth-ldap-install" id="ext-auth-ldap-install"></a>Using
 LDAP/Active Directory with OpenACS</h2></div></div></div><div class="authorblurb">by <a href="http://openacs.org/shared/community-member?user_id=8551" target="_top">John Sequeira</a>, <a href="http://openacs.org/shared/community-member?user_id=8263" target="_top">Michael Steigman</a>, and <a href="http://openacs.org/shared/community-member?user_id=12805" target="_top">Carl Blesius</a>. OpenACS docs are written by the named
@@ -132,7 +132,7 @@
 </ol></div><p>
 <strong>Troubleshooting. </strong>If you&#39;re having
 trouble figuring out some the values for the ldapm, see this useful
-page on <a href="http://bugzilla.glob.com.au/activedirectory/" target="_top">setting up Active Directory integration with
+page on <a href="https://www.rhyous.com/2009/11/10/how-to-configure-bugzilla-to-authenticate-to-active-directory/" target="_top">setting up Active Directory integration with
 Bugzilla</a>. It explains how distinguished names are defined in
 Active Directory, and how to test that you have the correct values
 for connectivity and base DN using the OpenLDAP command-line
@@ -145,9 +145,9 @@
 Hospital</a> for underwriting this work.</p>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="ext-auth-pam-install" leftLabel="Prev" leftTitle="Using Pluggable Authentication Modules
+			leftLink="ext-auth-pam-install" leftLabel="Prev" leftTitle="Using Pluggable Authentication Modules
 (PAM) with OpenACS"
-		    rightLink="configure-batch-sync" rightLabel="Next" rightTitle="Configure Batch Synchronization"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="ext-auth-install" upLabel="Up"> 
-		
\ No newline at end of file
+			rightLink="configure-batch-sync" rightLabel="Next" rightTitle="Configure Batch Synchronization"
+			homeLink="index" homeLabel="Home" 
+			upLink="ext-auth-install" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/ext-auth-pam-install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/ext-auth-pam-install.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/ext-auth-pam-install.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/ext-auth-pam-install.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,14 +1,14 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {Using Pluggable Authentication Modules (PAM) with
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {Using Pluggable Authentication Modules (PAM) with
 OpenACS}</property>
 <property name="doc(title)">Using Pluggable Authentication Modules (PAM) with
 OpenACS</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="ext-auth-install" leftLabel="Prev"
-		    title="Installation"
-		    rightLink="ext-auth-ldap-install" rightLabel="Next">
-		<div class="sect1" lang="en">
+			leftLink="ext-auth-install" leftLabel="Prev"
+			title="Installation"
+			rightLink="ext-auth-ldap-install" rightLabel="Next">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="ext-auth-pam-install" id="ext-auth-pam-install"></a>Using
 Pluggable Authentication Modules (PAM) with OpenACS</h2></div></div></div><p>OpenACS supports PAM authetication via the ns_pam module in
@@ -18,16 +18,15 @@
 <strong>Add PAM support to AOLserver. </strong>OpenACS
 supports PAM support via the PAM AOLserver module. PAM is system of
 modular support, and can provide local (unix password), RADIUS,
-LDAP (<a href="http://www.tldp.org/HOWTO/LDAP-Implementation-HOWTO/pamnss.html" target="_top">more information</a>), and other forms of
+LDAP (<a href="http://www.tldp.org/HOWTO/archived/LDAP-Implementation-HOWTO/pamnss.html" target="_top">more information</a>), and other forms of
 authentication. Note that due to security issues, the AOLserver PAM
 module cannot be used for local password authentication.</p><div class="orderedlist"><ol type="a">
 <li>
 <p>
 <a name="install-nspam" id="install-nspam"></a><strong>Compile
 and install ns_pam. </strong>Download the <a href="/doc/nspam-download" target="_top">tarball</a> to <code class="computeroutput">/tmp</code>.</p><p>Debian users: first do <strong class="userinput"><code>apt-get
 install libpam-dev</code></strong>
-</p><pre class="screen">
-[root\@yourserver root]# <strong class="userinput"><code>cd /usr/local/src/aolserver</code></strong>
+</p><pre class="screen">[root\@yourserver root]# <strong class="userinput"><code>cd /usr/local/src/aolserver</code></strong>
 [root\@yourserver aolserver]# <strong class="userinput"><code>tar xzf /tmp/ns_pam-0.1.tar.gz</code></strong>
 [root\@yourserver aolserver]# <strong class="userinput"><code>cd nspam</code></strong>
 [root\@yourserver nspam]# <strong class="userinput"><code>make</code></strong>
@@ -63,8 +62,7 @@
 <p><strong>RADIUS in PAM. </strong></p><div class="orderedlist"><ol type="i">
 <li>
 <p>Untar the <a href="/doc/individual-programs" target="_top">pam_radius tarball</a> and compile and install. (<a href="http://www.freeradius.org/pam_radius_auth/" target="_top">more
-information</a>)</p><pre class="screen">
-[root\@yourserver root]# <strong class="userinput"><code>cd /usr/local/src/</code></strong>
+information</a>)</p><pre class="screen">[root\@yourserver root]# <strong class="userinput"><code>cd /usr/local/src/</code></strong>
 [root\@yourserver src]# <strong class="userinput"><code>tar xf /tmp/pam_radius-1.3.16.tar</code></strong>
 [root\@yourserver src]# <strong class="userinput"><code>cd pam_radius-1.3.16</code></strong>
 [root\@yourserver pam_radius-1.3.16]# <strong class="userinput"><code>make</code></strong>
@@ -93,23 +91,19 @@
 </li><li>
 <p>Modify the AOLserver configuration file to use this PAM domain.
 Edit the line</p><pre class="programlisting">
-ns_param   PamDomain             "<span class="replaceable"><span class="replaceable">service0</span></span>"
-</pre><p>So that the value of the parameter matches the name (just the
-file name, not the fully pathed name) of the domain file in</p><pre class="programlisting">
-/etc/pam.d/
-</pre>
+ns_param   PamDomain             "<span class="replaceable"><span class="replaceable">service0</span></span>"</pre><p>So that the value of the parameter matches the name (just the
+file name, not the fully pathed name) of the domain file in</p><pre class="programlisting">/etc/pam.d/</pre>
 </li>
 </ol></div>
 </li><li><p>
-<strong>LDAP in PAM. </strong><a href="http://www.tldp.org/HOWTO/LDAP-Implementation-HOWTO/pamnss.html#AEN110" target="_top">more information</a>
+<strong>LDAP in PAM. </strong><a href="http://www.tldp.org/HOWTO/archived/LDAP-Implementation-HOWTO/pamnss.html#AEN110" target="_top">more information</a>
 </p></li>
 </ul></div>
 </li><li>
 <p><strong>Modify the AOLserver configuration file to support
 ns_pam. </strong></p><p>In <code class="computeroutput">/var/lib/aolserver/<span class="replaceable"><span class="replaceable">service0</span></span>/etc/config.tcl</code>, enable
 the nspam module by uncommenting this line:</p><pre class="programlisting">
-ns_param   nspam           ${bindir}/nspam.so
-</pre>
+ns_param   nspam           ${bindir}/nspam.so</pre>
 </li>
 </ol></div>
 </li><li><p>
@@ -132,9 +126,9 @@
 </ol></div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="ext-auth-install" leftLabel="Prev" leftTitle="Installation"
-		    rightLink="ext-auth-ldap-install" rightLabel="Next" rightTitle="Using LDAP/Active Directory with
+			leftLink="ext-auth-install" leftLabel="Prev" leftTitle="Installation"
+			rightLink="ext-auth-ldap-install" rightLabel="Next" rightTitle="Using LDAP/Active Directory with
 OpenACS"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="ext-auth-install" upLabel="Up"> 
-		
\ No newline at end of file
+			homeLink="index" homeLabel="Home" 
+			upLink="ext-auth-install" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/ims-sync-driver-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/ims-sync-driver-design.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/ims-sync-driver-design.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/ims-sync-driver-design.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,12 +1,12 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {IMS Sync driver design}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {IMS Sync driver design}</property>
 <property name="doc(title)">IMS Sync driver design</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="ext-auth-design" leftLabel="Prev"
-		    title="Design"
-		    rightLink="" rightLabel="">
-		<div class="sect1" lang="en">
+			leftLink="ext-auth-design" leftLabel="Prev"
+			title="Design"
+			rightLink="" rightLabel="">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="ims-sync-driver-design" id="ims-sync-driver-design"></a>IMS Sync
 driver design</h2></div></div></div><div class="authorblurb">by <a href="mailto:lars\@collaboraid.biz" target="_top">Lars Pind</a> OpenACS docs are written by the named
@@ -190,18 +190,18 @@
 <a name="id2452593" id="id2452593"></a>
 Resources</h3></div></div></div><div class="itemizedlist"><ul type="disc">
 <li><p>
-<a href="http://zope.cetis.ac.uk/content/20020524162233/index.html" target="_top">Consolidation before the leap; IMS Enterprise 1.1</a>: This
+<a href="http://www.cetis.ac.uk/content/20020524162233" target="_top">Consolidation before the leap; IMS Enterprise 1.1</a>: This
 article says that IMS Enterprise 1.1 (current version) does not
 address the communication model, which is critically missing for
 real seamless interoperability. IMS Enterprise 2.0 will address
 this, but Blackboard, who&#39;s influential in the IMS committee,
-is adopting OKI&#39;s programming interrfaces for this.</p></li><li><p><a href="http://www.cetis.ac.uk/content/20030717185453" target="_top">IMS and OKI, the wire and the socket</a></p></li>
+is adopting OKI&#39;s programming interrfaces for this.</p></li><li><p><a href="http://zope.cetis.ac.uk/content/20020524162233/index.html" target="_top">IMS and OKI, the wire and the socket</a></p></li>
 </ul></div>
 </div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="ext-auth-design" leftLabel="Prev" leftTitle="Design"
-		    rightLink="" rightLabel="" rightTitle=""
-		    homeLink="index" homeLabel="Home" 
-		    upLink="ext-auth-design" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="ext-auth-design" leftLabel="Prev" leftTitle="Design"
+			rightLink="" rightLabel="" rightTitle=""
+			homeLink="index" homeLabel="Home" 
+			upLink="ext-auth-design" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-authentication/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/www/doc/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/www/doc/index.adp	29 Oct 2017 11:33:10 -0000	1.2
+++ openacs-4/packages/acs-authentication/www/doc/index.adp	30 Apr 2018 08:12:47 -0000	1.3
@@ -1,32 +1,21 @@
 
-<property name="context">{/doc/acs-authentication {Authentication}} {External Authentication}</property>
+<property name="context">{/doc/acs-authentication {ACS Authentication}} {External Authentication}</property>
 <property name="doc(title)">External Authentication</property>
 <master>
-<include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="" leftLabel=""
-		    title=""
-		    rightLink="ext-auth-install" rightLabel="Next">
-		<div class="book" lang="en">
-<div class="titlepage">
-<div><div><h1 class="title">
+<div class="book" lang="en">
+<div class="titlepage"><div><div><h1 class="title">
 <a name="id2410693" id="id2410693"></a>External
-Authentication</h1></div></div><hr>
-</div><div class="toc">
-<p><strong>Table of Contents</strong></p><dl>
+Authentication</h1></div></div></div><div class="toc"><dl>
 <dt><span class="article"><a href="ext-auth-install">Installation</a></span></dt><dd><dl>
 <dt><span class="sect1"><a href="ext-auth-pam-install">Using
 Pluggable Authentication Modules (PAM) with OpenACS</a></span></dt><dt><span class="sect1"><a href="ext-auth-ldap-install">Using
 LDAP/Active Directory with OpenACS</a></span></dt><dt><span class="sect1"><a href="configure-batch-sync">Configure Batch
 Synchronization</a></span></dt>
 </dl></dd><dt><span class="article"><a href="ext-auth-design">Design</a></span></dt><dd><dl><dt><span class="sect1"><a href="ims-sync-driver-design">IMS
 Sync driver design</a></span></dt></dl></dd>
-</dl>
+</dl></div>
 </div>
-</div>
-<include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="" leftLabel="" leftTitle=""
-		    rightLink="ext-auth-install" rightLabel="Next" rightTitle="Installation"
-		    homeLink="" homeLabel="" 
-		    upLink="" upLabel=""> 
-		<center><a href="http://openacs.org/doc/current/index.html#comments">View comments
-on this page at openacs.org</a></center>
+<h2>Release Notes</h2>
+<p>Please file bugs in the <a href="http://openacs.org/bugtracker/openacs/">Bug Tracker</a>.</p>
+<hr>
+<address><a href="mailto:docs\@openacs.org">docs\@openacs.org</a></address>
Index: openacs-4/packages/acs-automated-testing/www/doc/install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/doc/install.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/doc/install.adp	7 Aug 2017 23:47:46 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/doc/install.adp	30 Apr 2018 08:13:40 -0000	1.4
@@ -3,10 +3,10 @@
 <property name="doc(title)">Installation</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="index" leftLabel="Prev"
-		    title=""
-		    rightLink="usage" rightLabel="Next">
-		<div class="sect1" lang="en">
+			leftLink="index" leftLabel="Prev"
+			title=""
+			rightLink="usage" rightLabel="Next">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="install" id="install"></a>Installation</h2></div></div></div><div class="authorblurb">
 <p>by <a href="mailto:joel\@aufrecht.org" target="_top">Joel
@@ -18,8 +18,8 @@
 tests are stored within each package in package/tcl/test.</p>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="index" leftLabel="Prev" leftTitle="Automated Testing"
-		    rightLink="usage" rightLabel="Next" rightTitle="Usage"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="index" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="index" leftLabel="Prev" leftTitle="Automated Testing"
+			rightLink="usage" rightLabel="Next" rightTitle="Usage"
+			homeLink="index" homeLabel="Home" 
+			upLink="index" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-automated-testing/www/doc/requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/doc/requirements.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/doc/requirements.adp	7 Aug 2017 23:47:46 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/doc/requirements.adp	30 Apr 2018 08:13:40 -0000	1.4
@@ -3,10 +3,10 @@
 <property name="doc(title)">Requirements</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="usage" leftLabel="Prev"
-		    title=""
-		    rightLink="" rightLabel="">
-		<div class="sect1" lang="en">
+			leftLink="usage" leftLabel="Prev"
+			title=""
+			rightLink="" rightLabel="">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="requirements" id="requirements"></a>Requirements</h2></div></div></div><div class="authorblurb">
 <p>by <a href="mailto:joel\@aufrecht.org" target="_top">Joel
@@ -105,8 +105,7 @@
 with the standard category package. It uses an internal,
 single-dimension category field. Should this eventually get
 extended, a more complete list of categories to implement could
-be:</p><pre class="programlisting">
-Testing Mode
+be:</p><pre class="programlisting">Testing Mode
   Regression
   Smoke
   Stress
@@ -158,8 +157,8 @@
 </div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="usage" leftLabel="Prev" leftTitle="Usage"
-		    rightLink="" rightLabel="" rightTitle=""
-		    homeLink="index" homeLabel="Home" 
-		    upLink="index" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="usage" leftLabel="Prev" leftTitle="Usage"
+			rightLink="" rightLabel="" rightTitle=""
+			homeLink="index" homeLabel="Home" 
+			upLink="index" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-automated-testing/www/doc/usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/doc/usage.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/doc/usage.adp	7 Aug 2017 23:47:46 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/doc/usage.adp	30 Apr 2018 08:13:40 -0000	1.4
@@ -3,10 +3,10 @@
 <property name="doc(title)">Usage</property>
 <master>
 <include src="/packages/acs-core-docs/lib/navheader"
-		    leftLink="install" leftLabel="Prev"
-		    title=""
-		    rightLink="requirements" rightLabel="Next">
-		<div class="sect1" lang="en">
+			leftLink="install" leftLabel="Prev"
+			title=""
+			rightLink="requirements" rightLabel="Next">
+		    <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="usage" id="usage"></a>Usage</h2></div></div></div><div class="authorblurb">
 <p>by <a href="mailto:joel\@aufrecht.org" target="_top">Joel
@@ -27,16 +27,13 @@
 up a dedicated user and <a href="http://openacs.org/doc/openacs-5-0-0/openacs.html#install-with-script" target="_top">automated install script</a>.</p></li><li>
 <p>To run automated testing automatically each time the server is
 rebuilt, add this to /home/service1/install/install.tcl:</p><pre class="programlisting">
-       set do_tclapi_testing "yes"
-</pre>
+set do_tclapi_testing "yes"</pre>
 </li><li>
 <p>Get the results of the automated tests dumped where the master
 server can see them - in this example, the same directory as above,
 <tt class="computeroutput">/var/log/openacs-install</tt>, by adding
 this to install.tcl (requires 5.1):</p><pre class="programlisting">
-          set install_xml_file          "/var/lib/aolserver/service0/packages/acs-core-docs/www/files/install-autotest.xml"
-</pre><p>This will copy in the file <tt class="computeroutput">install-autotest.xml</tt>:</p><pre class="programlisting">
-&lt;?xml version="1.0"?&gt;
+set install_xml_file          "/var/lib/aolserver/service0/packages/acs-core-docs/www/files/install-autotest.xml"</pre><p>This will copy in the file <tt class="computeroutput">install-autotest.xml</tt>:</p><pre class="programlisting">&lt;?xml version="1.0"?&gt;
 
 &lt;!-- This is an install.xml which can be used to configure servers for reporting their automated test results.  Requires acs-automated-testing 5.1.0b2 or better --&gt;
 
@@ -54,8 +51,7 @@
 </ol></div>
 </li><li>
 <p>To enable the 'rebuild server' link, edit the file
-/usr/local/bin/rebuild-server.sh:</p><pre class="programlisting">
-#!/bin/sh
+/usr/local/bin/rebuild-server.sh:</p><pre class="programlisting">#!/bin/sh
 # script to trigger a server rebuild
 
 # hard-coding the valid server names here for some minimal security
@@ -67,18 +63,16 @@
         exit;;
 esac
 
-sudo /home/$1/install/install.sh 2&gt;&amp;1
-</pre><p>and allow the <tt class="computeroutput">master</tt> user to
+sudo /home/$1/install/install.sh 2&gt;&amp;1</pre><p>and allow the <tt class="computeroutput">master</tt> user to
 execute this file as root (this is a limitation of the automatic
 install script, which must be root). In <tt class="computeroutput">/etc/sudoers</tt>, include a line:</p><pre class="programlisting">
-master ALL = NOPASSWD: /usr/local/bin/rebuild-server.sh
-</pre>
+master ALL = NOPASSWD: /usr/local/bin/rebuild-server.sh</pre>
 </li>
 </ul></div>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
-		    leftLink="install" leftLabel="Prev" leftTitle="Installation"
-		    rightLink="requirements" rightLabel="Next" rightTitle="Requirements"
-		    homeLink="index" homeLabel="Home" 
-		    upLink="index" upLabel="Up"> 
-		
\ No newline at end of file
+			leftLink="install" leftLabel="Prev" leftTitle="Installation"
+			rightLink="requirements" rightLabel="Next" rightTitle="Requirements"
+			homeLink="index" homeLabel="Home" 
+			upLink="index" upLabel="Up"> 
+		    
\ No newline at end of file
Index: openacs-4/packages/acs-content-repository/www/doc/design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/design.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/design.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/design.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -84,5 +84,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: design.html,v 1.1.1.1.30.1 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: design.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/index.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/index.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -39,5 +39,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Revised: $&zwnj;Id: index.html,v 1.2.18.3 2016/06/22 07:40:41
-gustafn Exp $
+Last Revised: $&zwnj;Id: index.html,v 1.3 2017/08/07 23:47:47 gustafn Exp
+$
Index: openacs-4/packages/acs-content-repository/www/doc/install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/install.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/install.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/install.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -29,14 +29,10 @@
 <p>To load the XML parser, download and untar the distribution.
 Load the class package <kbd>lib/xmlparserv2.jar</kbd> into Oracle
 from a shell prompt:</p>
-<pre>
-$ loadjava -user user/password xmlparserv2.jar
-</pre>
+<pre>$ loadjava -user user/password xmlparserv2.jar</pre>
 <p>Finally, load the SQLJ files in
 <kbd>packages/acs-content-repository/java</kbd>:</p>
-<pre>
-$ loadjava -user user/password -resolve *.sqlj
-</pre>
+<pre>$ loadjava -user user/password -resolve *.sqlj</pre>
 <p>Installation of the data model and API should now be
 complete.</p>
 <h3>Intermedia</h3>
@@ -53,33 +49,29 @@
 index</kbd> statement.</p>
 <p>If you experience errors on a UNIX system, check the
 following:</p>
-<ul>
 <li>The operating system user running the Oracle database must have
 execute permission on the files
-<kbd>$ORACLE_HOME/ctx/lib/*.flt</kbd>.</li><li>The directory <kbd>$ORACLE_HOME/ctx/lib</kbd> must be in the
+<kbd>$ORACLE_HOME/ctx/lib/*.flt</kbd>.
+<ul>
+<li>The directory <kbd>$ORACLE_HOME/ctx/lib</kbd> must be in the
 <kbd>$PATH</kbd> environment variable of the operating system user
 running the Oracle database.</li><li>The directory <kbd>$ORACLE_HOME/ctx/lib</kbd> must be in the
 <kbd>$LD_LIBRARY_PATH</kbd> of the operating system user running
 the Oracle database.</li><li>The <kbd>LD_LIBRARY_PATH</kbd> environment variable must be
 specified in the entry for <kbd>PLSExtProc</kbd> in the
-<kbd>$ORACLE_HOME/network/admin/listener.ora.</kbd> For
-example:</li>
-</ul>
+<kbd>$ORACLE_HOME/network/admin/listener.ora.</kbd> For example:
 <pre>
     (SID_DESC =
       (SID_NAME = PLSExtProc)
       (ORACLE_HOME = /ora8/m01/app/oracle/product/8.1.6)
       (ENVS = LD_LIBRARY_PATH=/ora8/m01/app/oracle/product/8.1.6/lib:/usr/lib:/lib:/usr/openwin/lib:/ora8/m01/app/oracle/product/8.1.6/ctx/lib)
       (PROGRAM = extproc)
     )
-</pre>
-<p>If your searches are still failing even after following these
+</pre><p>If your searches are still failing even after following these
 instructions, try a simple <a href="intermedia">test case</a>
 to determine whether the problem has something to do with the
-content repository data model itself.</p>
-<hr>
-<a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
-<br>
-
-Last revised: $&zwnj;Id: install.html,v 1.1.1.1.30.2 2017/06/20 07:10:17
-gustafn Exp $
+content repository data model itself.</p><hr><a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a><br>
+Last revised: $&zwnj;Id: install.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $</li>
+</ul>
+</li>
Index: openacs-4/packages/acs-content-repository/www/doc/intermedia.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/intermedia.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/intermedia.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/intermedia.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -10,39 +10,33 @@
 that Intermedia is indeed functioning properly.</p>
 <h3>Create a document table</h3>
 <p>Create a simple table to hold some test documents:</p>
-<pre>
-create table cr_test_documents ( 
+<pre>create table cr_test_documents ( 
   doc_id    integer primary key, 
   author    varchar2(30), 
   format    varchar2(30), 
   title     varchar2(256), 
   doc       blob 
-);
-</pre>
+);</pre>
 <p>Create an Intermedia preference to specify INSO filtering:</p>
-<pre>
-begin
+<pre>begin
   ctx_ddl.create_preference
   (
     preference_name =&gt; 'CONTENT_FILTER_PREF',
     object_name     =&gt; 'INSO_FILTER'
-  );
-</pre>
+  );</pre>
 <p>If this preference has already been created, this step will
 cause an error that you can ignore.</p>
 <p>Create an Intermedia index on the test table with INSO
 filtering:</p>
 <pre>
 create index cr_test_documents_idx on cr_test_documents ( doc )
   indextype is ctxsys.context
-  parameters ('FILTER content_filter_pref' );
-</pre>
+  parameters ('FILTER content_filter_pref' );</pre>
 <h3>Load test documents</h3>
 <p>You can use SQL*Loader to load some documents into the test
 table. First create a control file named
 <kbd>cr-test-docs.ctl</kbd>:</p>
-<pre>
-load data
+<pre>load data
 INFILE 'cr-test-docs.data'
 INTO TABLE cr_test_documents
 APPEND
@@ -51,16 +45,13 @@
  format,
  title,
  ext_fname FILLER CHAR(80),
- doc LOBFILE(ext_fname) TERMINATED BY EOF)
-</pre>
+ doc LOBFILE(ext_fname) TERMINATED BY EOF)</pre>
 <p>Copy any number of documents (Microsoft Word, PDF, text, HTML,
 etc.) to the file system of your database server. Create a data
 file with an entry for each document you would like to load. This
 is simply a comma-separated text file:</p>
-<pre>
-word, Simple Story,sample-docs/simple.doc,
-excel, Simple Spreadsheet,sample-docs/simple.xls
-</pre>
+<pre>word, Simple Story,sample-docs/simple.doc,
+excel, Simple Spreadsheet,sample-docs/simple.xls</pre>
 <p>Load the documents from the command line:</p>
 <pre>
 $ sqlldr userid=cms/cms control=cr-test-docs.ctl log=cr-test-docs.log
@@ -69,8 +60,7 @@
 
 (c) Copyright 1999 Oracle Corporation.  All rights reserved.
 
-Commit point reached - logical record count 2
-</pre>
+Commit point reached - logical record count 2</pre>
 <h3>Test search</h3>
 <p>Once the documents have been loaded, rebuild the index and run
 some test queries:</p>
@@ -87,5 +77,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last revised: $&zwnj;Id: intermedia.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $
+Last revised: $&zwnj;Id: intermedia.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/object-model.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/object-model.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/www/doc/object-model.adp	17 Sep 2017 08:49:17 -0000	1.4
+++ openacs-4/packages/acs-content-repository/www/doc/object-model.adp	30 Apr 2018 08:15:07 -0000	1.5
@@ -30,5 +30,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last revised: $&zwnj;Id: object-model.html,v 1.1.1.1.30.2 2017/04/15
-11:00:21 gustafn Exp $
+Last revised: $&zwnj;Id: object-model.html,v 1.3 2017/09/17 08:49:17
+gustafn Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/requirements.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/requirements.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/requirements.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -398,5 +398,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: requirements.html,v 1.2.22.1 2016/06/22
-07:40:41 gustafn Exp $
+Last Modified: $&zwnj;Id: requirements.html,v 1.3 2017/08/07 23:47:47
+gustafn Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/tutorial.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/tutorial.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/www/doc/tutorial.adp	24 Dec 2017 13:03:22 -0000	1.4
+++ openacs-4/packages/acs-content-repository/www/doc/tutorial.adp	30 Apr 2018 08:15:07 -0000	1.5
@@ -48,8 +48,7 @@
           Title
           Description
           Task Number
-        
-</pre></blockquote>
+        </pre></blockquote>
 <h3>Overview</h3>
 <p>First of all, let&#39;s get some terminology out of the way.
 Columns of a table are referred to as <em>attributes</em> in
@@ -71,8 +70,7 @@
           Title - want versions
           Description - want versions
           Task Number - do NOT want versions
-        
-</pre></blockquote>
+        </pre></blockquote>
 <h3>Define tables</h3>
 <p>You will have two tables: one with versioned attributes, and one
 without versioned attributes.</p>
@@ -99,8 +97,7 @@
             description
             varchar(4000)
             );
-          
-</pre></blockquote>
+          </pre></blockquote>
 <p>Unversioned portion:</p>
 <blockquote><pre>
             create table pm_tasks (
@@ -114,8 +111,7 @@
             task_number
             integer
             )
-          
-</pre></blockquote>
+          </pre></blockquote>
 <p>One thing you have to be careful of when creating these tables
 is that there are no columns that have the same names as any of the
 columns in the <code>cr_items</code> and <code>cr_revisions</code>
@@ -153,8 +149,7 @@
           'task_id', -- id_column
           'content_revision.revision_name'
           );
-        
-</pre></blockquote>
+        </pre></blockquote>
 <p>You then need to add in all the attributes, so that the content
 repository can do some magic things behind the scenes. The content
 repository doesn&#39;t know about what&#39;s inside of the
@@ -195,8 +190,7 @@
           null, -- default value
           'numeric' -- column_spec
           );
-        
-</pre></blockquote>
+        </pre></blockquote>
 <p>
 <strong>Side effect</strong>: once you&#39;ve created the
 content type, the content repository creates a view for you called
@@ -291,8 +285,7 @@
         null,
         null,
         'integer constraint pm_project_comp_fk references organizations'
-);
-</pre></blockquote>
+);</pre></blockquote>
 
 I have no idea of whether or not that is supposed to be legal, but
 I believe it works. Jun was the one who originally talked about
Index: openacs-4/packages/acs-content-repository/www/doc/uninstall.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/uninstall.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/uninstall.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/uninstall.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -32,5 +32,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last revised: $&zwnj;Id: uninstall.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $
+Last revised: $&zwnj;Id: uninstall.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/content.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/content.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/content.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -65,5 +65,5 @@
 </table>
 </li>
 </ul>
-<p>Last Modified: $&zwnj;Id: content.html,v 1.1.1.1.30.2 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: content.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/api/extlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/extlink.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/extlink.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/extlink.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,18 +11,17 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview" id="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>External links are references to content pages on other web
 sites. They provide the basis for maintaining a hierarchy of
 "bookmarks" that may be managed in a manner analogous to
 other content items. In particular, external links may be tagged
 with keywords and related to the site&#39;s own content items.</p>
 <p> </p>
-<h3><a name="related" id="related">Related Objects</a></h3>
-
-See also: {content_item}
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: {content_item}
 <p> </p>
-<h3><a name="api" id="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_extlink.is_extlink
@@ -115,5 +114,5 @@
 </li>
 </ul>
 
-Last Modified: $&zwnj;Id: extlink.html,v 1.1.1.1.30.2 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: extlink.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/folder.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/folder.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/folder.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/folder.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,7 +11,7 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Content folders contain related content items and allow content
 managers to group content as they see fit. Within a content folder,
 content items must have unique names since this is where they will
@@ -21,11 +21,10 @@
 from "/movies/terminator, "/movies/terminator2"
 respectively).</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: Content Item
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: Content Item
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_folder.get_index_page
@@ -366,5 +365,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: folder.html,v 1.2.18.2 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: folder.html,v 1.3 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/item.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-content-repository/www/doc/api/item.adp	11 Apr 2018 21:35:06 -0000	1.5
+++ openacs-4/packages/acs-content-repository/www/doc/api/item.adp	30 Apr 2018 08:15:07 -0000	1.6
@@ -11,7 +11,7 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Content items store the overview of the content published on a
 website. The actual content is stored in content revisions. It is
 implemented this way so that there can be multiple versions of the
@@ -22,11 +22,10 @@
 exist at least one content revision pointing to this item with the
 actual review content.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: content_revision, content_folder
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: content_revision, content_folder
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_item.get_content_type
@@ -742,5 +741,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: item.html,v 1.3.18.3 2017/04/21 14:53:08
-gustafn Exp $
+Last Modified: $&zwnj;Id: item.html,v 1.6 2018/04/11 21:35:06 hectorr Exp
+$
Index: openacs-4/packages/acs-content-repository/www/doc/api/keyword.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/keyword.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/keyword.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/keyword.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,16 +11,15 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Keyword cassify a content_item. For example: If you have some
 press releases about dogs. You might want assigning the Keyword dog
 to every single content_item.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: content_item
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: content_item
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font>
@@ -314,5 +313,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: keyword.html,v 1.1.1.1.30.3 2017/04/21 14:53:08
-gustafn Exp $
+Last Modified: $&zwnj;Id: keyword.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/permission.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/permission.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/permission.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/permission.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,16 +11,15 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Permissions can be set to allow certain users certain things. -
 They can be compared with the Unix filesystem permission: read,
 write ...</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: {content_item }
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: {content_item }
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font>
@@ -266,5 +265,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: permission.html,v 1.1.1.1.30.3 2017/04/21
-14:53:08 gustafn Exp $
+Last Modified: $&zwnj;Id: permission.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/revision.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/revision.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/revision.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,19 +11,18 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Content revisions contain the data for content items. There is a
 many to one relationship between content revisions and content
 items. There is at most one "live" revision for every
 content item though. For example, there may be 5 revisions of the
 review for the movie "Terminator," yet only one of these
 may be live on the website at a given time.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: {content_item }
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: {content_item }
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_revision.copy
@@ -244,5 +243,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: revision.html,v 1.1.1.1.30.2 2016/06/22
-07:40:41 gustafn Exp $
+Last Modified: $&zwnj;Id: revision.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/symlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/symlink.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/symlink.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/symlink.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,15 +11,14 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Symlinks are pointers to items within the content repository.
 They are simply used to create links between content items.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: content_item, content_folder
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: content_item, content_folder
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_symlink.is_symlink
@@ -171,5 +170,5 @@
 </ul>
 <p> </p>
 
-Last Modified: $&zwnj;Id: symlink.html,v 1.2.2.2 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: symlink.html,v 1.3 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/template.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/api/template.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/api/template.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -11,18 +11,17 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>Templates are a special class of text objects that are used for
 specifying the layout of a content item. They may be mapped to
 content types, meaning that every item of that type will display
 using that template unless a specific item overrides the default by
 mapping to a template itself.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: content_item, content_folder
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: content_item, content_folder
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_template.get_path
@@ -145,5 +144,5 @@
 </li>
 </ul>
 
-Last Modified: $&zwnj;Id: template.html,v 1.1.1.1.30.2 2016/06/22
-07:40:41 gustafn Exp $
+Last Modified: $&zwnj;Id: template.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/api/type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/type.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/www/doc/api/type.adp	27 Mar 2018 11:17:59 -0000	1.4
+++ openacs-4/packages/acs-content-repository/www/doc/api/type.adp	30 Apr 2018 08:15:07 -0000	1.5
@@ -11,16 +11,15 @@
 <li><a href="#overview">Overview</a></li><li><a href="#related">Related Objects</a></li><li><a href="#api">API</a></li>
 </ul>
 <p> </p>
-<h3><a name="overview">Overview</a></h3>
+<a name="overview" id="overview"><h3>Overview</h3></a>
 <p>This package is used to manipulate content types and attributes
 Content types represent the different kind of content displayed on
 a website. All content items should subclass a content type.</p>
 <p> </p>
-<h3><a name="related">Related Objects</a></h3>
-
-See also: {Content Item }
+<a name="related" id="related"><h3>Related Objects</h3></a>
+ See also: {Content Item }
 <p> </p>
-<h3><a name="api">API</a></h3>
+<a name="api" id="api"><h3>API</h3></a>
 <ul>
 <li>
 <font size="+1">Function:</font> content_type.create_attribute
@@ -171,8 +170,8 @@
 type, including the inherited attributes. The view is named
 "</p>
 X" Called by create_attribute and create_type.
-<table name="" for="" content_type="">
-<tr><td></td></tr><tr>
+<table name="" for="" content_type=""></table><table cellpadding="3" cellspacing="0" border="0">
+<tr>
 <th align="left">Author:</th><td align="left">Karl Goldstein</td>
 </tr><tr><th align="left" colspan="2">Parameters:</th></tr><tr><td></td></tr><tr><td align="left" colspan="2"><blockquote><table border="0" cellpadding="0" cellspacing="1"><tr>
 <th align="right" valign="top">content_type:</th><td>  </td><td>The type for which the view is to be created.</td>
@@ -440,5 +439,5 @@
 </li>
 </ul>
 
-Last Modified: $&zwnj;Id: type.html,v 1.1.1.1.30.2 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: type.html,v 1.3 2018/03/27 11:17:59 hectorr Exp
+$
Index: openacs-4/packages/acs-content-repository/www/doc/guide/convert.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/convert.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/convert.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/convert.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -52,5 +52,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: convert.html,v 1.1.1.1.30.1 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: convert.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/guide/file-system.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/file-system.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/file-system.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/file-system.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -94,8 +94,7 @@
   );
   -- Store v_my_content_root in a safe place
 end;
-/ 
-</pre>
+/ </pre>
 <p>The important point is that you have to pass in <kbd>0</kbd> for
 the <kbd>parent_id</kbd>. This <kbd>parent_id</kbd> is special in
 that it indicates folders with no parent.</p>
@@ -117,5 +116,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: file-system.html,v 1.1.1.1.30.2 2017/04/21
-14:53:08 gustafn Exp $
+Last Modified: $&zwnj;Id: file-system.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/guide/items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/items.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/items.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/items.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -13,34 +13,29 @@
 <kbd>content_item.new</kbd> function. A name is the only parameter
 required to create an item:</p>
 <pre>
-item_id := content_item.new( name =&gt; 'my_item' );
-</pre>
+item_id := content_item.new( name =&gt; 'my_item' );</pre>
 <p>The name represents the tail of the URL for that content item.
 In most cases you will want to create items in a particular context
 with the repository hierarchy:</p>
-<pre>
-item_id := content_item.new(
+<pre>item_id := content_item.new(
    name      =&gt; 'my_item', 
    parent_id =&gt; :parent_id
-);
-</pre>
+);</pre>
 <p>The parent ID must be another content item, or a subclass of
 content item such as a folder.</p>
 <p>The <kbd>content_item.new</kbd> function accepts a number of
 other optional parameters. The standard <kbd>creation_date</kbd>,
 <kbd>creation_user</kbd> and <kbd>creation_ip</kbd> should be
 specified for auditing purposes. You can also create the initial
 revision and publish text items in a single step:</p>
-<pre>
-item_id := content_item.new(
+<pre>item_id := content_item.new(
    name      =&gt; 'my_item', 
    parent_id =&gt; :parent_id,
    title     =&gt; 'My Item',
    text      =&gt; 'Once upon a time Goldilocks crossed the street.  
                  Here comes a car...uh oh!  The End',
    is_live   =&gt; 't'
-);
-</pre>
+);</pre>
 <p>If either the title or text are not null, the function will
 create the first revision of the item. It will also mark the item
 as live if the <kbd>is_live</kbd> parameter is true. The
@@ -51,9 +46,8 @@
 published by calling the <kbd>content_item.set_live_revision</kbd>
 procedure, which takes as input a <kbd>revision_id</kbd>:</p>
 <pre>
-content_item.set_live_revision( revision_id =&gt; :revision_id );
-</pre>
+content_item.set_live_revision( revision_id =&gt; :revision_id );</pre>
 <hr>
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
-<p>Last Modified: $&zwnj;Id: items.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: items.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/keywords.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/keywords.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/keywords.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/keywords.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -37,8 +37,7 @@
    =&gt; 'content_keyword', pretty_name =&gt; 'Content Keyword',
    pretty_plural =&gt; 'Content Keywords', table_name =&gt; 'cr_keywords',
    id_column =&gt; 'keyword_id', name_method =&gt; 'acs_object.default_name'
-   ); 
-</pre>
+   ); </pre>
 
 In addition, the <kbd>cr_keywords</kbd>
  table (see
Index: openacs-4/packages/acs-content-repository/www/doc/guide/object-relationships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/object-relationships.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/object-relationships.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/object-relationships.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -111,5 +111,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last modified: <kbd>$&zwnj;Id: object-relationships.html,v 1.1.1.1.30.3
-2017/04/21 14:53:08 gustafn Exp $</kbd>
+Last modified: <kbd>$&zwnj;Id: object-relationships.html,v 1.2 2017/08/07
+23:47:47 gustafn Exp $</kbd>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -122,5 +122,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: publish.html,v 1.4.4.2 2016/06/22 07:40:41
-gustafn Exp $
+Last Modified: $&zwnj;Id: publish.html,v 1.5 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/guide/revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/revisions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/revisions.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/revisions.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -25,14 +25,12 @@
 <kbd>content_revision.new</kbd> function. The only parameters
 required to create the revision are a title, a content item ID, and
 some text:</p>
-<pre>
-revision_id := content_revision.new( 
+<pre>revision_id := content_revision.new( 
     title   =&gt; 'A Revision',
     item_id =&gt; :item_id,
     text    =&gt; 'Once upon a time Goldilocks crossed the street.
                 Here comes a car...uh oh!  The End'
-);
-</pre>
+);</pre>
 <p>The <kbd>item_id</kbd> parameter is ID of the content item with
 which the revision is associated.</p>
 <p>The <kbd>content_item.new</kbd> function accepts a number of
@@ -43,8 +41,7 @@
 Instead of the <kbd>text</kbd> parameter, this function can be
 called with a <kbd>data</kbd> parameter, in which <kbd>data</kbd>
 is a blob:</p>
-<pre>
-revision_id := content_revision.new(
+<pre>revision_id := content_revision.new(
     title         =&gt; 'A Revision',
     description   =&gt; 'A Description of a revision',
     mime_type     =&gt; 'text/html',
@@ -54,8 +51,7 @@
     creation_date =&gt; sysdate,
     creation_user =&gt; :user_id,
     creation_ip   =&gt; :ip_address
-);
-</pre>
+);</pre>
 <h3>Insert additional attributes</h3>
 <p>Given that there is no way (AFAIK) to pass variable parameters
 to a PL/SQL function, there is no way to make
@@ -82,43 +78,35 @@
 <kbd>content_type.create_attribute</kbd>. The trigger makes it
 possible to create complete revisions with a single insert
 statement:</p>
-<pre>
-insert into cr_revisionsx (
+<pre>insert into cr_revisionsx (
   item_id, revision_id, title
 ) values (
   18, 19, 'All About Revisions'
-);
-</pre>
+);</pre>
 <p>Because a special trigger is generated for each content type
 that includes insert statements for all inherited tables, revisions
 with extended attributes may be created in the same fashion:</p>
-<pre>
-insert into cr_imagesx (
+<pre>insert into cr_imagesx (
   item_id, revision_id, title, height, width
 ) values (
   18, 19, 'A Nice Drawing', 300, 400
-);
-</pre>
+);</pre>
 <h3>Inserting content via file or text upload</h3>
 <h3>Selecting a live revision</h3>
 <p>The live revision of a content item can be obtained with the
 <kbd>content_item.get_live_revision</kbd> function:</p>
-<pre>
-live_revision_id := content_item.get_live_revision(
+<pre>live_revision_id := content_item.get_live_revision(
     item_id =&gt; :item_id
-);
-</pre>
+);</pre>
 <p>The <kbd>item_id</kbd> identifies the content item with which
 the revision is associated.</p>
 <p>Likewise, the most recent revision of a content item can be
 obtained with the <kbd>content_item.get_latest_revision</kbd>
 function:</p>
-<pre>
-latest_revision_id := content_item.get_latest_revision(
+<pre>latest_revision_id := content_item.get_latest_revision(
     item_id =&gt; :item_id
-);
-</pre>
+);</pre>
 <hr>
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
-<p>Last Modified: $&zwnj;Id: revisions.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: revisions.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/search.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/search.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/search.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -113,5 +113,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: $&zwnj;Id: search.html,v 1.1.1.1.30.2 2017/04/21 14:53:08
-gustafn Exp $
+Last Modified: $&zwnj;Id: search.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $
Index: openacs-4/packages/acs-content-repository/www/doc/guide/storage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/storage.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/storage.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/storage.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -18,21 +18,18 @@
 <p>Most types of content require additional attributes. For a
 photo, we probably also want to store the pixel width and height at
 the very least:</p>
-<pre>
-  create table images (
+<pre>  create table images (
     image_id       integer
                    constraint images_image_id_fk
                    references cr_revisions
                    constraint images_pk
                    primary key,
     width          integer,
     height         integer
-  );
-</pre>
+  );</pre>
 <p>Content types are nothing more than standard ACS Objects that
 inherit from <kbd>content_revision</kbd>:</p>
-<pre>
-begin
+<pre>begin
 
  acs_object_type.create_type (
    supertype =&gt; 'content_revision',
@@ -62,8 +59,7 @@
 
 end;
 /
-show errors
-</pre>
+show errors</pre>
 <p>Note that content types always extend
 <kbd>content_revision</kbd>, rather than <kbd>content_item</kbd>.
 This is because we want to store multiple revisions of both the
@@ -79,8 +75,7 @@
 <p>In the simple case where each user is allowed a single portrait,
 we can simply define a relationship between user and image as ACS
 Objects:</p>
-<pre>
-  acs_rel_type.create_role('user');
+<pre>  acs_rel_type.create_role('user');
   acs_rel_type.create_role('portrait');
 
   acs_rel_type.create_type( rel_type =&gt; 'user_portrait_rel',
@@ -93,8 +88,7 @@
      object_type_two =&gt; 'content_item',
      min_n_rels_two =&gt; 0,
      max_n_rels_two =&gt; 1
-  );
-</pre>
+  );</pre>
 <p>Note that the <kbd>user</kbd> object is related to a
 <kbd>content_item</kbd> object rather than an <kbd>image</kbd>
 object directly. Each <kbd>image</kbd> object represents only a
@@ -104,21 +98,17 @@
 <p>Now we have defined both a content type and relationship type,
 we can start storing portraits. The DML for processing a new
 portrait upload form would look like this:</p>
-<pre>
-  begin transaction
+<pre>  begin transaction
     :item_id := content_item.new(:name, :item_id, sysdate, NULL,                           '[ns_conn peeraddr]'); 
     # maybe have content_revision return the LOB locator so that it can
     # be used directly with blob_dml_file
     :revision_id := content_revision.new(:title, :description, $publish_date,                               :mime_type, NULL, :text, 'content_revision', 
                                :item_id, :revision_id);
     blob_dml_file update cr_revisions set content = empty_blob() ...
-    :rel_id := acs_rel.new(...)
-</pre>
+    :rel_id := acs_rel.new(...)</pre>
 <h3>Retrieve Objects</h3>
-<pre>
-  ns_ora write_blob ...
-</pre>
+<pre>  ns_ora write_blob ...</pre>
 <hr>
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
-<p>Last Modified: $&zwnj;Id: storage.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: storage.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/template.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/template.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/template.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -21,12 +21,10 @@
 <p>The content repository handle templates as a special class of
 text object. The interface for handling templates builds on that of
 simple content items:</p>
-<pre>
-template_id := content_template.new(
+<pre>template_id := content_template.new(
     name          =&gt; 'image_template',
     parent_id     =&gt; :parent_id
-);
-</pre>
+);</pre>
 <p>The name represents the tail of the location for that content
 template. The parent ID must be another content item, or a subclass
 of content item such as a folder.</p>
@@ -52,14 +50,12 @@
 <h3>Associating templates with content types</h3>
 <p>You use the <kbd>content_type.register_template</kbd> procedure
 to associate a template with a particular content type:</p>
-<pre>
-content_type.register_template(
+<pre>content_type.register_template(
   content_type =&gt; 'content_revision',
   template_id  =&gt; :template_id,
   use_context  =&gt; 'public',
   is_default   =&gt; 't'
-);
-</pre>
+);</pre>
 <p>The <kbd>use_context</kbd> is a simple keyword that specifies
 the situation in which the template is appropriate. One general
 context, <kbd>public</kbd>, is loaded when the content repository
@@ -75,23 +71,19 @@
 template per pair.</p>
 <p>To make a template the default template for a content
 type/context pair:</p>
-<pre>
-content_type.set_default_template(
+<pre>content_type.set_default_template(
     content_type =&gt; 'content_revision',
     template_id  =&gt; :template_id,
     use_context  =&gt; 'public'
-);
-</pre>
+);</pre>
 <h3>Associating templates with content items</h3>
 <p>Individual items may also be associated with templates using the
 <kbd>content_item.register_template</kbd> procedure:</p>
-<pre>
-content_item.register_template(
+<pre>content_item.register_template(
   item_id     =&gt; :item_id,
   template_id =&gt; :template_id,
   use_context =&gt; 'intranet'
-);
-</pre>
+);</pre>
 <p>Unlike the case with content types, only one template may be
 registered with a content item for a particular context.</p>
 <p>The content management system uses this functionality to allow
@@ -105,40 +97,34 @@
 the <kbd>content_item.get_template</kbd> function to determine the
 proper template to use for rendering a page in any particular
 context:</p>
-<pre>
-template_id := content_item.get_template(
+<pre>template_id := content_item.get_template(
     item_id     =&gt; :item_id, 
     use_context =&gt; 'public'
 );
 
 template_path := content_template.get_path(
     template_id =&gt; :template_id
-);
-</pre>
+);</pre>
 <p>In the case that no template is registered to given item/context
 pair, <kbd>content_item.get_template</kbd> will return the default
 template (if it exists) for the related content type/context
 pair.</p>
 <h3>Unregistering templates</h3>
 <p>The procedure for disassociating templates with content types is
 as follows:</p>
-<pre>
-content_type.unregister_template(
+<pre>content_type.unregister_template(
     content_type =&gt; 'content_revision',
     template_id  =&gt; :template_id,
     use_context  =&gt; 'intranet'
-);
-</pre>
+);</pre>
 <p>The corresponding procedure to disassociate templates with
 content items is:</p>
-<pre>
-content_item.unregister_template(
+<pre>content_item.unregister_template(
     item_id     =&gt; :item_id,
     template_id =&gt; :template_id,
     use_context =&gt; 'admin'
-);
-</pre>
+);</pre>
 <hr>
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
-<p>Last Modified: $&zwnj;Id: template.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: template.html,v 1.2 2017/08/07 23:47:47
+gustafn Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/types.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/guide/types.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/guide/types.adp	30 Apr 2018 08:15:07 -0000	1.4
@@ -43,16 +43,14 @@
 object ID (specific storage). To ensure efficient access to
 attributes, the content repository API requires you to use specific
 storage. Your table should have the form:</p>
-<pre>
-create table cr_<em>content_type</em> (
+<pre>create table cr_<em>content_type</em> (
     <em>content_type</em>_id       integer
                           constraint cr_<em>content_type</em>_id_fk
                           references cr_revisions
                           constraint cr_<em>content_type</em>_pk
                           primary key,
     <em>attributes</em>...
-);
-</pre>
+);</pre>
 <p>Note that your extended attribute table must reference the
 <kbd>cr_revisions</kbd> table, <em>not</em><kbd>cr_items</kbd>. As
 mentioned above, this allows you to maintain multiple revisions of
@@ -61,8 +59,7 @@
 <h3>Use the Content Type API to create the content type</h3>
 <p>To define a content type, you should write an SQL script to
 create the content type and then add attributes to it:</p>
-<pre>
-declare
+<pre>declare
  attr_id        acs_attributes.attribute_id%TYPE;
 begin
 
@@ -113,5 +110,5 @@
 details.</p>
 <hr>
 <a href="mailto:templating\@arsdigita.com">templating\@arsdigita.com</a>
-<p>Last Modified: $&zwnj;Id: types.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: types.html,v 1.2 2017/08/07 23:47:47 gustafn
+Exp $</p>
Index: openacs-4/packages/acs-content-repository/www/doc/guide/workflow.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/workflow.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/www/doc/guide/workflow.adp	27 Mar 2018 11:17:59 -0000	1.4
+++ openacs-4/packages/acs-content-repository/www/doc/guide/workflow.adp	30 Apr 2018 08:15:07 -0000	1.5
@@ -190,5 +190,5 @@
 <a href="mailto:karlg\@arsdigita.com">karlg\@arsdigita.com</a>
 <br>
 
-Last Modified: <kbd>$&zwnj;Id: workflow.html,v 1.1.1.1.30.1 2016/06/22
-07:40:41 gustafn Exp $</kbd>
+Last Modified: <kbd>$&zwnj;Id: workflow.html,v 1.3 2018/03/27 11:17:59
+hectorr Exp $</kbd>
Index: openacs-4/packages/acs-developer-support/www/doc/developer-support-example.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/doc/developer-support-example.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/www/doc/developer-support-example.adp	7 Aug 2017 23:47:56 -0000	1.2
+++ openacs-4/packages/acs-developer-support/www/doc/developer-support-example.adp	30 Apr 2018 08:17:32 -0000	1.3
@@ -81,23 +81,19 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   13 ms  </td><td bgcolor="#FFFFFF">dml nsdb0 (main pool)
-<blockquote><pre>
-update session_statistics 
+<blockquote><pre>update session_statistics 
 set session_count = session_count + 1, 
 repeat_count = repeat_count + 1 
-where entry_date = trunc(sysdate)
-</pre></blockquote>
+where entry_date = trunc(sysdate)</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   124 ms  </td><td bgcolor="#DDDDDD">dml nsdb0 (main pool)
-<blockquote><pre>
-update users
+<blockquote><pre>update users
 set last_visit = sysdate,
     second_to_last_visit = last_visit,
     n_sessions = n_sessions + 1
-where user_id = 1472
-</pre></blockquote>
+where user_id = 1472</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
@@ -108,13 +104,11 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   6 ms  </td><td bgcolor="#FFFFFF">1row nsdb1 (main pool)
-<blockquote><pre>
-select decode(count(1),0,0,1) 
+<blockquote><pre>select decode(count(1),0,0,1) 
                from user_group_map 
               where user_id=1472 
                 and (group_id=6
-                     or group_id=1181)
-</pre></blockquote>
+                     or group_id=1181)</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
@@ -125,68 +119,57 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   10 ms  </td><td bgcolor="#DDDDDD">0or1row nsdb2 (main pool)
-<blockquote><pre>
-select group_id 
+<blockquote><pre>select group_id 
 from administration_info 
 where module = 'intranet' 
-and submodule is null
-</pre></blockquote>
+and submodule is null</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   13 ms  </td><td bgcolor="#FFFFFF">1row nsdb2 (main pool)
 <blockquote><pre>
-select count(*) from user_group_map where user_id =1472 and group_id = 2
-</pre></blockquote>
+select count(*) from user_group_map where user_id =1472 and group_id = 2</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   9 ms  </td><td bgcolor="#DDDDDD">0or1row nsdb2 (main pool)
-<blockquote><pre>
-select group_id 
+<blockquote><pre>select group_id 
 from administration_info 
 where module = 'site_wide' 
-and submodule is null
-</pre></blockquote>
+and submodule is null</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   12 ms  </td><td bgcolor="#FFFFFF">1row nsdb2 (main pool)
 <blockquote><pre>
-select multi_role_p from user_groups where group_id = 1
-</pre></blockquote>
+select multi_role_p from user_groups where group_id = 1</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   17 ms  </td><td bgcolor="#DDDDDD">1row nsdb2 (main pool)
 <blockquote><pre>
-select decode(count(*), 0, 0, 1) from user_group_map where user_id = 1472 and group_id = 1 and role in ('administrator', 'all')
-</pre></blockquote>
+select decode(count(*), 0, 0, 1) from user_group_map where user_id = 1472 and group_id = 1 and role in ('administrator', 'all')</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   18 ms  </td><td bgcolor="#FFFFFF">0or1row nsdb2 (main pool)
-<blockquote><pre>
-select first_names || ' ' || last_name as full_name, 
+<blockquote><pre>select first_names || ' ' || last_name as full_name, 
                 decode(portrait_upload_date,NULL,0,1) as portrait_exists_p
            from users 
-          where user_id=1472
-</pre></blockquote>
+          where user_id=1472</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   1225 ms  </td><td bgcolor="#DDDDDD">select nsdb2 (main pool)
-<blockquote><pre>
-select ug.group_name, ug.group_id
+<blockquote><pre>select ug.group_name, ug.group_id
            from user_groups ug, im_projects p
           where ad_group_member_p ( 1472, ug.group_id ) = 't'
             and ug.group_id=p.group_id
             and p.project_status_id in (select project_status_id
                                           from im_project_status 
                                          where project_status='Open' 
                                             or project_status='Future' )
-          order by lower(group_name)
-</pre></blockquote>
+          order by lower(group_name)</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
@@ -209,62 +192,51 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   1578 ms  </td><td bgcolor="#FFFFFF">select nsdb2 (main pool)
-<blockquote><pre>
-select ug.group_name, ug.group_id
+<blockquote><pre>select ug.group_name, ug.group_id
            from user_groups ug, im_customers c
           where ad_group_member_p ( 1472, ug.group_id ) = 't'
             and ug.group_id=c.group_id
             and c.customer_status_id in (select customer_status_id 
                                           from im_customer_status 
                                          where customer_status in ('Current','Inquiries','Creating Bid','Bid out'))
-          order by lower(group_name)
-</pre></blockquote>
+          order by lower(group_name)</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   2 ms  </td><td bgcolor="#DDDDDD">getrow nsdb2 t54 (main pool)</td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   30 ms  </td><td bgcolor="#FFFFFF">1row nsdb2 (main pool)
-<blockquote><pre>
-select sum(hours) from im_hours where user_id=1472
+<blockquote><pre>select sum(hours) from im_hours where user_id=1472
     and on_which_table='im_projects'
-    and day &gt;= sysdate - 7
-</pre></blockquote>
+    and day &gt;= sysdate - 7</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   14 ms  </td><td bgcolor="#DDDDDD">1row nsdb2 (main pool)
-<blockquote><pre>
-select decode(count(1),0,0,1) 
+<blockquote><pre>select decode(count(1),0,0,1) 
            from user_groups ug
           where ad_group_member_p ( 1472, ug.group_id ) = 't'
-            and ug.short_name='Business'
-</pre></blockquote>
+            and ug.short_name='Business'</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   15 ms  </td><td bgcolor="#FFFFFF">1row nsdb2 (main pool)
-<blockquote><pre>
-select decode(count(1),0,0,1) 
+<blockquote><pre>select decode(count(1),0,0,1) 
            from user_groups ug
           where ad_group_member_p ( 1472, ug.group_id ) = 't'
-            and ug.short_name='Finance'
-</pre></blockquote>
+            and ug.short_name='Finance'</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   5 ms  </td><td bgcolor="#DDDDDD">1row nsdb2 (main pool)
-<blockquote><pre>
-select sysdate - 30 from dual
-</pre></blockquote>
+<blockquote><pre>select sysdate - 30 from dual</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   4 ms  </td><td bgcolor="#FFFFFF">select nsdb2 (main pool)
 <blockquote><pre>
-select newsgroup_id from newsgroups where scope = 'all_users' or scope = 'registered_users' or (scope = 'group' and group_id = 6)
-</pre></blockquote>
+select newsgroup_id from newsgroups where scope = 'all_users' or scope = 'registered_users' or (scope = 'group' and group_id = 6)</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
@@ -281,8 +253,7 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   16 ms  </td><td bgcolor="#DDDDDD">select nsdb2 (main pool)
-<blockquote><pre>
-select news.title, news.news_item_id, news.approval_state, 
+<blockquote><pre>select news.title, news.news_item_id, news.approval_state, 
  expired_p(news.expiration_date) as expired_p, 
  to_char(news.release_date,'Mon DD, YYYY') as release_date_pretty
 from news_items news, users ut
@@ -291,8 +262,7 @@
 and news.approval_state = 'approved'
 and release_date &lt; sysdate
 and news.creation_user = ut.user_id
-order by release_date desc, creation_date desc
-</pre></blockquote>
+order by release_date desc, creation_date desc</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
@@ -312,8 +282,7 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   137 ms  </td><td bgcolor="#DDDDDD">select nsdb2 (main pool)
-<blockquote><pre>
-select g.group_name, g.group_id
+<blockquote><pre>select g.group_name, g.group_id
                from user_groups g, im_projects p, im_employees_active u, im_project_types
               where p.project_lead_id = u.user_id
                 and p.project_type_id = im_project_types.project_type_id
@@ -338,8 +307,7 @@
                                                    from survsimp_surveys
                                                   where short_name in ('project_report'))
                                   and submission_date &gt; sysdate - 7
-                                  and group_id=p.group_id)) )
-</pre></blockquote>
+                                  and group_id=p.group_id)) )</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
@@ -350,13 +318,11 @@
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   20 ms  </td><td bgcolor="#FFFFFF">select nsdb2 (main pool)
-<blockquote><pre>
-select distinct u.user_id
+<blockquote><pre>select distinct u.user_id
            from users_active u, user_group_map ugm
           where u.user_id = ugm.user_id
             and ugm.group_id = 6
-            and u.portrait is not null
-</pre></blockquote>
+            and u.portrait is not null</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
@@ -516,18 +482,15 @@
                 and ug.group_id = ugm.group_id
                 and ug.parent_group_id = 5
                 and u.user_id = 1678
-                and rownum &lt; 2
-</pre></blockquote>
+                and rownum &lt; 2</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
   12 ms  </td><td bgcolor="#DDDDDD">select nsdb2 (main pool)
-<blockquote><pre>
-select ug.group_id, ug.group_name, ai.url as ai_url
+<blockquote><pre>select ug.group_id, ug.group_name, ai.url as ai_url
 from  user_groups ug, administration_info ai
 where ug.group_id = ai.group_id
-and ad_group_member_p ( 1472, ug.group_id ) = 't'
-</pre></blockquote>
+and ad_group_member_p ( 1472, ug.group_id ) = 't'</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
@@ -545,8 +508,7 @@
 <td align="right" bgcolor="#FFFFFF" nowrap="nowrap">
   11 ms  </td><td bgcolor="#FFFFFF">1row nsdb3 (log pool)
 <blockquote><pre>
-select ad_group_member_p(1472, system_administrator_group_id) from dual
-</pre></blockquote>
+select ad_group_member_p(1472, system_administrator_group_id) from dual</pre></blockquote>
 </td>
 </tr><tr valign="top">
 <td align="right" bgcolor="#DDDDDD" nowrap="nowrap">
@@ -556,7 +518,6 @@
 </tr>
 </table></blockquote>
 <hr>
-<a href="mailto:webmaster\@dev.arsdigita.com"></a>
-<address>webmaster\@dev.arsdigita.com</address>
-<p>Last Modified: $&zwnj;Id: developer-support-example.html,v
-1.1.1.1.28.1 2015/08/25 17:58:44 gustafn Exp $</p>
+<a href="mailto:webmaster\@dev.arsdigita.com"><address>webmaster\@dev.arsdigita.com</address></a>
+<p>Last Modified: $&zwnj;Id: developer-support-example.html,v 1.2
+2017/08/07 23:47:56 gustafn Exp $</p>
Index: openacs-4/packages/acs-developer-support/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/doc/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-developer-support/www/doc/index.adp	7 Aug 2017 23:47:56 -0000	1.3
+++ openacs-4/packages/acs-developer-support/www/doc/index.adp	30 Apr 2018 08:17:33 -0000	1.4
@@ -50,9 +50,7 @@
 grokking the error log to see what&#39;s wrong with your page? Use
 the <tt>ds_comment</tt>
  routine instead:
-<blockquote><pre>
-ds_comment "Foo is $foo"
-</pre></blockquote>
+<blockquote><pre>ds_comment "Foo is $foo"</pre></blockquote>
 
 Your comment will show up at the bottom of the page, beneath the
 <em>Developer Information</em>
@@ -78,5 +76,5 @@
 <p>Please file bugs in the <a href="http://openacs.org/bugtracker/openacs/">Bug Tracker</a>.</p>
 <hr>
 <address><a href="mailto:jsalz\@mit.edu">jsalz\@mit.edu</a></address>
-<p>Last Modified: $&zwnj;Id: index.html,v 1.1.1.1.28.2 2015/08/25
-17:58:45 gustafn Exp $</p>
+<p>Last Modified: $&zwnj;Id: index.html,v 1.2 2017/08/07 23:47:56 gustafn
+Exp $</p>
Index: openacs-4/packages/acs-lang/www/doc/i18n-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/doc/i18n-design.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/doc/i18n-design.adp	18 Apr 2018 08:07:33 -0000	1.6
+++ openacs-4/packages/acs-lang/www/doc/i18n-design.adp	30 Apr 2018 08:19:34 -0000	1.7
@@ -270,12 +270,12 @@
 legacy tools that author in their "native" character
 sets, such as ShiftJIS in Japan, or BIG5 in China.</p>
 <p>So we make the convention that the template file is authored in
-its <em>effective locale</em>'s character set. For
-multilingual templates, we will load the template in the site
-default character set as specified by the AOLserver
-<kbd>OutputCharset</kbd> initializatoin parameter. For now, we will
-say that authoring generic multilingual adp files can and should be
-done in ASCII. Eventually we can switch to using UTF8.</p>
+its <em>effective locale</em>'s character set. For multilingual
+templates, we will load the template in the site default character
+set as specified by the AOLserver <kbd>OutputCharset</kbd>
+initializatoin parameter. For now, we will say that authoring
+generic multilingual adp files can and should be done in ASCII.
+Eventually we can switch to using UTF8.</p>
 <p>A character set corresponding to a locale can be found using the
 <kbd>[<strong>ad_locale charset</strong><em>$locale</em>]</kbd>
 command. The templating system should call this right after it
@@ -513,22 +513,19 @@
 (i.e. do nothing special):
 <pre>
     &lt;trn&gt;Hello&lt;/trn&gt;
-    
-</pre>
+    </pre>
 Example 2: Assign the key key <em>hello</em> to the text string
 <em>Hello</em> and display the translated string in the user&#39;s
 preferred language:
 <pre>
     &lt;trn key="hello"&gt;Hello&lt;/trn&gt;
-    
-</pre>
+    </pre>
 Example 3: Specify that <em>Bonjour</em> needs to be registered as
 the French translation for the key <em>hello</em> (in addition to
 displaying the translation in the user&#39;s preferred language):
 <pre>
     &lt;trn key="hello" lang="fr"&gt;Bonjour&lt;/trn&gt;
-    
-</pre>
+    </pre>
 Example 4: Register the string and display it in the preferred
 language of the current user. Note that the possible values for the
 <code>type</code> parameter are determined by what has been
@@ -539,12 +536,10 @@
 current web page.
 <pre>
     &lt;trn key="hello" type="user"&gt;Hello&lt;/trn&gt;
-    
-</pre><p>Example 5: Translates the string once at template compile time,
+    </pre><p>Example 5: Translates the string once at template compile time,
 using the effective local of the page.</p><pre>
     &lt;trn key="hello" static&gt;Hello&lt;/trn&gt;
-    
-</pre>
+    </pre>
 </blockquote>
 <h3>VII. Data Model Discussion</h3>
 <h4>Internationalizing the Data Models</h4>
Index: openacs-4/packages/acs-lang/www/doc/i18n-requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/doc/i18n-requirements.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/doc/i18n-requirements.adp	29 Dec 2017 10:51:45 -0000	1.4
+++ openacs-4/packages/acs-lang/www/doc/i18n-requirements.adp	30 Apr 2018 08:19:34 -0000	1.5
@@ -119,10 +119,10 @@
 documentation for this software is linked off of</em></li><li><em>Design document</em></li><li><em>Developer&#39;s guide</em></li><li><em>User&#39;s guide</em></li><li>
 <em>Other-cool-system-related-to-this-one document</em><br><a href="http://www.li18nux.net/">LI18NUX 2000 Globalization
 Specification: http://www.li18nux.net/</a><p><a href="">Mozilla i18N Guidelines:
-http://www.mozilla.org/docs/refList/i18n/l12yGuidelines.html</a></p><p><a href="https://en.wikipedia.org/wiki/ISO_639">ISO
-639:1988 Code for the representation of names of languages</a></p><p><a href="https://en.wikipedia.org/wiki/ISO_3166-1">ISO 3166-1:1997 Codes
-for the representation of names of countries and their subdivisions
-Part 1: Country codes</a></p><p><a href="">IANA Registry of Character Sets</a></p>
+http://www.mozilla.org/docs/refList/i18n/l12yGuidelines.html</a></p><p><a href="https://en.wikipedia.org/wiki/ISO_639">ISO 639:1988
+Code for the representation of names of languages</a></p><p><a href="https://en.wikipedia.org/wiki/ISO_3166-1">ISO
+3166-1:1997 Codes for the representation of names of countries and
+their subdivisions Part 1: Country codes</a></p><p><a href="">IANA Registry of Character Sets</a></p>
 </li><li><em>Test plan</em></li><li><em>Competitive system(s)</em></li>
 </ul>
 <h3>VI Requirements</h3>