Another license fix, in section five changed plural "names"

Timothy O'Brien · Timothy O'Brien · commit c76ca5ec26d4 · 2003-10-05T21:45:49.000Z
to singular "name" git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@130205 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
diff --git a/src/java/org/apache/commons/codec/BinaryDecoder.java b/src/java/org/apache/commons/codec/BinaryDecoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
  *
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: BinaryDecoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: BinaryDecoder.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface BinaryDecoder extends Decoder {
 
diff --git a/src/java/org/apache/commons/codec/BinaryEncoder.java b/src/java/org/apache/commons/codec/BinaryEncoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
  * 
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: BinaryEncoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: BinaryEncoder.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface BinaryEncoder extends Encoder {
     
diff --git a/src/java/org/apache/commons/codec/Decoder.java b/src/java/org/apache/commons/codec/Decoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -69,7 +69,7 @@
  * 
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: Decoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: Decoder.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface Decoder {
 
diff --git a/src/java/org/apache/commons/codec/DecoderException.java b/src/java/org/apache/commons/codec/DecoderException.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
  * 
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: DecoderException.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: DecoderException.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public class DecoderException extends Exception {
 
diff --git a/src/java/org/apache/commons/codec/Encoder.java b/src/java/org/apache/commons/codec/Encoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -65,7 +65,7 @@
  *
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: Encoder.java,v 1.6 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: Encoder.java,v 1.7 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface Encoder {
     
diff --git a/src/java/org/apache/commons/codec/EncoderException.java b/src/java/org/apache/commons/codec/EncoderException.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -65,7 +65,7 @@
  * 
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: EncoderException.java,v 1.6 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: EncoderException.java,v 1.7 2003/10/05 21:45:48 tobrien Exp $
  */
 public class EncoderException extends Exception {
 
diff --git a/src/java/org/apache/commons/codec/StringDecoder.java b/src/java/org/apache/commons/codec/StringDecoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
  *
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: StringDecoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: StringDecoder.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface StringDecoder extends Decoder {
     
diff --git a/src/java/org/apache/commons/codec/StringEncoder.java b/src/java/org/apache/commons/codec/StringEncoder.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
  *
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: StringEncoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: StringEncoder.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public interface StringEncoder extends Encoder {
     
diff --git a/src/java/org/apache/commons/codec/StringEncoderComparator.java b/src/java/org/apache/commons/codec/StringEncoderComparator.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -70,7 +70,7 @@
  *
  * @author Tim O'Brien
  * @author Gary Gregory
- * @version $Id: StringEncoderComparator.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: StringEncoderComparator.java,v 1.6 2003/10/05 21:45:48 tobrien Exp $
  */
 public class StringEncoderComparator implements Comparator {
 
diff --git a/src/java/org/apache/commons/codec/base64/Base64.java b/src/java/org/apache/commons/codec/base64/Base64.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -77,7 +77,7 @@
  * @deprecated This class has been replaced by 
  *             {@link org.apache.commons.codec.binary.Base64}
  * 
- * @version $Id: Base64.java,v 1.7 2003/10/05 21:34:22 tobrien Exp $
+ * @version $Id: Base64.java,v 1.8 2003/10/05 21:45:49 tobrien Exp $
  */
 public final class Base64 {
 
diff --git a/src/java/org/apache/commons/codec/binary/Base64.java b/src/java/org/apache/commons/codec/binary/Base64.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -75,7 +75,7 @@
   * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
   * @author Tim O'Brien
   * @since 1.0-dev
-  * @version $Id: Base64.java,v 1.9 2003/10/05 21:34:21 tobrien Exp $
+  * @version $Id: Base64.java,v 1.10 2003/10/05 21:45:49 tobrien Exp $
   */
 public class Base64 implements BinaryEncoder, BinaryDecoder {
 
diff --git a/src/java/org/apache/commons/codec/binary/Hex.java b/src/java/org/apache/commons/codec/binary/Hex.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -67,7 +67,7 @@
  * 
  * @author <a href="mailto:siege@preoccupied.net">Christopher O'Brien</a>
  * @author Tim O'Brien
- * @version $Id: Hex.java,v 1.7 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: Hex.java,v 1.8 2003/10/05 21:45:49 tobrien Exp $
  */
 public class Hex implements BinaryEncoder, BinaryDecoder {
 
diff --git a/src/java/org/apache/commons/codec/digest/DigestUtils.java b/src/java/org/apache/commons/codec/digest/DigestUtils.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
diff --git a/src/java/org/apache/commons/codec/language/DoubleMetaphone.java b/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -72,7 +72,7 @@
  * </ul>
  * 
  * @author <a href="mailto:ben@walstrum.com">Benjamin Walstrum</a>
- * @version $Id: DoubleMetaphone.java,v 1.10 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: DoubleMetaphone.java,v 1.11 2003/10/05 21:45:48 tobrien Exp $
  */
 public class DoubleMetaphone implements StringEncoder {
 
diff --git a/src/java/org/apache/commons/codec/language/Metaphone.java b/src/java/org/apache/commons/codec/language/Metaphone.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -71,7 +71,7 @@
  * @author wbrogden@bga.com
  * @author bayard@generationjava.com
  * @author Tim O'Brien
- * @version $Id: Metaphone.java,v 1.6 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: Metaphone.java,v 1.7 2003/10/05 21:45:48 tobrien Exp $
  */
 public class Metaphone implements StringEncoder {
 
diff --git a/src/java/org/apache/commons/codec/language/RefinedSoundex.java b/src/java/org/apache/commons/codec/language/RefinedSoundex.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -68,7 +68,7 @@
  * 
  * @author Tim O'Brien
  * @author ggregory@seagullsw.com
- * @version $Id: RefinedSoundex.java,v 1.8 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: RefinedSoundex.java,v 1.9 2003/10/05 21:45:48 tobrien Exp $
  */
 public class RefinedSoundex implements StringEncoder {
 
diff --git a/src/java/org/apache/commons/codec/language/Soundex.java b/src/java/org/apache/commons/codec/language/Soundex.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -68,7 +68,7 @@
  * @author bayard@generationjava.com
  * @author Tim O'Brien
  * @author ggregory@seagullsw.com
- * @version $Id: Soundex.java,v 1.7 2003/10/05 21:34:21 tobrien Exp $
+ * @version $Id: Soundex.java,v 1.8 2003/10/05 21:45:48 tobrien Exp $
  */
 public class Soundex implements StringEncoder {
 
diff --git a/src/java/org/apache/commons/codec/net/URLCodec.java b/src/java/org/apache/commons/codec/net/URLCodec.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -86,7 +86,7 @@
  * 
  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
- * @version $Id: URLCodec.java,v 1.6 2003/10/05 21:34:22 tobrien Exp $
+ * @version $Id: URLCodec.java,v 1.7 2003/10/05 21:45:49 tobrien Exp $
  */
 
 public class URLCodec 
diff --git a/src/test/org/apache/commons/codec/BinaryEncoderAbstractTest.java b/src/test/org/apache/commons/codec/BinaryEncoderAbstractTest.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -60,7 +60,7 @@
 import junit.framework.TestCase;
 
 /**
- * @version $Revision: 1.4 $ $Date: 2003/10/05 21:34:22 $
+ * @version $Revision: 1.5 $ $Date: 2003/10/05 21:45:49 $
  * @author Rodney Waldhoff
  * @author Tim O'Brien
  */
diff --git a/src/test/org/apache/commons/codec/StringEncoderAbstractTest.java b/src/test/org/apache/commons/codec/StringEncoderAbstractTest.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -60,7 +60,7 @@
 import junit.framework.TestCase;
 
 /**
- * @version $Revision: 1.4 $ $Date: 2003/10/05 21:34:22 $
+ * @version $Revision: 1.5 $ $Date: 2003/10/05 21:45:49 $
  * @author Rodney Waldhoff
  * @author Tim O'Brien
  */
diff --git a/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java b/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,7 @@
 import org.apache.commons.codec.language.Soundex;
 
 /**
- * @version $Revision: 1.4 $ $Date: 2003/10/05 21:34:22 $
+ * @version $Revision: 1.5 $ $Date: 2003/10/05 21:45:49 $
  * @author Tim O'Brien
  */
 public class StringEncoderComparatorTest extends TestCase {
diff --git a/src/test/org/apache/commons/codec/base64/Base64Test.java b/src/test/org/apache/commons/codec/base64/Base64Test.java
@@ -31,7 +31,7 @@
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their names without prior 
+ *    "Apache" nor may "Apache" appear in their name without prior 
  *    written permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -66,7 +66,7 @@
 import junit.framework.TestSuite;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/10/05 21:34:22 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/05 21:45:49 $
  * @author Scott Sanders
  * @author Rodney Waldhoff
  */
diff --git a/src/test/org/apache/commons/codec/binary/Base64Test.java b/src/test/org/apache/commons/codec/binary/Base64Test.java
diff --git a/src/test/org/apache/commons/codec/binary/HexTest.java b/src/test/org/apache/commons/codec/binary/HexTest.java
diff --git a/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java b/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java
diff --git a/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java b/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
diff --git a/src/test/org/apache/commons/codec/language/MetaphoneTest.java b/src/test/org/apache/commons/codec/language/MetaphoneTest.java
diff --git a/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java b/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java
diff --git a/src/test/org/apache/commons/codec/language/SoundexTest.java b/src/test/org/apache/commons/codec/language/SoundexTest.java
diff --git a/src/test/org/apache/commons/codec/net/URLCodecTest.java b/src/test/org/apache/commons/codec/net/URLCodecTest.java

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* permission, please contact apache@apache.org.`
`32`	`32`	`*`
`33`	`33`	`* 5. Products derived from this software may not be called "Apache",`
`34`		`- * "Apache" nor may "Apache" appear in their names without prior`
	`34`	`+ * "Apache" nor may "Apache" appear in their name without prior`
`35`	`35`	`* written permission of the Apache Software Foundation.`
`36`	`36`	`*`
`37`	`37`	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED