Index: openacs-4/packages/acs-core-docs/www/tutorial-comments.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-comments.html,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-core-docs/www/tutorial-comments.html	27 Oct 2014 16:39:26 -0000	1.14
+++ openacs-4/packages/acs-core-docs/www/tutorial-comments.html	27 Jun 2015 17:19:13 -0000	1.15
@@ -4,11 +4,11 @@
      display individual notes, we want to put a link to add comments at
      the bottom of the screen.  If there are any comments, we want to
      show them.</p><p>First, we need to generate a url for adding comments.  In note-edit.tcl:</p><pre class="programlisting">
- set comment_add_url "[general_comments_package_url]comment-add?[export_vars {
+ set comment_add_url [export_vars -base [general_comments_package_url]comment-add {
   { object_id $note_id } 
   { object_name $title } 
   { return_url "[ad_conn url]?[ad_conn query]"} 
- }]"
+ }]
  </pre><p>This calls a global, public tcl function that the
      general_comments package registered, to get its url. You then
      embed in that url the id of the note and its title, and set the
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	27 Oct 2014 16:39:31 -0000	1.51
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	27 Jun 2015 17:19:13 -0000	1.52
@@ -343,11 +343,11 @@
      show them.</para>
      <para>First, we need to generate a url for adding comments.  In note-edit.tcl:</para>
      <programlisting>
- set comment_add_url "[general_comments_package_url]comment-add?[export_vars {
+ set comment_add_url [export_vars -base [general_comments_package_url]comment-add {
   { object_id $note_id } 
   { object_name $title } 
   { return_url "[ad_conn url]?[ad_conn query]"} 
- }]"
+ }]
  </programlisting>
      <para>This calls a global, public tcl function that the
      general_comments package registered, to get its url. You then
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml	16 Jun 2015 07:13:27 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml	27 Jun 2015 17:19:14 -0000	1.7
@@ -1241,7 +1241,7 @@
             select rowid from users where user_id = :user_id
         }]
         # Send email verification email to user
-        set confirmation_url "[ad_url]/register/email-confirm?[export_vars { row_id }]"
+        set confirmation_url [export_vars -base [ad_url]/register/email-confirm { row_id }]
         with_catch errmsg {
             acs_mail_lite::send \
                 -to_addr $email \
@@ -2626,4 +2626,4 @@
         
       </sect3>
     </sect2>
-</sect1>
\ No newline at end of file
+</sect1>