merge with 1.8.1

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 9c752f5..5017ddd 100644 (file)
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 27 01:13:52 1993  Jim Meyering  (meyering@comco.com)
+
+       * Version 1.8.1.
+
 Mon Oct 25 20:16:33 1993  Jim Meyering  (meyering@comco.com)
 
        * sort.c: Accept but ignore -y0 for compatibility with Solaris 2.
@@ -16,8 +20,8 @@ Sun Oct 24 00:31:02 1993  Jim Meyering  (meyering@comco.com)
        * tail.c: Don't include <signal.h>.  It hasn't been necessary
        since the Dec 12, 1992 change.
 
-       * join.c (main): Accept `-v 1' again.  First adding --version
-       long option had broken it, though -v1 still worked.  Call
+       * join.c (main): Accept `-v 1' again.  Adding the --version
+       long option had broken it, although -v1 still worked.  Call
        parse_long_options instead of adding "help" and "version"
        to join's longopt strct.
        * Makefile.in [SOURCES, OBJECTS, DISTFILES]: Add long-options.c

diff --git a/old/textutils/NEWS b/old/textutils/NEWS
index 6530b19..544c64d 100644 (file)
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -1,4 +1,5 @@
 Major changes in release 1.9:
+* sort accepts and ignores -y[string] options for compatibilty with Solaris.
 * cat -v /dev/null works on more systems
 * od's --compatible (-C) flag renamed to --backward-compatible (-B)
 * --help and --version exit successfully