2001-11-06 Joseph S. Myers <jsm28@cam.ac.uk>

	* java/io/ByteArrayOutputStream.java,
	java/io/CharConversionException.java,
	java/io/PipedInputStream.java, java/io/PipedReader.java,
	java/io/PrintWriter.java, java/io/WriteAbortedException.java,
	java/net/BindException.java, java/net/ConnectException.java,
	java/net/ProtocolException.java, java/net/SocketException.java,
	java/net/UnknownServiceException.java,
	java/security/SecureRandom.java, java/security/SignedObject.java,
	java/security/cert/X509Certificate.java,
	java/security/interfaces/DSAKey.java,
	java/sql/DatabaseMetaData.java,
	java/text/DecimalFormatSymbols.java, java/util/Calendar.java,
	java/util/GregorianCalendar.java, java/util/Properties.java,
	java/util/Timer.java, java/util/jar/Attributes.java,
	java/util/jar/JarEntry.java, java/util/jar/JarInputStream.java,
	java/util/jar/JarOutputStream.java: Fix spelling errors.

26 files changed, 67 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index f9d858b7c..d646b6d2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2001-11-06  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* java/io/ByteArrayOutputStream.java,
+	java/io/CharConversionException.java,
+	java/io/PipedInputStream.java, java/io/PipedReader.java,
+	java/io/PrintWriter.java, java/io/WriteAbortedException.java,
+	java/net/BindException.java, java/net/ConnectException.java,
+	java/net/ProtocolException.java, java/net/SocketException.java,
+	java/net/UnknownServiceException.java,
+	java/security/SecureRandom.java, java/security/SignedObject.java,
+	java/security/cert/X509Certificate.java,
+	java/security/interfaces/DSAKey.java,
+	java/sql/DatabaseMetaData.java,
+	java/text/DecimalFormatSymbols.java, java/util/Calendar.java,
+	java/util/GregorianCalendar.java, java/util/Properties.java,
+	java/util/Timer.java, java/util/jar/Attributes.java,
+	java/util/jar/JarEntry.java, java/util/jar/JarInputStream.java,
+	java/util/jar/JarOutputStream.java: Fix spelling errors.
+
 2001-11-05  C. Brian Jones <cbj@gnu.org>
 	* configure.in: changed AC_CANONICAL_SYSTEM to AC_CANONICAL_TARGET.
 	Modify usage of target_vendor to target_cpu to link jni_md.h.
diff --git a/java/io/ByteArrayOutputStream.java b/java/io/ByteArrayOutputStream.java
index b26b9e427..65a98ae40 100644
--- a/java/io/ByteArrayOutputStream.java
+++ b/java/io/ByteArrayOutputStream.java
@@ -186,7 +186,7 @@ public class ByteArrayOutputStream extends OutputStream
     return new String (buf, 0, count, hibyte);
   }
 
