Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	9 Jun 2015 08:40:41 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	16 Jun 2015 08:39:03 -0000	1.6
@@ -18,7 +18,7 @@
   <else>
   <multiple name="enum_values">
     <li> @enum_values.pretty_name@ 
-         (<a href="value-delete?attribute_id=@attribute_id@&enum_value=<%=[ad_urlencode $enum_values(enum_value)]%>">delete</a>)
+         (<a href="value-delete?attribute_id=@attribute_id@&amp;enum_value=<%=[ad_urlencode $enum_values(enum_value)]%>">delete</a>)
   </multiple
   </else>
     <p><li><a href="enum-add?@url_vars@">Add value</a>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	27 Oct 2014 16:39:52 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	16 Jun 2015 08:39:03 -0000	1.5
@@ -13,7 +13,7 @@
 <multiple name="required_segments">
 
 <if @required_segments.rownum@ eq 1>
-    You can <a href="new?@export_url_vars@&add_to_group_id=@required_segments.group_id@&add_with_rel_type=@required_segments.rel_type_enc@">begin</a>
+    You can <a href="new?@export_url_vars@&amp;add_to_group_id=@required_segments.group_id@&amp;add_with_rel_type=@required_segments.rel_type_enc@">begin</a>
     the process of adding a new @object_type_pretty_name@ and giving it the
     following relationships to the necessary groups:
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	15 Jun 2015 11:14:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	16 Jun 2015 08:39:03 -0000	1.7
@@ -29,12 +29,12 @@
     <li>(none)</li>
   </if><else>
    <multiple name="attributes">
-    <li> <a href="../attributes/one?attribute_id=@attributes.attribute_id@&return_url=@return_url_enc@">@attributes.pretty_name@</a> 
+    <li> <a href="../attributes/one?attribute_id=@attributes.attribute_id@&amp;return_url=@return_url_enc@">@attributes.pretty_name@</a> 
     </li>
    </multiple>
   </else>
   <if @dynamic_p@ eq "t"> 
-    <li> <a href="../attributes/add?object_type=@rel_type_enc@&return_url=@return_url_enc@">Add an attribute</a></li>
+    <li> <a href="../attributes/add?object_type=@rel_type_enc@&amp;return_url=@return_url_enc@">Add an attribute</a></li>
   </if><else>
     <li> Attributes can only be added by programmers since this object type is not dynamically created</li>
   </else>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	27 Oct 2014 16:39:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	16 Jun 2015 08:39:03 -0000	1.5
@@ -9,8 +9,8 @@
 <p>
 You can either:
 <ul>
-<li><a href=@add_out_of_scope_url@>select an existing @object_type_two_name@ from the system</a>, or
-<li><a href=@add_party_url@>add a new @object_type_two_name@ to the system</a>.
+<li><a href="@add_out_of_scope_url@">select an existing @object_type_two_name@ from the system</a>, or
+<li><a href="@add_party_url@">add a new @object_type_two_name@ to the system</a>.
 </ul>
 
 </blockquote>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/relations/add.adp	27 Oct 2014 16:39:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.adp	16 Jun 2015 08:39:04 -0000	1.5
@@ -11,17 +11,17 @@
     If the @object_type_two_name@ that you want to add as @role_pretty_name@
     to @group_name@ is not listed below, then you can either
     <ul>
-    <li><a href=@add_out_of_scope_url@>select an existing @object_type_two_name@ from the system</a>, or
-    <li><a href=@add_party_url@>add a new @object_type_two_name@ to the system</a>.
+    <li><a href="@add_out_of_scope_url@">select an existing @object_type_two_name@ from the system</a>, or
+    <li><a href="@add_party_url@">add a new @object_type_two_name@ to the system</a>.
     </ul>
   </if><else>
     You can select an existing @object_type_two_name@ from the system below.
     <br>
     If there are too many options, then you can
-    <a href=@add_in_scope_url@>select an existing @object_type_two_name@ from this subsite</a>. 
+    <a href="@add_in_scope_url@">select an existing @object_type_two_name@ from this subsite</a>. 
     <br>
     You can also 
-    <a href=@add_party_url@>add a new @object_type_two_name@ to the system</a>.
+    <a href="@add_party_url@">add a new @object_type_two_name@ to the system</a>.
   </else>
 </if>
 <else>
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	27 Oct 2014 16:40:02 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	16 Jun 2015 08:39:04 -0000	1.8
@@ -8,11 +8,11 @@
 
 <hr>
 <table>
-<tr><th align=left>#acs-subsite.Country_Name#<th>#acs-subsite.ISO_Code#</tr>
+<tr><th align="left">#acs-subsite.Country_Name#<th>#acs-subsite.ISO_Code#</tr>
 
 <multiple name="ccodes">
 
-  <tr><td>@ccodes.country_name@<td align=center>@ccodes.iso@</tr>
+  <tr><td>@ccodes.country_name@<td align="center">@ccodes.iso@</tr>
 
 </multiple>