Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/acs-subsite/www/register/index.adp	14 Jul 2015 22:26:56 -0000	1.22
+++ openacs-4/packages/acs-subsite/www/register/index.adp	22 Sep 2015 12:36:38 -0000	1.22.2.1
@@ -2,5 +2,5 @@
   <property name="doc(title)">#acs-subsite.Log_In#</property>
   <property name="context">{#acs-subsite.Log_In#}</property>
 
-<include src="@login_template;literal@" return_url="@return_url;literal@" no_frame_p="1" authority_id="@authority_id;literal@" username="@username;literal@" email="@email;literal@" &="__adp_properties">
+<include src="@login_template;literal@" &="return_url" no_frame_p="1" &="authority_id" &="username" &="email" &="__adp_properties">
 
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	14 Jul 2015 22:26:56 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	22 Sep 2015 12:36:39 -0000	1.18.2.1
@@ -8,4 +8,4 @@
   <div class="general-message">@message@</div>
 </if>
 
-<include src="@user_info_template;literal@" user_id="@user_id;literal@" return_url="@return_url;literal@" &="__adp_properties" edit_p="@edit_p;literal@" message="@message;literal@">
+<include src="@user_info_template;literal@" &="user_id" &="return_url" &="__adp_properties" &="edit_p" &="message">
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	10 Sep 2015 08:21:53 -0000	1.16.2.1
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	22 Sep 2015 12:36:39 -0000	1.16.2.2
@@ -1,6 +1,5 @@
 ad_page_contract {
-    Displays form for currently logged in user to update his/her
- personal information
+    Displays form for currently logged in user to update his/her personal information
 
     @author Unknown
     @creation-date Unknown