-  // Resize buffer to accomodate new bytes.
+  // Resize buffer to accommodate new bytes.
   private void resize (int add)
   {
     if (count + add >= buf.length)
diff --git a/java/io/CharConversionException.java b/java/io/CharConversionException.java
index e090dfc60..b4fe77a6d 100644
--- a/java/io/CharConversionException.java
+++ b/java/io/CharConversionException.java
@@ -33,7 +33,7 @@ package java.io;
  */
 
 /**
-  * This exception is thrown to indicate that a problem occured with
+  * This exception is thrown to indicate that a problem occurred with
   * an attempted character conversion.
   *
   * @version 0.0
diff --git a/java/io/PipedInputStream.java b/java/io/PipedInputStream.java
index 328a1c0c1..5f2bf6fb7 100644
--- a/java/io/PipedInputStream.java
+++ b/java/io/PipedInputStream.java
@@ -194,7 +194,7 @@ public class PipedInputStream extends InputStream
 	else
 	  copylen = Math.min (len, buffer.length - in);
 
-	// Copy bytes until the pipe is filled, wrapping if neccessary.
+	// Copy bytes until the pipe is filled, wrapping if necessary.
 	System.arraycopy(buf, bufpos, buffer, in, copylen);
 	len -= copylen;
 	bufpos += copylen;
diff --git a/java/io/PipedReader.java b/java/io/PipedReader.java
index 07569eb1d..48c18ab0a 100644
--- a/java/io/PipedReader.java
+++ b/java/io/PipedReader.java
@@ -181,7 +181,7 @@ public class PipedReader extends Reader
 	  else
 	    copylen = Math.min (len, buffer.length - in);
 
-	  // Copy chars until the pipe is filled, wrapping if neccessary.
+	  // Copy chars until the pipe is filled, wrapping if necessary.
 	  System.arraycopy(buf, bufpos, buffer, in, copylen);
 	  len -= copylen;
 	  bufpos += copylen;
diff --git a/java/io/PrintWriter.java b/java/io/PrintWriter.java
index e6f962e38..3a4f73f76 100644
--- a/java/io/PrintWriter.java
+++ b/java/io/PrintWriter.java
@@ -57,7 +57,7 @@ public class PrintWriter extends Writer
   private boolean autoflush;
 
   /**
-   * This boolean indicates whether or not an error has ever occured
+   * This boolean indicates whether or not an error has ever occurred
    * on this stream.
    */
   private boolean error;
diff --git a/java/io/WriteAbortedException.java b/java/io/WriteAbortedException.java
index 0645ff797..f73d59023 100644
--- a/java/io/WriteAbortedException.java
+++ b/java/io/WriteAbortedException.java
@@ -1,4 +1,4 @@
-/* WriteAbortedException.java -- An exception occured while writing a 
+/* WriteAbortedException.java -- An exception occurred while writing a 
    serialization stream
    Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
diff --git a/java/net/BindException.java b/java/net/BindException.java
index 3aeedd3e6..7fb5cfdd0 100644
--- a/java/net/BindException.java
+++ b/java/net/BindException.java
@@ -1,4 +1,4 @@
-/* BindException.java -- An exception occured while binding to a socket
+/* BindException.java -- An exception occurred while binding to a socket
    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -33,7 +33,7 @@ package java.net;
  */
 
 /**
-  * This exception indicates that an error occured while attempting to bind
+  * This exception indicates that an error occurred while attempting to bind
   * socket to a particular port.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
diff --git a/java/net/ConnectException.java b/java/net/ConnectException.java
index 0ac64c888..fc234a576 100644
--- a/java/net/ConnectException.java
+++ b/java/net/ConnectException.java
@@ -1,4 +1,4 @@
-/* ConnectException.java -- An exception occured while connecting to a host
+/* ConnectException.java -- An exception occurred while connecting to a host
    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -34,7 +34,7 @@ package java.net;
  */
 
 /**
-  * This exception indicates that an error occured while attempting to
+  * This exception indicates that an error occurred while attempting to
   * connect to a remote host.  Often this indicates that the remote host
   * refused the connection (ie, is not listening on the target socket).
   *
diff --git a/java/net/ProtocolException.java b/java/net/ProtocolException.java
index 5556f28ab..9c921e6e7 100644
--- a/java/net/ProtocolException.java
+++ b/java/net/ProtocolException.java
@@ -1,4 +1,4 @@
-/* ProtocolException.java -- A low level protocol error occured
+/* ProtocolException.java -- A low level protocol error occurred
    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -34,7 +34,7 @@ package java.net;
 
 /**
   * This exception indicates that some sort of low level protocol
-  * exception occured.  Look in the descriptive message (if any) for
+  * exception occurred.  Look in the descriptive message (if any) for
   * details on what went wrong
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
diff --git a/java/net/SocketException.java b/java/net/SocketException.java
index 37135f3a5..3520d4b92 100644
--- a/java/net/SocketException.java
+++ b/java/net/SocketException.java
@@ -1,4 +1,4 @@
-/* SocketException.java -- An exception occured while performing a socket op
+/* SocketException.java -- An exception occurred while performing a socket op
    Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -31,7 +31,7 @@ package java.net;
  */
 
 /**
-  * This exception indicates that a generic error occured related to an
+  * This exception indicates that a generic error occurred related to an
   * operation on a socket.  Check the descriptive message (if any) for
   * details on the nature of this error
   *
diff --git a/java/net/UnknownServiceException.java b/java/net/UnknownServiceException.java
index f82607a50..b890d2bc0 100644
--- a/java/net/UnknownServiceException.java
+++ b/java/net/UnknownServiceException.java
@@ -1,4 +1,4 @@
-/* UnknownServiceException.java -- A service error occured
+/* UnknownServiceException.java -- A service error occurred
    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/java/security/SecureRandom.java b/java/security/SecureRandom.java
index 597d07799..00fdca260 100644
--- a/java/security/SecureRandom.java
+++ b/java/security/SecureRandom.java
@@ -55,7 +55,7 @@ public class SecureRandom extends Random
      It is not seeded and should be seeded using setSeed or else
      on the first call to getnextBytes it will force a seed.
 
-     It is maintained for backwards compatability and programs
+     It is maintained for backwards compatibility and programs
      should use getInstance.
    */
   public SecureRandom()
@@ -115,7 +115,7 @@ public class SecureRandom extends Random
      It is seeded with the passed function and is useful if the user
      has access to hardware random device (like a radiation detector).
 
-     It is maintained for backwards compatability and programs
+     It is maintained for backwards compatibility and programs
      should use getInstance.
 
      @param seed Seed bytes for class
diff --git a/java/security/SignedObject.java b/java/security/SignedObject.java
index 34f80e967..40aeba794 100644
--- a/java/security/SignedObject.java
+++ b/java/security/SignedObject.java
@@ -80,7 +80,7 @@ public final class SignedObject implements Serializable
      @param signingKey the key to sign with
      @param signingEngine the signature engine to use
 
-     @throws IOException serialization error occured
+     @throws IOException serialization error occurred
      @throws InvalidKeyException invalid key
      @throws SignatureException signing error
    */
@@ -108,8 +108,8 @@ public final class SignedObject implements Serializable
 
      @return the encapsulated object
 
-     @throws IOException de-serialization error occured
-     @throws ClassNotFoundException de-serialization error occured
+     @throws IOException de-serialization error occurred
+     @throws ClassNotFoundException de-serialization error occurred
    */
   public Object getObject() throws IOException, ClassNotFoundException
   {
diff --git a/java/security/cert/X509Certificate.java b/java/security/cert/X509Certificate.java
index 46f47f615..db5196465 100644
--- a/java/security/cert/X509Certificate.java
+++ b/java/security/cert/X509Certificate.java
@@ -288,7 +288,7 @@ public abstract class X509Certificate extends Certificate implements X509Extensi
 
      @return the DER encoded tbsCertificate
 
-     @throws CertificateEncodingException if encoding error occured
+     @throws CertificateEncodingException if encoding error occurred
   */
   public abstract byte[] getTBSCertificate() throws CertificateEncodingException;
 
diff --git a/java/security/interfaces/DSAKey.java b/java/security/interfaces/DSAKey.java
index 1670b5a4d..06fdec15d 100644
--- a/java/security/interfaces/DSAKey.java
+++ b/java/security/interfaces/DSAKey.java
@@ -1,4 +1,4 @@
-/* DSAKey.java -- Interface for Digital Signature Algorith key
+/* DSAKey.java -- Interface for Digital Signature Algorithm key
    Copyright (C) 1998 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/java/sql/DatabaseMetaData.java b/java/sql/DatabaseMetaData.java
index 92ed44e45..2340d3133 100644
--- a/java/sql/DatabaseMetaData.java
+++ b/java/sql/DatabaseMetaData.java
@@ -47,7 +47,7 @@ public static final int bestRowUnknown = 0;
 public static final int bestRowNotPseudo = 1;
 
 /**
-  * The best row identifer is a pseudo-column.
+  * The best row identifier is a pseudo-column.
   */
 public static final int bestRowPseudo = 2;
 
@@ -58,12 +58,12 @@ public static final int bestRowPseudo = 2;
 public static final int bestRowTemporary = 0;
 
 /**
-  * The best row identifer is valid to the end of the transaction.
+  * The best row identifier is valid to the end of the transaction.
   */
 public static final int bestRowTransaction = 1;
 
 /**
-  * The best row identifer is valid to the end of the session.
+  * The best row identifier is valid to the end of the session.
   */
 public static final int bestRowSession = 2;
 
@@ -2696,7 +2696,7 @@ supportsBatchUpdates() throws SQLException;
   * <li>TYPE_SCEHM - The schema name, which may be <code>null</code>.
   * <li>TYPE_NAME - The user defined data type name.
   * <li>CLASS_NAME - The Java class name this type maps to.
-  * <li>DATA_TYPE - A type identifer from <code>Types</code> for this type.
+  * <li>DATA_TYPE - A type identifier from <code>Types</code> for this type.
   * This will be one of <code>JAVA_OBJECT</code>, <code>STRUCT</code>, or
   * <code>DISTINCT</code>.
   * <li>REMARKS - Comments about this data type.
@@ -2708,7 +2708,7 @@ supportsBatchUpdates() throws SQLException;
   * @param schema The schema to retrieve information from, or the empty string
   * to return entities not associated with a schema.
   * @param typePattern The type name pattern to match.
-  * @param types The type identifer patterns (from <code>Types</code>) to
+  * @param types The type identifier patterns (from <code>Types</code>) to
   * match.
   *
   * @return A <code>ResultSet</code> with the requested type information
diff --git a/java/text/DecimalFormatSymbols.java b/java/text/DecimalFormatSymbols.java
index bc5776a56..7bdae5d6b 100644
--- a/java/text/DecimalFormatSymbols.java
+++ b/java/text/DecimalFormatSymbols.java
@@ -476,7 +476,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable
   }
 
   /**
-   * This method sets the charcter used to represen the digit zero.
+   * This method sets the character used to represent the digit zero.
    *
    * @param zeroDigit The character used to represent the digit zero.
    */
diff --git a/java/util/Calendar.java b/java/util/Calendar.java
index 814941125..a807a3616 100644
--- a/java/util/Calendar.java
+++ b/java/util/Calendar.java
@@ -445,7 +445,7 @@ public abstract class Calendar implements Serializable, Cloneable
   }
 
   /**
-   * Gets the set of locales for which a Calendar is availiable.
+   * Gets the set of locales for which a Calendar is available.
    * @exception MissingResourceException if locale data couldn't be found.
    * @return the set of locales.
    */
