Index: openacs-4/packages/ecommerce/www/address.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/address.adp	8 Mar 2004 19:46:11 -0000	1.7
+++ openacs-4/packages/ecommerce/www/address.adp	13 Jan 2005 13:57:57 -0000	1.8
@@ -3,22 +3,22 @@
   <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @address_type@ eq "shipping">
-  <property name="title">Enter Your Shipping Address</property>
+  <property name="title">Completing Your Order: Shipping Address</property>
 
   <include src="checkout-progress" step="1">
 
-  <h2>Enter Your Shipping Address</h2>
+  <h2>Your shipping address</h2>
 </if>
 <else>
-  <property name="title">Enter Your Billing Address</property>
+  <property name="title">Completing Your Order: Billing Address</property>
   <if @referer@ ne "gift-certificate-billing">
     <include src="checkout-progress" step="4">
   </if>
-  <h2>Enter Your Billing Address</h2>
+  <h2>Your billing address</h2>
 </else>
 
 <form method="post" action="address-2">
-    @hidden_form_vars@
+    @hidden_form_vars;noquote@
     <blockquote>
       <table>
 	<tr>
@@ -41,7 +41,7 @@
 	</tr>
 	<tr>
 	  <td>City</font></td>
-	  <td><input type="text" name="city" size="20" <if @city@ not nil>value="@city@"</if>> &nbsp;State @state_widget@</td>
+	  <td><input type="text" name="city" size="20" <if @city@ not nil>value="@city@"</if>> &nbsp;State @state_widget;noquote@</td>
 	</tr>
 	<tr>
 	  <td>Zip</td>