diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly
index 9ec2131f..22ac551f 100644
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -12,7 +12,6 @@
         <j:set var="docsToc" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}/${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.navigationFile')}"/>
         <j:set var="confidential" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.confidential')}"/>
         <j:set var="paperType" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.paperType')}"/>
-        <j:set var="companyName" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyName')}"/>
         <j:set var="companyIncName" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyIncName')}"/>
         <j:set var="publicationYear" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.copyrightYear')}"/>
         <j:set var="coverProjectCompany" value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.cover.projectCompany')}"/>
@@ -58,7 +57,6 @@
             <param name="basePath" expression="${docsPdf}"/>
             <param name="confidential" expression="${confidential}"/>
             <param name="paperType" expression="${paperType}"/>
-            <param name="companyName" expression="${companyName}"/>
             <param name="companyIncName" expression="${companyIncName}"/>
             <param name="publicationYear" expression="${publicationYear}"/>
             <param name="coverProjectCompany" expression="${coverProjectCompany}"/>
diff --git a/pdf/plugin.properties b/pdf/plugin.properties
index 4533ff4a..2e701210 100644
--- a/pdf/plugin.properties
+++ b/pdf/plugin.properties
@@ -5,7 +5,6 @@
 # -------------------------------------------------------------------
 maven.pdf.confidential=false
 maven.pdf.paperType=A4
-maven.pdf.companyName=${pom.organization.name}
 maven.pdf.companyIncName=${pom.organization.name}
 maven.pdf.copyrightYear=${pom.inceptionYear}
 maven.pdf.imageDpi=150
diff --git a/pdf/src/plugin-resources/project2fo.xslt b/pdf/src/plugin-resources/project2fo.xslt
index 67d416aa..ef4bd30e 100644
--- a/pdf/src/plugin-resources/project2fo.xslt
+++ b/pdf/src/plugin-resources/project2fo.xslt
@@ -8,7 +8,6 @@
     <xsl:include href="fo-table-column-widths.xslt"/>
     <xsl:param name="basePath">.</xsl:param>
     <xsl:param name="paperType">US</xsl:param>
-    <xsl:param name="companyName">The Jakarta Project</xsl:param>
     <xsl:param name="companyIncName">Apache Software Foundation, Inc.</xsl:param>
     <xsl:param name="confidential">false</xsl:param>
     <xsl:param name="publicationYear">2003</xsl:param>
diff --git a/pdf/xdocs/index.xml b/pdf/xdocs/index.xml
index f861da21..99edc124 100644
--- a/pdf/xdocs/index.xml
+++ b/pdf/xdocs/index.xml
@@ -1,28 +1,17 @@
 <?xml version="1.0"?>
 <document>
-
-  <properties>
-    <title>Maven PDF Plug-in</title>
-    <author email="jason@zenplex.com">Jason van Zyl</author>
-    <author email="dion@apache.org">dIon Gillard</author>
-  </properties>
-
-  <body>
-    <section name="Maven PDF Plug-in">
-      <p>
-        This plug-in allows you to generate a PDF version of your project's
-        documentation.
-      </p>
-      <p>
-        There is a known problem with the PDF generation tool (Apache's FOP)
+    <properties>
+        <title>Maven PDF Plug-in</title>
+        <author email="jason@zenplex.com">Jason van Zyl</author>
+        <author email="dion@apache.org">dIon Gillard</author>
+    </properties>
+    <body>
+        <section name="Maven PDF Plug-in">
+            <p>This plug-in allows you to generate a PDF version of your project's
+        documentation.</p>
+            <p>There is a known problem with the PDF generation tool (Apache's FOP)
         in that it doesn't allow for table structures with automatic column
-        widths to be generated. This means that currently, documents with
-        tables will be missing content.
-      </p>
-      <p>
-        Another issue is that the documentation is only the top level of
-        the documentation generated.
-      </p>
-    </section>
- </body>
+        widths to be generated. Widths are uniformly distributed.</p>
+        </section>
+    </body>
 </document>
diff --git a/pdf/xdocs/properties.xml b/pdf/xdocs/properties.xml
index 5eeee40e..04deef60 100644
--- a/pdf/xdocs/properties.xml
+++ b/pdf/xdocs/properties.xml
@@ -6,7 +6,8 @@
     </properties>
     <body>
         <section name="Maven PDF Plugin Settings">
-            <p>This properties are used by the plugin and can be redifned by the user.</p>
+            <p>This properties are used by the plugin and can be redifned by 
+            the user.</p>
             <table>
                 <tr>
                     <th>Property name</th>
@@ -16,104 +17,118 @@
                 <tr>
                     <td>maven.docs.src</td>
                     <td>Yes</td>
-                    <td>The source directory for the <code>${maven.pdf.navigationFile}</code> file and the user xml documentations files. Defaults to <code>${basedir}/xdocs</code>.</td>
+                    <td>The source directory for the 
+                    <code>${maven.pdf.navigationFile}</code> file and the user 
+                    xml documentations files. Defaults to 
+                    <code>${basedir}/xdocs</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.docs.dest</td>
                     <td>Yes</td>
-                    <td>The destination directory for PDF documentation. Images are copied fom this directory. Defaults to <code>${maven.build.dir}/docs/</code>.</td>
+                    <td>The destination directory for PDF documentation. Images 
+                    are also copied from this directory. Defaults to 
+                    <code>${maven.build.dir}/docs/</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.docs.outputencoding</td>
                     <td>Yes</td>
-                    <td>The output encoding of the generated documentation. Defaults to <code>ISO-8859-1</code>.</td>
+                    <td>The output encoding of the generated documentation. 
+                    Defaults to <code>ISO-8859-1</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.gen.docs</td>
                     <td>Yes</td>
-                    <td>The directory for generated xdocs. Defaults to <code>${maven.build.dir}/generated-xdocs/</code>.</td>
+                    <td>The directory for generated xdocs. Defaults to 
+                    <code>${maven.build.dir}/generated-xdocs/</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.pdfName</td>
                     <td>Yes</td>
-                    <td>The name of pdf file. Defaults to <code>${pom.artifactId}.pdf</code>.</td>
+                    <td>The name of pdf file. Defaults to 
+                    <code>${pom.artifactId}.pdf</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.confidential</td>
                     <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b> Defaults to <code>false</code>.</td>
+                    <td>Add a confidential text to the footer of each page.
+                    Defaults to <code>false</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.paperType</td>
                     <td>Yes</td>
-                    <td>Paper type for the generated PDF file. Defaults to <code>A4</code>.</td>
-                </tr>
-                <tr>
-                    <td>maven.pdf.companyName</td>
-                    <td>Yes</td>
-                    <td>Defaults to <code>${pom.organization.name}</code>.</td>
+                    <td>Paper type for the generated PDF file. Defaults to 
+                    <code>A4</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.companyIncName</td>
                     <td>Yes</td>
-                    <td>Defaults to <code>${pom.organization.name}</code>.</td>
+                    <td>The company name printed on each page footer beside the copyrigths.
+                    Defaults to <code>${pom.organization.name}</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.copyrightYear</td>
                     <td>Yes</td>
                     <td>Defaults to <code>${pom.inceptionYear}</code>.</td>
                 </tr>
+                <tr>
+                    <td>maven.pdf.debug</td>
+                    <td>Yes</td>
+                    <td>Debug the pdf generation process. Defaults to 
+                    <code>false</code>.</td>
+                </tr>
                 <tr>
                     <td>maven.pdf.imageDpi</td>
                     <td>Yes</td>
                     <td>Defaults to <code>150</code>.</td>
                 </tr>
-                <tr>
-                    <td>maven.pdf.debug</td>
-                    <td>Yes</td>
-                    <td>Debug pdf generation process. Defaults to <code>false</code>.</td>
-                </tr>
                 <tr>
                     <td>maven.pdf.navigationFile</td>
                     <td>Yes</td>
-                    <td>Filename for the navigation file used to generate the PDF. Defaults to <code>navigation.xml</code>.</td>
+                    <td>Filename for the navigation file used to generate the 
+                    PDF. Defaults to <code>navigation.xml</code>.</td>
+                </tr>
+                <tr>
+                    <td>maven.pdf.projectLogo</td>
+                    <td>Yes</td>
+                    <td>Project logo URL (or relative path). Defaults to 
+                    <code>${pom.url}${pom.logo}</code>.</td>
+                </tr>
+                <tr>
+                    <td>maven.pdf.companyLogo</td>
+                    <td>Yes</td>
+                    <td>Company logo URL (or relative path). Defaults to 
+                    <code>${pom.organization.url}${pom.organization.logo}</code>
+                    </td>
                 </tr>
                 <tr>
                     <td>maven.pdf.cover.projectCompany</td>
                     <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>${pom.organization.name}</code>.</td>
+                    <td>Company name printed on the cover. Defaults to 
+                    <code>${pom.organization.name}</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.cover.projectName</td>
                     <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>${pom.name}</code>.</td>
+                    <td>Project name .Defaults to 
+                    <code>${pom.name}</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.cover.type</td>
                     <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>Project Documentation</code>.</td>
+                    <td>Type of documentation. Defaults to 
+                    <code>Project Documentation</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.cover.version</td>
                     <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>${pom.currentVersion}</code>.</td>
+                    <td>Project/Document version printed on the cover. Defaults
+                    to <code>${pom.currentVersion}</code>.</td>
                 </tr>
                 <tr>
                     <td>maven.pdf.cover.date</td>
                     <td>Yes</td>
                     <td>Defaults to current day.</td>
                 </tr>
-                <tr>
-                    <td>maven.pdf.projectLogo</td>
-                    <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>${pom.url}${pom.logo}</code>.</td>
-                </tr>
-                <tr>
-                    <td>maven.pdf.companyLogo</td>
-                    <td>Yes</td>
-                    <td>Usage <b>not yet implemented.</b>Defaults to <code>${pom.organization.url}${pom.organization.logo}</code>
-                    </td>
-                </tr>
             </table>
         </section>
     </body>

Property name
maven.docs.src	Yes	The source directory for the `${maven.pdf.navigationFile}` file and the user xml documentations files. Defaults to `${basedir}/xdocs`.	The source directory for the + `${maven.pdf.navigationFile}` file and the user + xml documentations files. Defaults to + `${basedir}/xdocs`.
maven.docs.dest	Yes	The destination directory for PDF documentation. Images are copied fom this directory. Defaults to `${maven.build.dir}/docs/`.	The destination directory for PDF documentation. Images + are also copied from this directory. Defaults to + `${maven.build.dir}/docs/`.
maven.docs.outputencoding	Yes	The output encoding of the generated documentation. Defaults to `ISO-8859-1`.	The output encoding of the generated documentation. + Defaults to `ISO-8859-1`.
maven.gen.docs	Yes	The directory for generated xdocs. Defaults to `${maven.build.dir}/generated-xdocs/`.	The directory for generated xdocs. Defaults to + `${maven.build.dir}/generated-xdocs/`.
maven.pdf.pdfName	Yes	The name of pdf file. Defaults to `${pom.artifactId}.pdf`.	The name of pdf file. Defaults to + `${pom.artifactId}.pdf`.
maven.pdf.confidential	Yes	Usage not yet implemented. Defaults to `false`.	Add a confidential text to the footer of each page. + Defaults to `false`.
maven.pdf.paperType	Yes	Paper type for the generated PDF file. Defaults to `A4`.
maven.pdf.companyName	Yes	Defaults to `${pom.organization.name}`.	Paper type for the generated PDF file. Defaults to + `A4`.
maven.pdf.companyIncName	Yes	Defaults to `${pom.organization.name}`.	The company name printed on each page footer beside the copyrigths. + Defaults to `${pom.organization.name}`.
maven.pdf.copyrightYear	Yes	Defaults to `${pom.inceptionYear}`.
maven.pdf.debug	Yes	Debug the pdf generation process. Defaults to + `false`.
maven.pdf.imageDpi	Yes	Defaults to `150`.
maven.pdf.debug	Yes	Debug pdf generation process. Defaults to `false`.
maven.pdf.navigationFile	Yes	Filename for the navigation file used to generate the PDF. Defaults to `navigation.xml`.	Filename for the navigation file used to generate the + PDF. Defaults to `navigation.xml`.
maven.pdf.projectLogo	Yes	Project logo URL (or relative path). Defaults to + `${pom.url}${pom.logo}`.
maven.pdf.companyLogo	Yes	Company logo URL (or relative path). Defaults to + `${pom.organization.url}${pom.organization.logo}` +
maven.pdf.cover.projectCompany	Yes	Usage not yet implemented.Defaults to `${pom.organization.name}`.	Company name printed on the cover. Defaults to + `${pom.organization.name}`.
maven.pdf.cover.projectName	Yes	Usage not yet implemented.Defaults to `${pom.name}`.	Project name .Defaults to + `${pom.name}`.
maven.pdf.cover.type	Yes	Usage not yet implemented.Defaults to `Project Documentation`.	Type of documentation. Defaults to + `Project Documentation`.
maven.pdf.cover.version	Yes	Usage not yet implemented.Defaults to `${pom.currentVersion}`.	Project/Document version printed on the cover. Defaults + to `${pom.currentVersion}`.
maven.pdf.cover.date	Yes	Defaults to current day.
maven.pdf.projectLogo	Yes	Usage not yet implemented.Defaults to `${pom.url}${pom.logo}`.
maven.pdf.companyLogo	Yes	Usage not yet implemented.Defaults to `${pom.organization.url}${pom.organization.logo}` -