@@ -682,7 +682,7 @@ public abstract class Calendar implements Serializable, Cloneable
    * Compares the given calendar with this.  
    * @param o the object to that we should compare.
    * @return true, if the given object is a calendar, that represents
-   * the same time (but doesn't neccessary have the same fields).
+   * the same time (but doesn't necessary have the same fields).
    */
   public boolean equals(Object o)
   {
@@ -892,7 +892,7 @@ public abstract class Calendar implements Serializable, Cloneable
 
   /**
    * Gets the actual minimum value that is allowed for the specified field.
-   * This value is dependant on the values of the other fields.
+   * This value is dependent on the values of the other fields.
    * @param field the time field. One of the time field constants.
    * @return the actual minimum value.
    * @since jdk1.2
@@ -902,7 +902,7 @@ public abstract class Calendar implements Serializable, Cloneable
 
   /**
    * Gets the actual maximum value that is allowed for the specified field.
-   * This value is dependant on the values of the other fields.
+   * This value is dependent on the values of the other fields.
    * @param field the time field. One of the time field constants.
    * @return the actual maximum value.  
    * @since jdk1.2
diff --git a/java/util/GregorianCalendar.java b/java/util/GregorianCalendar.java
index 4c6e23c53..f2141e0c5 100644
--- a/java/util/GregorianCalendar.java
+++ b/java/util/GregorianCalendar.java
@@ -216,7 +216,7 @@ public class GregorianCalendar extends Calendar
    * Get the linear time in milliseconds since the epoch.  If you
    * specify a nonpositive year it is interpreted as BC as
    * following: 0 is 1 BC, -1 is 2 BC and so on.  The date is
-   * interpreted as gregorian if the change occured before that date.
+   * interpreted as gregorian if the change occurred before that date.
    *
    * @param year the year of the date.
    * @param dayOfYear the day of year of the date; 1 based.
@@ -627,7 +627,7 @@ public class GregorianCalendar extends Calendar
    * Compares the given calender with this.  
    * @param o the object to that we should compare.
    * @return true, if the given object is a calendar, that represents
-   * the same time (but doesn't neccessary have the same fields).
+   * the same time (but doesn't necessary have the same fields).
    * @XXX Should we check if time zones, locale, cutover etc. are equal?
    */
   public boolean equals(Object o)
@@ -973,7 +973,7 @@ public class GregorianCalendar extends Calendar
 
   /**
    * Gets the actual minimum value that is allowed for the specified field.
-   * This value is dependant on the values of the other fields.  Note that
+   * This value is dependent on the values of the other fields.  Note that
    * this calls <code>complete()</code> if not enough fields are set.  This
    * can have ugly side effects.
    * @param field the time field. One of the time field constants.
@@ -1001,7 +1001,7 @@ public class GregorianCalendar extends Calendar
 
   /**
    * Gets the actual maximum value that is allowed for the specified field.
-   * This value is dependant on the values of the other fields.  Note that
+   * This value is dependent on the values of the other fields.  Note that
    * this calls <code>complete()</code> if not enough fields are set.  This
    * can have ugly side effects.
    * @param field the time field. One of the time field constants.
diff --git a/java/util/Properties.java b/java/util/Properties.java
index 457048c1d..ee39a01b5 100644
--- a/java/util/Properties.java
+++ b/java/util/Properties.java
@@ -125,7 +125,7 @@ public class Properties extends Hashtable
    * </pre>
    *
    * @param in the input stream
-   * @exception IOException if an error occured when reading
+   * @exception IOException if an error occurred when reading
    * from the input.  */
   public void load(InputStream inStream) throws IOException
   {
diff --git a/java/util/Timer.java b/java/util/Timer.java
index d00c93768..32c0bea3b 100644
--- a/java/util/Timer.java
+++ b/java/util/Timer.java
@@ -39,8 +39,8 @@ package java.util;
  * scheduling guarantees more or less that the task will be executed at a
  * specific time, but if there is ever a delay in execution then the period
  * between successive executions will be shorter. The first method of
- * repeated scheduling is prefered for repeated tasks in response to user
- * interaction, the second method of repeated scheduling is prefered for tasks
+ * repeated scheduling is preferred for repeated tasks in response to user
+ * interaction, the second method of repeated scheduling is preferred for tasks
  * that act like alarms.
  * <p>
  * The Timer keeps a binary heap as a task priority queue which means that
@@ -65,7 +65,7 @@ public class Timer
     /** Default size of this queue */
     private final int DEFAULT_SIZE = 32;
 
-    /** Wheter to return null when there is nothing in the queue */
+    /** Whether to return null when there is nothing in the queue */
     private boolean nullOnEmpty;
 
     /**
@@ -375,7 +375,7 @@ public class Timer
   private boolean canceled;
 
   /**
-   * Creates a new Timer with a non deamon Thread as Scheduler, with normal
+   * Creates a new Timer with a non daemon Thread as Scheduler, with normal
    * priority and a default name.
    */
   public Timer()
@@ -384,7 +384,7 @@ public class Timer
   }
 
   /**
-   * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+   * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
    * with normal priority and a default name.
    */
   public Timer(boolean daemon)
@@ -393,7 +393,7 @@ public class Timer
   }
 
   /**
-   * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+   * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
    * with the priority given and a default name.
    */
   private Timer(boolean daemon, int priority)
@@ -402,7 +402,7 @@ public class Timer
   }
 
   /**
-   * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+   * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
    * with the priority and name given.E
    */
   private Timer(boolean daemon, int priority, String name)
diff --git a/java/util/jar/Attributes.java b/java/util/jar/Attributes.java
index b18b5d8ca..ce1c9abaa 100644
--- a/java/util/jar/Attributes.java
+++ b/java/util/jar/Attributes.java
@@ -45,7 +45,7 @@ import java.util.Set;
  * manipulating the Attributes more or less type safe.
  * <p>
  * Most of the methods are wrappers to implement the Map interface. The really
- * usefull and often used methods are <code>getValue(Name)</code> and
+ * useful and often used methods are <code>getValue(Name)</code> and
  * <code>getValue(String)</code>. If you actually want to set attributes you
  * may want to use the <code>putValue(String, String)</code> method
  * (sorry there is no public type safe <code>putValue(Name, String)</code>
diff --git a/java/util/jar/JarEntry.java b/java/util/jar/JarEntry.java
index 7238d5b51..fa27169d5 100644
--- a/java/util/jar/JarEntry.java
+++ b/java/util/jar/JarEntry.java
@@ -46,7 +46,7 @@ import java.util.zip.ZipEntry;
 
 public class JarEntry extends ZipEntry
 {
-  // (Packge local) fields
+  // (Package local) fields
 
   Attributes attr;
   Certificate certs[];
diff --git a/java/util/jar/JarInputStream.java b/java/util/jar/JarInputStream.java
index c63758e4d..f077f1be6 100644
--- a/java/util/jar/JarInputStream.java
+++ b/java/util/jar/JarInputStream.java
@@ -75,7 +75,7 @@ public class JarInputStream extends ZipInputStream
    * tries to verify all the entry signatures while reading.
    *
    * @param in InputStream to read the jar from
-   * @param verify wheter or not to verify the manifest entries
+   * @param verify whether or not to verify the manifest entries
    * @exception IOException when an error occurs when opening or reading
    */
   public JarInputStream(InputStream in, boolean verify) throws IOException
diff --git a/java/util/jar/JarOutputStream.java b/java/util/jar/JarOutputStream.java
index ca7729df0..c073819f5 100644
--- a/java/util/jar/JarOutputStream.java
+++ b/java/util/jar/JarOutputStream.java
@@ -93,7 +93,7 @@ public class JarOutputStream extends ZipOutputStream
    * This implementation just calls <code>super.putNextEntre()</code>.
    *
    * @param entry The information for the next entry
-   * @exception IOException when some unexpected I/O exception occured
+   * @exception IOException when some unexpected I/O exception occurred
    */
   public void putNextEntry(ZipEntry entry) throws IOException
   {