From 4912be984caa4d33e9d43d61d70e34449c355d8e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 30 Mar 2011 14:59:45 +0100
Subject: silence tedious javadoc warnings

---
 .../org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html   | 2 +-
 .../java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html  | 2 +-
 .../converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java     | 1 -
 .../org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html   | 2 +-
 .../xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'xmerge/source')

diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
index ce4c4a28ae9f..7067674375ed 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
@@ -37,7 +37,7 @@
 <p>Provides the tools for doing the conversion of StarWriter XML to
 and from AportisDoc format.</p>
 
-<p>It follows the {@link org.openoffice.xmerge} framework for the conversion process.</p>
+<p>It follows the org.openoffice.xmerge framework for the conversion process.</p>
 
 <p>Since it converts to/from a Palm application format, these converters
 follow the <a href=../../../../converter/palm/package-summary.html#streamformat>
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html
index 61c1f3f0a79d..c60eeabf4931 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html
@@ -37,7 +37,7 @@
 <p>Provides the tools for doing the conversion of StarWriter XML to
 and from Pocket Excel format.</p>
 
-<p>It follows the {@link org.openoffice.xmerge} framework for the conversion process.</p>
+<p>It follows the org.openoffice.xmerge framework for the conversion process.</p>
 
 </body>
 </html>
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
index 1f2bef7b1d92..64fcd263a6a5 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
 
 /**
  * This class defines the precedence applied to each operator when performing a conversion
- * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler.infix2RPN  from infix to RPN}.
  */
 public class PrecedenceTable {
     public static final int DEFAULT_PRECEDENCE  = 0;
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html
index e32357b85ef7..64070e157159 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html
@@ -51,7 +51,7 @@
 <p>This plugin is based on the Windows CE 3.0 version of Pocket Word.<br>
    Testing was carried out using Pocket PC 2000 and Pocket PC 2002 devices.</p>
 
-<p>It follows the {@link org.openoffice.xmerge} framework
+<p>It follows the org.openoffice.xmerge framework
 for the conversion process.</p>
 
 </body>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html
index 30c71b15655f..6d29bcea848c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html
@@ -35,7 +35,7 @@
 <P>Provides the tools for doing the conversion of StarWriter XML to
 and from supported formats, through the use of an XSLT
 transformation.</P>
-<P>It follows the {@link org.openoffice.xmerge}
+<P>It follows the org.openoffice.xmerge
 framework for the conversion process.</P>
 <P>This converter does not currently support merge.</P>
 <P><FONT FACE="Times New Roman, serif"><FONT SIZE=5><B>XSLT
@@ -59,7 +59,7 @@ The converter also makes use of an XsltPlugin.properties file, which may be edit
 <li>Change the DocumentDeserializer transformer, so that the DOMResult is serialized using the xalan serializer and create an SxwDocument from the result</li>
 </ol></p>
 
-@see org.openoffice.xmerge.util.registry
+@see org.openoffice.xmerge.util.registry.ConverterInfo
 
 </BODY>
 </HTML>
-- 
cgit