Index: openacs-4/packages/faq/templates/first/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/templates/first/one-faq.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/templates/first/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.6
+++ openacs-4/packages/faq/templates/first/one-faq.adp	17 Jun 2015 07:09:56 -0000	1.7
@@ -8,10 +8,10 @@
 
 <else>
 <table>
- <tr valign=top>
+ <tr valign="top">
  <td width="30%">
  <ol>
-  <multiple name=one_question>
+  <multiple name="one_question">
    <if @separate_p@ eq "t">
    
    <li>
@@ -32,9 +32,9 @@
 <if @separate_p@ eq "f">
 <td>
  <ol>
-  <multiple name=one_question>
+  <multiple name="one_question">
    <li>
-    <a name=@one_question.entry_id@></a>
+    <a name="@one_question.entry_id@"></a>
      <b>#faq.Q#</b> @one_question.question@
      <P>
      <b>#faq.A#</b> @one_question.answer@
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/faq/www/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.18
+++ openacs-4/packages/faq/www/one-faq.adp	17 Jun 2015 07:09:56 -0000	1.19
@@ -39,7 +39,7 @@
   <ol>
 <multiple name="one_question">
     <li>
-      <a name=@one_question.entry_id@ title="#faq.View_QA#"></a>
+      <a name="@one_question.entry_id@" title="#faq.View_QA#"></a>
       <p>
       <b>#faq.Q#</b> <i>@one_question.question;noquote@</i>
       </p>
Index: openacs-4/packages/faq/www/admin/faq-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/www/admin/faq-edit.adp	12 Sep 2013 20:28:49 -0000	1.7
+++ openacs-4/packages/faq/www/admin/faq-edit.adp	17 Jun 2015 07:09:56 -0000	1.8
@@ -11,7 +11,7 @@
    </tr>
    <tr>
     <th align="right">#faq.QA_On_Separate_Pages#</th>
-    <td><select name=separate_p>
+    <td><select name="separate_p">
 	<if @separate_p@ eq "t">
 	<option value="t" selected>#faq.Yes#</option>
 	<option value="f">#faq.No#</option>
Index: openacs-4/packages/faq/www/admin/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/faq/www/admin/one-faq.adp	12 Sep 2013 20:28:49 -0000	1.15
+++ openacs-4/packages/faq/www/admin/one-faq.adp	17 Jun 2015 07:09:56 -0000	1.16
@@ -11,20 +11,20 @@
 
 <else>
  <ol>
-  <multiple name=faq_q_and_as>
+  <multiple name="faq_q_and_as">
    <li>
     @faq_q_and_as.question;noquote@ 
     (  
-     <a href="q-and-a-add-edit?entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@" title="Edit Question">#faq.edit#</a> |
+     <a href="q-and-a-add-edit?entry_id=@faq_q_and_as.entry_id@&amp;faq_id=@faq_id@" title="Edit Question">#faq.edit#</a> |
      <a href="one-question?entry_id=@faq_q_and_as.entry_id@" title="Preview Question">#faq.preview#</a> |
      <a href="q_and_a-delete?entry_id=@faq_q_and_as.entry_id@" onclick="return confirm('#faq.lt_Are_you_sure_you_want_1#');" title="Delete Question">#faq.delete#</a> |
 
      <if @faq_q_and_as.sort_key@ ne @highest_sort_key_in_list@>
-       <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@" title="Insert new question after this one">#faq.insert_after#</a> |
-       <a href="swap?faq_id=@faq_id@&entry_id=@faq_q_and_as.entry_id@" title="Swap question with next one">#faq.swap_with_next#</a>
+       <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&amp;faq_id=@faq_id@" title="Insert new question after this one">#faq.insert_after#</a> |
+       <a href="swap?faq_id=@faq_id@&amp;entry_id=@faq_q_and_as.entry_id@" title="Swap question with next one">#faq.swap_with_next#</a>
      </if>
      <else>
-       <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@" title="Insert new question after this one">#faq.insert_after#</a>
+       <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&amp;faq_id=@faq_id@" title="Insert new question after this one">#faq.insert_after#</a>
      </else>
     )
    </li>
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	12 Sep 2013 20:28:49 -0000	1.9
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	17 Jun 2015 07:09:56 -0000	1.10
@@ -3,23 +3,23 @@
 <property name="doc(title)">#faq.One_Question#</property>
 
 <form action="@action@" method=post>
-<input type=hidden name=entry_id value=@entry_id@>
+<input type="hidden" name="entry_id" value=@entry_id@>
  <table>
   <tr>
-   <th align=right>#faq.Question#</th>
+   <th align="right">#faq.Question#</th>
    <td>
     <textarea rows=10 cols=50 name=question>@question@</textarea>
    </td>
   </tr>
   <tr>
-   <th align=right>#faq.Answer#</th>
+   <th align="right">#faq.Answer#</th>
    <td>
     <textarea rows=10 cols=50 name=answer>@answer@</textarea>
    </td>
   </tr>
   <tr>
    <td>&nbsp;</td>
-   <td><input type=submit value="@submit_label@"></td>
+   <td><input type="submit" value="@submit_label@"></td>
   </tr>
   <tr>
    <td>&nbsp;</td>