Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	7 Aug 2017 23:47:47 -0000	1.7
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	15 Aug 2018 16:24:28 -0000	1.8
@@ -1,12 +1,9 @@
-# packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl
-
 ad_library {
     
     Callback procs for acs-content-repository
     
     @author Malte Sussdorff (sussdorff@sussdorff.de)
     @creation-date 2005-06-15
-    @arch-tag: d9aec4df-102d-4b0d-8d0e-3dc470dbe783
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	25 Jul 2018 19:00:06 -0000	1.11
+++ openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	15 Aug 2018 16:24:28 -0000	1.12
@@ -1,12 +1,9 @@
-# packages/acs-content-repository/tcl/content-extlink-procs.tcl
-
 ad_library {
 
     Procedures for content_extlink
 
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: f8f62c6c-bf3b-46d9-8e1e-fa5e60ba1c05
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl	27 Oct 2014 16:39:11 -0000	1.5
+++ openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl	15 Aug 2018 16:24:28 -0000	1.6
@@ -4,7 +4,6 @@
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: dc56be97-e611-4f34-a5b6-264b46a6ad7b
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl	7 Aug 2017 23:47:47 -0000	1.4
+++ openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl	15 Aug 2018 16:24:28 -0000	1.5
@@ -1,13 +1,10 @@
-# 
-
 ad_library {
     
     These should probably just use the regular old
     permission procedures
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: da21d1e8-0729-4f3b-8bef-3b847a979fec
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	19 Jun 2018 20:37:06 -0000	1.34
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	15 Aug 2018 16:24:28 -0000	1.35
@@ -1,12 +1,9 @@
-#
-
 ad_library {
 
     Procedures to manipulate content revisions
 
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-04
-    @arch-tag: ddc736fb-cb5f-41fe-a854-703df26e8e03
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl	7 Aug 2017 23:47:47 -0000	1.7
+++ openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl	15 Aug 2018 16:24:28 -0000	1.8
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Procedures for content symlink
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: 31c66882-e912-4db4-84fe-8a2b0890ffb0
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	7 Apr 2018 17:40:02 -0000	1.11
+++ openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	15 Aug 2018 16:24:28 -0000	1.12
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Procedures for content template
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: a2fad1c8-17eb-412c-a62e-9704d346b27b
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl	4 Apr 2018 19:17:41 -0000	1.16
+++ openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl	15 Aug 2018 16:24:28 -0000	1.17
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Procedures for content types
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-09
-    @arch-tag: 4a8a3652-fd5d-49aa-86fc-fade683f06ce
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl	20 Jul 2018 08:41:29 -0000	1.5
+++ openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl	15 Aug 2018 16:24:28 -0000	1.6
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Tests for content keyword APIs
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2005-03-20
-    @arch-tag: b66524da-fe12-4bd9-ae32-f635b0b3949b
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl	20 Jul 2018 08:41:29 -0000	1.8
+++ openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl	15 Aug 2018 16:24:28 -0000	1.9
@@ -3,7 +3,6 @@
 
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-05
-    @arch-tag: e8817de4-54e8-48f6-99bc-49c0a8d94691
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-callback-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-callback-procs.tcl	21 Jun 2018 16:33:27 -0000	1.29
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-callback-procs.tcl	15 Aug 2018 16:24:28 -0000	1.30
@@ -1,12 +1,9 @@
-# packages/acs-mail-lite/tcl/acs-mail-lite-callback-procs.tcl
-
 ad_library {
 
     Callback procs for acs-mail-lite
 
     @author Malte Sussdorff (sussdorff@sussdorff.de)
     @creation-date 2005-06-15
-    @arch-tag: d9aec4df-102d-4b0d-8d0e-3dc470dbe783
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/acs-mail-lite/tcl/utils-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/utils-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-mail-lite/tcl/utils-procs.tcl	14 Jun 2018 20:56:07 -0000	1.8
+++ openacs-4/packages/acs-mail-lite/tcl/utils-procs.tcl	15 Aug 2018 16:24:28 -0000	1.9
@@ -1,12 +1,9 @@
-# packages/acs-mail-lite/tcl/utils-procs.tcl
-
 ad_library {
 
     Helper procs to build email messages
 
     @author Emmanuelle Raffenne (eraffenne@gmail.com)
     @creation-date 2007-12-16
-    @arch-tag: 820de9a9-533f-4fc3-b11d-2c9fb616a620
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-init.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-init.tcl	26 Jul 2005 15:53:40 -0000	1.2
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-init.tcl	15 Aug 2018 16:29:24 -0000	1.3
@@ -1,14 +1,10 @@
-# /packages/bug-tracker/tcl/bug-tracker-scheduled-init.tcl
-
-
 ad_library {
     
     Scheduled procs for closing bugs that have not been
     treated. 
     
     @author Victor Guerra (guerra@galileo.edu)
     @creation-date 2005-02-07
-    @arch-tag: 0a081603-3a9e-449f-a6d5-d5962c7f681f
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-procs.tcl	9 May 2018 15:33:29 -0000	1.6
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-scheduled-procs.tcl	15 Aug 2018 16:29:24 -0000	1.7
@@ -1,12 +1,9 @@
-# /packages/bug-tracker/tcl/bug-tracker-scheduled-procs.tcl
-
 ad_library {
     
     
     
     @author Victor Guerra (guerra@galileo.edu)
     @creation-date 2005-02-07
-    @arch-tag: bfe519e0-3005-46c5-835f-fa7c59938ddd
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/news/lib/latest-news.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/latest-news.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/news/lib/latest-news.adp	22 May 2018 15:59:45 -0000	1.3
+++ openacs-4/packages/news/lib/latest-news.adp	15 Aug 2018 16:29:24 -0000	1.4
@@ -1,11 +1,11 @@
-<if @news:rowcount@ gt 0 or @show_empty_p;literal@ true>
+<if @news:rowcount;literal@ gt 0 or @show_empty_p;literal@ true>
     <if @class@ eq "portalElement">
         <h3><a href="@base_url@">News</a></h3>
     </if>
     <else>
         <h2><a href="@base_url@">Latest News</a></h2>
     </else>
-    <if @news:rowcount@ eq 0>
+    <if @news:rowcount;literal@ eq 0>
         <p>No recent news</p>
     </if><else>
     <multiple name="news">
Index: openacs-4/packages/news/tcl/news-apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-apm-callback-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	7 Aug 2017 23:48:12 -0000	1.5
+++ openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	15 Aug 2018 16:29:24 -0000	1.6
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     APM callbacks for the news package
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2005-01-20
-    @arch-tag: 0f0b0270-4074-410a-a5f9-386d402adc46
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/news/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/news/www/admin/index.adp	7 Aug 2017 23:48:12 -0000	1.20
+++ openacs-4/packages/news/www/admin/index.adp	15 Aug 2018 16:29:24 -0000	1.21
@@ -13,7 +13,7 @@
 <p>
 
 @view_link;noquote@
-<if @news_items:rowcount@ eq 0>
+<if @news_items:rowcount;literal@ eq 0>
  <em>#news.lt_There_are_no_items_av#</em><p>
 </if>
 <else>
Index: openacs-4/packages/news/www/admin/rss.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/rss.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/news/www/admin/rss.tcl	19 Jan 2018 14:24:20 -0000	1.4
+++ openacs-4/packages/news/www/admin/rss.tcl	15 Aug 2018 16:29:24 -0000	1.5
@@ -1,12 +1,9 @@
-# 
-
 ad_page_contract {
     
     Setup or remove rss feed
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2005-01-23
-    @arch-tag: 4ff5628c-77f1-40ef-86c7-ef247a1ffe4f
     @cvs-id $Id$
 } {
 } -properties {
Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl	1 Mar 2018 08:32:03 -0000	1.8
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl	15 Aug 2018 16:29:24 -0000	1.9
@@ -4,7 +4,6 @@
 
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-05
-    @arch-tag: 2006927e-7f1d-41c9-a111-ac552a4da185
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	8 May 2018 22:39:45 -0000	1.36
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	15 Aug 2018 16:29:24 -0000	1.37
@@ -3,7 +3,6 @@
 
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-05
-    @arch-tag: 49a5102d-7c06-4245-8b8d-15a3b12a8cc5
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/tsearch2-driver/tcl/test/tsearch2-driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/test/tsearch2-driver-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/tsearch2-driver/tcl/test/tsearch2-driver-procs.tcl	13 Nov 2006 04:06:13 -0000	1.4
+++ openacs-4/packages/tsearch2-driver/tcl/test/tsearch2-driver-procs.tcl	15 Aug 2018 16:29:24 -0000	1.5
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Tests for tsearch2-driver
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2005-03-07
-    @arch-tag: 17a26a17-9fd6-4ae9-90ae-ce445c020ab7
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/tsearch2-driver/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/www/doc/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/tsearch2-driver/www/doc/index.adp	7 Aug 2017 23:48:29 -0000	1.2
+++ openacs-4/packages/tsearch2-driver/www/doc/index.adp	15 Aug 2018 16:29:24 -0000	1.3
@@ -100,8 +100,7 @@
     insert into search_observer_queue (
             select <em>my_id</em>, now(),'INSERT' from <em>my_table</em>
             );
-  
-</pre>
+  </pre>
 <p>For forums and ETP this looks like:</p>
 <pre>
     insert into search_observer_queue (
Index: openacs-4/packages/views/lib/views-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/views/lib/views-chunk.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/views/lib/views-chunk.tcl	28 Jun 2018 12:07:49 -0000	1.7
+++ openacs-4/packages/views/lib/views-chunk.tcl	15 Aug 2018 16:29:24 -0000	1.8
@@ -4,7 +4,6 @@
 #
 # @author Deds Castillo (deds@i-manila.com.ph)
 # @creation-date 2004-08-03
-# @arch-tag: c2038e8f-832a-4d9c-913b-6fbd5d429375
 # @cvs-id $Id$
 
 foreach required_param {package_id object_type} {
Index: openacs-4/packages/wiki/lib/footer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/footer.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/wiki/lib/footer.adp	27 Sep 2005 12:46:10 -0000	1.5
+++ openacs-4/packages/wiki/lib/footer.adp	15 Aug 2018 16:29:24 -0000	1.6
@@ -1,5 +1,5 @@
 <hr />
 <div>
 <a href="doc/wiki-help">Help</a></li></ul>
-  <if @edit_link_p@ true> | <a href="?edit">Edit</a></if>
+  <if @edit_link_p;literal@ true> | <a href="?edit">Edit</a></if>
     </div>
Index: openacs-4/packages/wiki/lib/page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/page.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/wiki/lib/page.tcl	25 Oct 2005 14:58:04 -0000	1.6
+++ openacs-4/packages/wiki/lib/page.tcl	15 Aug 2018 16:29:24 -0000	1.7
@@ -1,19 +1,16 @@
 ad_page_contract {
 
+ Show or edit wiki pages
+
+ @author Dave Bauer (dave@thedesignexperience.org)
+ @creation-date 2004-09-03
+ @cvs-id $Id$
+
 } -query {
     edit:optional
     revision_id:optional
 }
 
-# 
-#
-# Show or edit wiki pages
-#
-# @author Dave Bauer (dave@thedesignexperience.org)
-# @creation-date 2004-09-03
-# @arch-tag: e5d58124-f276-4a01-a61a-e85959bbe0d1
-# @cvs-id $Id$
-
 set folder_id [wiki::get_folder_id]
 set name [ad_conn path_info]
 if {$name eq ""} {
Index: openacs-4/packages/wiki/tcl/wiki-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/tcl/wiki-install-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/wiki/tcl/wiki-install-procs.tcl	27 Sep 2005 12:46:10 -0000	1.4
+++ openacs-4/packages/wiki/tcl/wiki-install-procs.tcl	15 Aug 2018 16:29:24 -0000	1.5
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     Install callbacks for wiki package
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-09-06
-    @arch-tag: 86a85f67-568e-422f-bd56-6c8fba89f1a2
     @cvs-id $Id$
 }
 
Index: openacs-4/packages/wiki/tcl/wiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/tcl/wiki-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/wiki/tcl/wiki-procs.tcl	28 Mar 2018 17:00:41 -0000	1.6
+++ openacs-4/packages/wiki/tcl/wiki-procs.tcl	15 Aug 2018 16:29:24 -0000	1.7
@@ -1,12 +1,9 @@
-# 
-
 ad_library {
     
     procs for wiki style cms
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-09-03
-    @arch-tag: 407a000b-0f99-4129-ae94-40679a0d4df2
     @cvs-id $Id$
 }