Index: openacs-4/packages/acs-templating/www/doc/migration.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/migration.adp,v
diff -u -r1.3.2.10 -r1.3.2.11
--- openacs-4/packages/acs-templating/www/doc/migration.adp	22 Jun 2016 07:48:43 -0000	1.3.2.10
+++ openacs-4/packages/acs-templating/www/doc/migration.adp	5 Jul 2016 12:14:22 -0000	1.3.2.11
@@ -9,14 +9,15 @@
 
 When templatizing a legacy tcl page, your task is to
 <strong>separate</strong>
- code and graphical presentation. The latter goes
-into an ADP file; it contains essentially HTML, augmented by a few
-special tags and the <code>\@<em>variable</em>\@</code>
- construct. The
-code goes into a Tcl script. In other words, a templated page
-consists of two files, a Tcl part that puts its results in data
-sources, and an ADP page (the template), into which these data
-sources will be interpolated to yield a complete HTML page.
+ code and graphical presentation. The
+latter goes into an ADP file; it contains essentially HTML,
+augmented by a few special tags and the
+<code>\@<em>variable</em>\@</code>
+ construct. The code goes into a
+Tcl script. In other words, a templated page consists of two files,
+a Tcl part that puts its results in data sources, and an ADP page
+(the template), into which these data sources will be interpolated
+to yield a complete HTML page.
 <h3>General</h3>
 <p>As usual, the Tcl page should start with a call to
 <code>ad_page_contract</code>. In its <code>-properties</code>
@@ -37,16 +38,16 @@
 <p>A few more hints</p>
 <ul>
 <li>Do not write to the connection directly. Avoid
-<code>ns_puts</code>, <code>ns_write</code> etc., which don't wait
-till the headers are written or the page is completed; they may act
-differently than you expect.</li><li>If you can, put code in the tcl file, not between <code>&lt;%
+<code>ns_puts</code>, <code>ns_write</code> etc., which don&#39;t
+wait till the headers are written or the page is completed; they
+may act differently than you expect.</li><li>If you can, put code in the tcl file, not between <code>&lt;%
 %&gt;</code> in the adp page.</li><li>Put HTML in the adp page, not int the tcl program. Put reusable
 HTML fragments in a separate adp file (think of it as a widget)
 that will be <code>&lt;include&gt;</code>d from several pages.
 Prefer this to writing a tcl proc that returns HTML.</li><li>Remember to remove backslashes where you had to escape special
 characters, as in
 <blockquote><pre>
-Nuts  <font color="red">\</font>$2.70 <font color="red">\</font>[&lt;a href="<font" color="red">\</font>"shoppe<font color="red">\</font>"&gt;buy&lt;/a&gt;<font color="red">\</font>]
+Nuts  <font color="red">\</font>$2.70 <font color="red">\</font>[&lt;a href="<font color="red">\</font>"shoppe<font color="red">\</font>"&gt;buy&lt;/a&gt;<font color="red">\</font>]
           
 </pre></blockquote>
 </li>
@@ -266,8 +267,8 @@
     and (   expiration_date is null
          or expiration_date &gt; sysdate)
 } {
-    append body "&lt;li&gt;&lt;a href=
-        \"item-view?news_item_id=<font color="blue">"\
+    append body "&lt;li&gt;&lt;a href="
+        \"item-view?news_item_id=<font color="b" lue="">"\
         "</font>$news_item_id\"
         &gt;$title&lt;/a&gt;\n"
 
@@ -282,7 +283,7 @@
 &lt;p&gt;&lt;li&gt;You can use the &lt;a href=
     \"admin/\"&gt;administration
     interface&lt;/a&gt; to post a new
-    item (there's currently no
+    item (there&#39;s currently no
     security in place).
 
 &lt;/ul&gt;
@@ -312,7 +313,7 @@
 
 
   &lt;li&gt;&lt;a href=
-      "item-view?news_item_id=<font color="blue">&lt;%
+      "item-view?news_item_id=<font color="b" lue="">&lt;%
       %&gt;</font>\@<strong>item</strong>.news_item_id\@"
       &gt;\@<strong>item</strong>.title\@&lt;/a&gt;
 &lt;/multiple&gt;
@@ -327,7 +328,7 @@
 &lt;p&gt;&lt;li&gt;You can use the &lt;a href=
   "admin/"&gt;administration
   interface&lt;/a&gt; to post a new
-  item (there's currently no
+  item (there&#39;s currently no
   security in place).
 
 &lt;/ul&gt;
@@ -344,7 +345,7 @@
 documentation</a>.</li><li>Blue color marks additional syntax necessary to wrap lines
 short.</li><li>The proc <code>db_multirow</code> does have a code block and an
 optional <code>if_no_rows</code> block, just like
-<code>db_foreach</code>. They aren't used in the example,
+<code>db_foreach</code>. They aren&#39;t used in the example,
 though.</li>
 </ul>
 <p>If you have a more complicated db_foreach, where logic is
@@ -361,11 +362,11 @@
 <th><code>packages/acs-core-ui/www/pvt/alerts.tcl</code></th><th><code>packages/acs-core-ui/www/pvt/alerts.adp</code></th>
 </tr><tr>
 <td valign="top"><pre><font color="#999999">ad_page_contract {
-    \@cvs-id $&zwnj;Id: migration.html,v 1.3 2014/10/27 16:40:14 victorg Exp $
+    \@cvs-id $&zwnj;Id: migration.html,v 1.3.2.1 2016/06/22 07:48:43 gustafn Exp $
 } {
 }</font></pre></td><td valign="top"><pre>
 <font color="#999999">ad_page_contract {
-    \@cvs-id $&zwnj;Id: migration.html,v 1.3 2014/10/27 16:40:14 victorg Exp $
+    \@cvs-id $&zwnj;Id: migration.html,v 1.3.2.1 2016/06/22 07:48:43 gustafn Exp $
 } {
 } -properties {
     header:onevalue
@@ -570,5 +571,5 @@
 Iwashima</a>
 </address>
 
-Last modified: $&zwnj;Id: migration.html,v 1.3 2014/10/27 16:40:14
-victorg Exp $
+Last modified: $&zwnj;Id: migration.html,v 1.3.2.1 2016/06/22 07:48:43
+gustafn Exp $