2004-04-17 Michael Koch <konqueror@gmx.de>

	* java/util/Collections.java,
	java/util/PropertyResourceBundle.java,
	java/util/ResourceBundle.java,
	java/util/StringTokenizer.java,
	java/util/jar/Attributes.java,
	java/util/logging/ConsoleHandler.java,
	java/util/logging/LogManager.java,
	java/util/logging/MemoryHandler.java,
	java/util/logging/SocketHandler.java:
	Fixed HTML tags in javadocs all over.

9 files changed, 41 insertions, 44 deletions

diff --git a/java/util/Collections.java b/java/util/Collections.java
index 815afccc8..7e5ac6ec2 100644
--- a/java/util/Collections.java
+++ b/java/util/Collections.java
@@ -54,7 +54,7 @@ import java.io.Serializable;
  * are not required, to throw the {@link UnsupportedOperationException} that
  * the underlying collection would throw during an attempt at modification.
  * For example,
- * <code>Collections.singleton("").addAll(Collections.EMPTY_SET)<code>
+ * <code>Collections.singleton("").addAll(Collections.EMPTY_SET)</code>
  * does not throw a exception, even though addAll is an unsupported operation
  * on a singleton; the reason for this is that addAll did not attempt to
  * modify the set.
diff --git a/java/util/PropertyResourceBundle.java b/java/util/PropertyResourceBundle.java
index d873e134e..9d556f2e4 100644
--- a/java/util/PropertyResourceBundle.java
+++ b/java/util/PropertyResourceBundle.java
@@ -54,7 +54,7 @@ import java.io.InputStream;
  *
  * If there is also a class for this resource and the same locale, the
  * class will be chosen. The properties file should have the name of the
