diff --git a/docs/faq.html b/docs/faq.html
index fdec1f9ef..511827fa7 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -239,7 +239,7 @@
   How can I include national characters like German
         umlauts in my build file?
       </a></li>
-                <li><a href="#encoding">
+                <li><a href="#use-zip-instead-of-jar">
   How do I use <code>jar</code>'s <code>M</code> switch?
       I don't want a MANIFEST.
       </a></li>
@@ -857,13 +857,13 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;ISO-8859-1&quot; ?&gt;
 </pre>
                     <p class="faq">
-      <a name="encoding"></a>
+      <a name="use-zip-instead-of-jar"></a>
       How do I use <code>jar</code>'s <code>M</code> switch?
       I don't want a MANIFEST.
     </p>
                   <p>A JAR archive is a ZIP file, so if you don't want a
         MANIFEST you can simply use <code>&lt;zip&gt;</code>.</p>
-                        <p>If your filenames contain national characters you should
+                        <p>If your file names contain national characters you should
         know that Sun's <code>jar</code> utility like Ant's
         <code>&lt;jar&gt;</code> uses UFT8 to encode their names while
         <code>&lt;zip&gt;</code> uses your platforms default encoding.
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index 01e60a31f..d6cf04fbb 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -524,7 +524,7 @@ shell-prompt> m4 foo.m4 > foo
       </answer>
     </faq>
 
-    <faq if="use-zip-instead-of-jar">
+    <faq id="use-zip-instead-of-jar">
       <question>How do I use <code>jar</code>&apos;s <code>M</code> switch?
       I don&apos;t want a MANIFEST.</question>
 
@@ -532,7 +532,7 @@ shell-prompt> m4 foo.m4 > foo
         <p>A JAR archive is a ZIP file, so if you don&apos;t want a
         MANIFEST you can simply use <code>&lt;zip&gt;</code>.</p>
 
-        <p>If your filenames contain national characters you should
+        <p>If your file names contain national characters you should
         know that Sun&apos;s <code>jar</code> utility like Ant&apos;s
         <code>&lt;jar&gt;</code> uses UFT8 to encode their names while
         <code>&lt;zip&gt;</code> uses your platforms default encoding.