Index: xdocs/properties.xml
===================================================================
--- xdocs/properties.xml	(revision 278595)
+++ xdocs/properties.xml	(working copy)
@@ -44,6 +44,15 @@
             Defaults to the value of maven.gen.docs (which is ${maven.build.dir}/generated-xdocs).
           </td>
         </tr>
+        <tr>
+          <td>maven.faq.toplinks</td>
+          <td>Yes</td>
+          <td>
+            Specifies whether links to the top of the page should be
+            generated after each answer.
+            Defaults to <code>true</code>.
+          </td>
+        </tr>
       </table>
     </section>
   </body>
Index: src/plugin-resources/faq.jsl
===================================================================
--- src/plugin-resources/faq.jsl	(revision 278595)
+++ src/plugin-resources/faq.jsl	(working copy)
@@ -80,10 +80,13 @@
 
   <jsl:template match="answer">
     <dd>
+        <jsl:applyTemplates trim="true" />
+        <j:if test="${context.getVariable('maven.faq.toplinks') == 'true'}">
         <j:set var="top"><x:expr select="../../../@title"/></j:set>
         <j:set var="_top">#<doc:escapeNameToken value="${top}"/></j:set>
         <div class="xright"><a href="${_top}">[top]</a></div>
-        <jsl:applyTemplates trim="true" />
+        <br/>
+        </j:if>
     </dd>
   </jsl:template> 
 
Index: plugin.properties
===================================================================
--- plugin.properties	(revision 278595)
+++ plugin.properties	(working copy)
@@ -23,3 +23,6 @@
 
 # Destination directory where output xdocs file are produced
 maven.faq.dest=${maven.gen.docs}
+
+# Whether to generate links to the top of the page
+maven.faq.toplinks=true