Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.html,v
diff -u -r1.47.2.3 -r1.47.2.4
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 10:11:48 -0000	1.47.2.3
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 10:34:30 -0000	1.47.2.4
@@ -84,7 +84,7 @@
 variables automatically. For instance: 
 </p><pre class="programlisting">
 
-db_1row select_names "select first_names, last_name from users where user_id = [ad_get_user_id]"
+db_1row select_names "select first_names, last_name from users where user_id = [ad_conn user_id]"
 doc_body_append "Hello, $first_names $last_name!"
 
 </pre><p>
@@ -93,7 +93,7 @@
 write: 
 </p><pre class="programlisting">
 
-if { [db_0or1row select_names "select first_names, last_name from users where user_id = [ad_get_user_id]"] } {
+if { [db_0or1row select_names "select first_names, last_name from users where user_id = [ad_conn user_id]"] } {
     doc_body_append "Hello, $first_names $last_name!"
 } else {
     # Executed if the query returns no rows.
Index: openacs-4/packages/acs-core-docs/www/templates.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/templates.html,v
diff -u -r1.48.2.3 -r1.48.2.4
--- openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 10:11:48 -0000	1.48.2.3
+++ openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 10:34:30 -0000	1.48.2.4
@@ -61,7 +61,7 @@
 } -query {
 }
 
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn user_id]
 
 db_1row user_name {
     select first_names || ' ' || last_name as user_name 
Index: openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html,v
diff -u -r1.1.22.2 -r1.1.22.3
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	9 Sep 2013 10:11:54 -0000	1.1.22.2
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	9 Sep 2013 10:34:30 -0000	1.1.22.3
@@ -85,7 +85,7 @@
 
     <blockquote>
       <pre>
-set form_vars [export_form_vars var1 var2]
+set form_vars [export_vars -form var1 var2]
       </pre>
     </blockquote>
 
Index: openacs-4/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v
diff -u -r1.9.6.2 -r1.9.6.3
--- openacs-4/packages/general-comments/www/comment-ae-2.adp	9 Sep 2013 10:11:54 -0000	1.9.6.2
+++ openacs-4/packages/general-comments/www/comment-ae-2.adp	9 Sep 2013 10:34:30 -0000	1.9.6.3
@@ -15,7 +15,7 @@
 </else>
 
 <form action="@target@" method=post>
-<%= [export_form_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
+<%= [export_vars -form comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
 <input type=submit name=submit value="#general-comments.Confirm#">
 <p>
 <input type="checkbox" name="attach_p" id="attach_ck"><label for="attach_ck">#general-comments.lt_I_would_like_to_uploa#</label>
Index: openacs-4/packages/general-comments/www/comment-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/comment-ae.adp,v
diff -u -r1.9.6.2 -r1.9.6.3
--- openacs-4/packages/general-comments/www/comment-ae.adp	9 Sep 2013 10:11:54 -0000	1.9.6.2
+++ openacs-4/packages/general-comments/www/comment-ae.adp	9 Sep 2013 10:34:31 -0000	1.9.6.3
@@ -5,7 +5,7 @@
 
 <form action="@target@" method="post" name="comment" class="margin-form">
 <div>
-  <%= [export_form_vars comment_id object_id object_name context_id return_url] %>
+  <%= [export_vars -form comment_id object_id object_name context_id return_url] %>
 </div>
 <div class="form-item-wrapper">
   <label for="title" class="form-label">
Index: openacs-4/packages/general-comments/www/delete-attachment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.adp,v
diff -u -r1.5.20.2 -r1.5.20.3
--- openacs-4/packages/general-comments/www/delete-attachment.adp	9 Sep 2013 10:11:54 -0000	1.5.20.2
+++ openacs-4/packages/general-comments/www/delete-attachment.adp	9 Sep 2013 10:34:31 -0000	1.5.20.3
@@ -9,15 +9,15 @@
 <tr>
 	<td>
 		<form action=delete-attachment-2 method=post>
-		<%= [export_form_vars attach_id parent_id return_url] %>
+		<%= [export_vars -form attach_id parent_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>
 
 	<td>
 		<form action="view-comment" method="get">
 		<input type=hidden name="comment_id" value="@parent_id@">
-		<%= [export_form_vars return_url] %>
+		<%= [export_vars -form return_url] %>
 		<input type=submit name=submit value="#general-comments.Cancel#">
 		</form>
 	</td
Index: openacs-4/packages/general-comments/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.adp,v
diff -u -r1.2.6.2 -r1.2.6.3
--- openacs-4/packages/general-comments/www/delete.adp	9 Sep 2013 10:11:54 -0000	1.2.6.2
+++ openacs-4/packages/general-comments/www/delete.adp	9 Sep 2013 10:34:31 -0000	1.2.6.3
@@ -19,7 +19,7 @@
 <tr>
 	<td>
 		<form action=delete-2 method=post>
-		<%= [export_form_vars comment_id return_url] %>
+		<%= [export_vars -form comment_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>
Index: openacs-4/packages/general-comments/www/file-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v
diff -u -r1.6.6.2 -r1.6.6.3
--- openacs-4/packages/general-comments/www/file-ae.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
+++ openacs-4/packages/general-comments/www/file-ae.adp	9 Sep 2013 10:34:31 -0000	1.6.6.3
@@ -4,7 +4,7 @@
 <property name="parent_id">@parent_id;noquote@</property>
 
 <form enctype="multipart/form-data" method=POST action="@target@">
-<div><%= [export_form_vars attach_id parent_id return_url] %></div>
+<div><%= [export_vars -form attach_id parent_id return_url] %></div>
 
 <table>
   <tr>
Index: openacs-4/packages/general-comments/www/url-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v
diff -u -r1.6.6.2 -r1.6.6.3
--- openacs-4/packages/general-comments/www/url-ae.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
+++ openacs-4/packages/general-comments/www/url-ae.adp	9 Sep 2013 10:34:31 -0000	1.6.6.3
@@ -4,7 +4,7 @@
 <property name="parent_id">@parent_id;noquote@</property>
 
 <form method=POST action= "@target@">
-<div><%= [export_form_vars attach_id parent_id return_url] %></div>
+<div><%= [export_vars -form attach_id parent_id return_url] %></div>
 
 <table>
   <tr>
Index: openacs-4/packages/general-comments/www/admin/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v
diff -u -r1.6.6.2 -r1.6.6.3
--- openacs-4/packages/general-comments/www/admin/delete.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
+++ openacs-4/packages/general-comments/www/admin/delete.adp	9 Sep 2013 10:34:31 -0000	1.6.6.3
@@ -19,7 +19,7 @@
 <tr>
 	<td>
 		<form action=delete-2 method=post>
-		<%= [export_form_vars comment_id return_url] %>
+		<%= [export_vars -form comment_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>