- * resource bundle, appended with the locale (e.g. <code>_de</code) and the
+ * resource bundle, appended with the locale (e.g. <code>_de</code> and the
  * extension <code>.properties</code>. The file should have the same format
  * as for <code>Properties.load()</code>
  *
diff --git a/java/util/ResourceBundle.java b/java/util/ResourceBundle.java
index fd0cae3e4..010647755 100644
--- a/java/util/ResourceBundle.java
+++ b/java/util/ResourceBundle.java
@@ -53,7 +53,7 @@ import gnu.classpath.Configuration;
  * <code>getObject</code> or <code>getString</code> on that bundle.
  *
  * <p>When a bundle is demanded for a specific locale, the ResourceBundle
- * is searched in following order (<i>def. language<i> stands for the
+ * is searched in following order (<i>def. language</i> stands for the
  * two letter ISO language code of the default locale (see
  * <code>Locale.getDefault()</code>).
  *
@@ -308,18 +308,22 @@ public abstract class ResourceBundle
    *
    * <p>A sequence of candidate bundle names are generated, and tested in
    * this order, where the suffix 1 means the string from the specified
-   * locale, and the suffix 2 means the string from the default locale:<ul>
+   * locale, and the suffix 2 means the string from the default locale:</p>
+   *
+   * <ul>
    * <li>baseName + "_" + language1 + "_" + country1 + "_" + variant1</li>
    * <li>baseName + "_" + language1 + "_" + country1</li>
    * <li>baseName + "_" + language1</li>
    * <li>baseName + "_" + language2 + "_" + country2 + "_" + variant2</li>
    * <li>baseName + "_" + language2 + "_" + country2</li>
-   * <li>baseName + "_" + language2<li>
+   * <li>baseName + "_" + language2</li>
    * <li>baseName</li>
    * </ul>
    *
    * <p>In the sequence, entries with an empty string are ignored. Next,
-   * <code>getBundle</code> tries to instantiate the resource bundle:<ul>
+   * <code>getBundle</code> tries to instantiate the resource bundle:</p>
+   *
+   * <ul>
    * <li>First, an attempt is made to load a class in the specified classloader
    * which is a subclass of ResourceBundle, and which has a public constructor
    * with no arguments, via reflection.</li>
@@ -334,7 +338,7 @@ public abstract class ResourceBundle
    * in the above sequence are tested in a similar manner, and if any results
    * in a resource bundle, it is assigned as the parent of the first bundle
    * using the <code>setParent</code> method (unless the first bundle already
-   * has a parent).
+   * has a parent).</p>
    *
    * <p>For example, suppose the following class and property files are
    * provided: MyResources.class, MyResources_fr_CH.properties,
@@ -343,10 +347,12 @@ public abstract class ResourceBundle
    * all files are valid (that is, public non-abstract subclasses of
    * ResourceBundle with public nullary constructors for the ".class" files,
    * syntactically correct ".properties" files). The default locale is
-   * Locale("en", "UK").
+   * Locale("en", "UK").</p>
    *
    * <p>Calling getBundle with the shown locale argument values instantiates
-   * resource bundles from the following sources:<ul>
+   * resource bundles from the following sources:</p>
+   *
+   * <ul>
    * <li>Locale("fr", "CH"): result MyResources_fr_CH.class, parent
    *   MyResources_fr.properties, parent MyResources.class</li>
    * <li>Locale("fr", "FR"): result MyResources_fr.properties, parent
@@ -358,8 +364,9 @@ public abstract class ResourceBundle
    * <li>Locale("es", "ES"): result MyResources_es_ES.class, parent
    *   MyResources.class</li>
    * </ul>
-   * The file MyResources_fr_CH.properties is never used because it is hidden
-   * by MyResources_fr_CH.class.
+   * 
+   * <p>The file MyResources_fr_CH.properties is never used because it is hidden
+   * by MyResources_fr_CH.class.</p>
    *
    * @param baseName the name of the ResourceBundle
    * @param locale A locale
diff --git a/java/util/StringTokenizer.java b/java/util/StringTokenizer.java
index e7fc6fd00..472d8951e 100644
--- a/java/util/StringTokenizer.java
+++ b/java/util/StringTokenizer.java
@@ -196,7 +196,7 @@ public class StringTokenizer implements Enumeration
 
   /**
    * This does the same as hasMoreTokens. This is the
-   * <code>Enumeration</code interface method.
+   * <code>Enumeration</code> interface method.
    *
    * @return true, if the next call of nextElement() will succeed
    * @see #hasMoreTokens()
@@ -208,7 +208,7 @@ public class StringTokenizer implements Enumeration
 
   /**
    * This does the same as nextTokens. This is the
-   * <code>Enumeration</code interface method.
+   * <code>Enumeration</code> interface method.
    *
    * @return the next token with respect to the current delimiter characters
    * @throws NoSuchElementException if there are no more tokens
diff --git a/java/util/jar/Attributes.java b/java/util/jar/Attributes.java
index ea203446e..06dc4f89f 100644
--- a/java/util/jar/Attributes.java
+++ b/java/util/jar/Attributes.java
@@ -85,17 +85,18 @@ public class Attributes implements Cloneable, Map
    * attributes, applet attributes, extension identification attributes,
    * package versioning and sealing attributes, file contents attributes,
    * bean objects attribute and signing attributes. See the 
-   * <p>
-   * The characters of a Name must obey the following restrictions:
+   * 
+   * <p>The characters of a Name must obey the following restrictions:</p>
+   * 
    * <ul>
-   * <li> Must contain at least one character
-   * <li> The first character must be alphanumeric (a-z, A-Z, 0-9)
-   * <li> All other characters must be alphanumeric, a '-' or a '_'
+   * <li>Must contain at least one character</li>
+   * <li>The first character must be alphanumeric (a-z, A-Z, 0-9)</li>
+   * <li>All other characters must be alphanumeric, a '-' or a '_'</li>
    * </ul>
-   * <p>
-   * When comparing Names (with <code>equals</code>) all characters are
+   * 
+   * <p>When comparing Names (with <code>equals</code>) all characters are
    * converted to lowercase. But you can get the original case sensitive
-   * string with the <code>toString()</code> method.
+   * string with the <code>toString()</code> method.</p>
    *
    * @since 1.2
    * @author Mark Wielaard (mark@klomp.org)
@@ -145,15 +146,15 @@ public class Attributes implements Cloneable, Map
      * Manifest manifest file with the following Names:
      * <ul>
      * <li> &lt;extension&gt;-Extension-Name:
-     * unique name of the extension
+     * unique name of the extension</li>
      * <li> &lt;extension&gt;-Specification-Version:
-     * minimum specification version
+     * minimum specification version</li>
      * <li> &lt;extension&gt;-Implementation-Version:
-     * minimum implementation version
+     * minimum implementation version</li>
      * <li> &lt;extension&gt;-Implementation-Vendor-Id:
-     * unique id of implementation vendor
+     * unique id of implementation vendor</li>
      * <li> &lt;extension&gt;-Implementation-URL:
-     * where the latest version of the extension library can be found
+     * where the latest version of the extension library can be found</li>
      * </ul>
      */
     public static final Name EXTENSION_LIST = new Name("Extension-List");
diff --git a/java/util/logging/ConsoleHandler.java b/java/util/logging/ConsoleHandler.java
index dd519b682..6d79c1dbf 100644
--- a/java/util/logging/ConsoleHandler.java
+++ b/java/util/logging/ConsoleHandler.java
@@ -67,7 +67,7 @@ package java.util.logging;
  *
  * <li><code>java.util.logging.ConsoleHandler.encoding</code> - specifies
  *     the name of the character encoding. Default value:
- *     the default platform encoding.
+ *     the default platform encoding.</li>
  *
  * </ul>
  *
diff --git a/java/util/logging/LogManager.java b/java/util/logging/LogManager.java
index 36216bc40..247570894 100644
--- a/java/util/logging/LogManager.java
+++ b/java/util/logging/LogManager.java
@@ -67,13 +67,12 @@ import java.lang.ref.WeakReference;
  * <code>java.util.logging.LogManager</code> is initialized.
  * The configuration process includes the subsequent steps:
  *
- * <ol>
+ * <ul>
  * <li>If the system property <code>java.util.logging.manager</code>
  *     is set to the name of a subclass of
  *     <code>java.util.logging.LogManager</code>, an instance of
  *     that subclass is created and becomes the global LogManager.
  *     Otherwise, a new instance of LogManager is created.</li>
- *     
  * <li>The <code>LogManager</code> constructor tries to create
  *     a new instance of the class specified by the system
  *     property <code>java.util.logging.config.class</code>.
@@ -91,14 +90,13 @@ import java.lang.ref.WeakReference;
  *     {@link #readConfiguration(java.io.InputStream)}.
  *     The name and location of this file are specified by the system
  *     property <code>java.util.logging.config.file</code>.</li>
- *
  * <li>If the system property <code>java.util.logging.config.file</code>
  *     is not set, however, the contents of the URL
  *     "{gnu.classpath.home.url}/logging.properties" are passed to
  *     {@link #readConfiguration(java.io.InputStream)}.
  *     Here, "{gnu.classpath.home.url}" stands for the value of
  *     the system property <code>gnu.classpath.home.url</code>.</li>
- * </ol>
+ * </ul>
  *
  * @author Sascha Brawer (brawer@acm.org)
  */
@@ -259,10 +257,10 @@ public class LogManager
    *
    * @param logger the logger to be added.
    *
-   * @return <code>true<code>if <code>logger</code> was added,
+   * @return <code>true</code>if <code>logger</code> was added,
    *         <code>false</code> otherwise.
    *
-   * @throws NullPointerException if <code>name<code> is
+   * @throws NullPointerException if <code>name</code> is
    *         <code>null</code>.
    */
   public synchronized boolean addLogger(Logger logger)
diff --git a/java/util/logging/MemoryHandler.java b/java/util/logging/MemoryHandler.java
index 825a6fa86..3c18b527d 100644
--- a/java/util/logging/MemoryHandler.java
+++ b/java/util/logging/MemoryHandler.java
@@ -35,10 +35,7 @@ module.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
-
+exception statement from your version. */
 
 package java.util.logging;
 
@@ -53,28 +50,22 @@ package java.util.logging;
  * value, a default is taken without an exception being thrown.
  *
  * <ul>
- *
  * <li><code>java.util.MemoryHandler.level</code> - specifies
  *     the initial severity level threshold. Default value:
  *     <code>Level.ALL</code>.</li>
- *
  * <li><code>java.util.MemoryHandler.filter</code> - specifies
  *     the name of a Filter class. Default value: No Filter.</li>
- *
  * <li><code>java.util.MemoryHandler.size</code> - specifies the
  *     maximum number of log records that are kept in the circular
  *     buffer.  Default value: 1000.</li>
- *
  * <li><code>java.util.MemoryHandler.push</code> - specifies the
  *     <code>pushLevel</code>. Default value:
  *     <code>Level.SEVERE</code>.</li>
- *
  * <li><code>java.util.MemoryHandler.target</code> - specifies the
  *     name of a subclass of {@link Handler} that will be used as the
  *     target handler.  There is no default value for this property;
  *     if it is not set, the no-argument MemoryHandler constructor
  *     will throw an exception.</li>
- *
  * </ul>
  *
  * @author Sascha Brawer (brawer@acm.org)
diff --git a/java/util/logging/SocketHandler.java b/java/util/logging/SocketHandler.java
index d9939a0f7..d4fc6e603 100644
--- a/java/util/logging/SocketHandler.java
+++ b/java/util/logging/SocketHandler.java
@@ -68,7 +68,7 @@ package java.util.logging;
  *
  * <li><code>java.util.SocketHandler.encoding</code> - specifies
  *     the name of the character encoding. Default value:
- *     the default platform encoding.
+ *     the default platform encoding.</li>
  *
  * <li><code>java.util.SocketHandler.host</code> - specifies
  *     the name of the host to which records are published.