Update

3 files changed, 81 insertions, 106 deletions

diff --git a/README b/README
index 84f0456..d8b2881 100644
--- a/README
+++ b/README
@@ -7,7 +7,10 @@ NET-TOOLS	A collection of programs that form the base set of the
 
 This package includes the important tools for controlling the network
 subsystem of the Linux kernel.  This includes arp, hostname, ifconfig,
-netstat, rarp and route.
+netstat, rarp and route.  Additionally, this package contains
+utilities relating to particular network hardware types (plipconfig,
+slattach) and advanced aspects of IP configuration (iptunnel,
+ipmaddr).
 
 Please include the output of "program --version" when reporting bugs.
 
@@ -28,11 +31,11 @@ Contents:
                           Notes
                           -----
 
-Notable changes since 1.52 include:
+This is net-tools 1.52.  Notable changes since 1.51 include:
 
  - Jean-Michel Vansteene updated the French translation.
 
-This is net-tools 1.51.  Notable changes since 1.50 include:
+Notable changes since 1.50 include:
 
  - Tuan Hoang added support to netstat for printing multicast group 
    information (option --groups)
@@ -42,73 +45,36 @@ This is net-tools 1.51.  Notable changes since 1.50 include:
  - some bugs and compilation problems have been fixed
  - Ralf Bächle provided a translation to German
 
-Notable changes since 1.49 include:
-
- - netstat supports a new option `--listening' to show only listening
-   sockets.
- - netstat -s is improved.
- - route/netstat -r display the routing cache correctly.
- - plipconfig and slattach are included
- - ipmaddr and iptunnel are included (courtesy of Alexey Kuznetsov)
- - as ever, various bugs have been fixed
-
-Notable changes since 1.48 include:
-
- - IP masquerading support is now selectable.
- - The -t and -u switches to netstat now work as expected.
- - AX.25 support in netstat has been improved.
- - Various other bugs have been fixed.
-
-Notable changes since 1.47 include:
-
- - Many bugs have been fixed.
-
-Notable changes since 1.46 include:
-
- - Support for interface aliases with recent kernels is improved.
- - Ifconfig et al can now auto-detect which address families are supported
-   on your system.  This avoids triggering kmod requests for all missing
-   protocols whenever ifconfig runs.
- - Support for extended SLIP options has been added
-
-Notable changes since 1.45 include:
-
- - The internationalisation support has been reworked (see below)
- - Support for extra hardware types has been added.
- - Various bugs have been fixed.
-
 You need kernel 2.0 or later to use these programs.  These programs
-should compile cleanly with either glibc or libc5.  The `iptunnel' and
-`ipmaddr' programs require kernel version 2.2 or later.
+should compile cleanly with both glibc (version 2.0 or 2.1) and libc5.
+The `iptunnel' and `ipmaddr' programs require kernel version 2.2 or
+later.
 
 The NLS support was changed from catgets to GNU gettext by Arnaldo
 Carvalho de Melo <acme@conectiva.com.br> in June, 1998, to make the
-source more readable. A translation to brazilian portuguese (pt_BR) is
-available and others are welcome!
-
-If your system has no support for GNU gettext then `make install' will
-probably fail in the po directory.  This is harmless and can be ignored;
-all the tools and manual pages are already installed at this point.
+source more readable. Translations to brazilian portuguese (pt_BR),
+German (de) and French (fr) are available and others are welcome!
 
 ipfw has been removed from the distribution.  Use ipfwadm instead; get
 it at <ftp://ftp.xos.nl/pub/linux/ipfwadm/>.
 
-route/netstat -r do not yet support different AF cleanly.  IPX/DDP/AX25
-people, please feel free to add the code.
+route/netstat -r do not yet support different address families
+cleanly.  IPX/DDP/AX25 people, please feel free to add the code.
 
 ifconfig now supports changing media types for interfaces.  This requires
-a recent 2.1.x or 2.2.x kernel, and many devices do not support it yet.
+a version 2.2 kernel, and many devices do not support it yet.
 
 The documentation is slimmed down.  I think most of it was out of
 date.
 
-The tools now support the layout of the 2.2.0 /proc files (Bernd Eckenfels).
+The tools now support the layout of the 2.2 kernel /proc files (Bernd
+Eckenfels).
 
-Some configuration options require recent 2.1.x or 2.2.x kernels
-and/or particular versions of the C library.  The defaults should be
-safe for all common environments but some of the more esoteric
-hardware and protocol families may be more touchy.  Feel free to send
-patches if you have problems.
+Some configuration options require kernel version 2.2 and/or
+particular versions of the C library.  The defaults should be safe for
+all common environments but some of the more esoteric hardware and
+protocol families may be more touchy.  Feel free to send patches if
+you have problems.
 
 Phil Blundell
 philb@gnu.org
diff --git a/README.ipv6 b/README.ipv6
index ac64fd8..29ebd8b 100644
--- a/README.ipv6
+++ b/README.ipv6
@@ -11,14 +11,15 @@ a patch I would be happy to add a pointer to it here.)  If you have the
 option you might consider changing to glibc instead (see below) in which
 case you can use the header files supplied with the C library.
 
-If you use glibc, you should get the latest 2.1 release (or pre-release)
-that you can find; look in sourceware.cygnus.com:/pub/glibc.  2.1 prereleases
-have version numbers 2.0.x where x is greater than 90.  With such a libc
-installed there should be no need to edit the Makefile or patch net-tools.
+If you use glibc, you should ensure that you have version 2.1 or later
+installed.  The 2.1 release is available from
+<ftp://sourceware.cygnus.com/pub/glibc among> other places.  With this
+version of the C library there should be no need to edit the Makefile
+or apply any patches to net-tools.
 
-Version 2.0 of glibc has no support for IPv6.  Patches did exist at one
-point but they are now seriously outdated.  Consider upgrading to glibc 2.1
-instead.
+Version 2.0 of glibc has no support for IPv6; patches did exist at one
+point but they are now seriously outdated.  Instead you should upgrade
+to glibc 2.1.
 
 BUGS
 ----
diff --git a/po/net-tools.pot b/po/net-tools.pot
index 8929117..e69d70b 100644
--- a/po/net-tools.pot
+++ b/po/net-tools.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-04-06 10:34+0200\n"
+"POT-Creation-Date: 1999-04-18 20:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1219,7 +1219,7 @@ msgid "                  [nibble NN] [trigger NN]\n"
 msgstr ""
 
 #: ../plipconfig.c:68
-msgid "       plipconfig -V\n"
+msgid "       plipconfig -V | --version\n"
 msgstr ""
 
 #: ../plipconfig.c:74
@@ -1227,100 +1227,104 @@ msgstr ""
 msgid "%s\tnibble %lu  trigger %lu\n"
 msgstr ""
 
-#: ../iptunnel.c:63
+#: ../iptunnel.c:75
 msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
 msgstr ""
 
-#: ../iptunnel.c:64
+#: ../iptunnel.c:76
 msgid ""
 "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
 msgstr ""
 
-#: ../iptunnel.c:65
+#: ../iptunnel.c:77
 msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
 msgstr ""
 
-#: ../iptunnel.c:66
+#: ../iptunnel.c:78
+msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+msgstr ""
+
+#: ../iptunnel.c:79
 msgid ""
-"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+"       iptunnel -V | --version\n"
 "\n"
 msgstr ""
 
-#: ../iptunnel.c:67
+#: ../iptunnel.c:80
 msgid "Where: NAME := STRING\n"
 msgstr ""
 
-#: ../iptunnel.c:68
+#: ../iptunnel.c:81
 msgid "       ADDR := { IP_ADDRESS | any }\n"
 msgstr ""
 
-#: ../iptunnel.c:69
+#: ../iptunnel.c:82
 msgid "       TOS  := { NUMBER | inherit }\n"
 msgstr ""
 
-#: ../iptunnel.c:70
+#: ../iptunnel.c:83
 msgid "       TTL  := { 1..255 | inherit }\n"
 msgstr ""
 
-#: ../iptunnel.c:71
+#: ../iptunnel.c:84
 msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
 msgstr ""
 
-#: ../iptunnel.c:309
+#: ../iptunnel.c:322
 msgid "Keys are not allowed with ipip and sit.\n"
 msgstr ""
 
-#: ../iptunnel.c:329
+#: ../iptunnel.c:342
 msgid "Broadcast tunnel requires a source address.\n"
 msgstr ""
 
-#: ../iptunnel.c:344
+#: ../iptunnel.c:357
 msgid "ttl != 0 and noptmudisc are incompatible\n"
 msgstr ""
 
-#: ../iptunnel.c:356
+#: ../iptunnel.c:369
 msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
 msgstr ""
 
-#: ../iptunnel.c:394
+#: ../iptunnel.c:407
 #, c-format
 msgid "%s: %s/ip  remote %s  local %s "
 msgstr ""
 
-#: ../iptunnel.c:398
+#: ../iptunnel.c:411
 msgid "unknown"
 msgstr ""
 
-#: ../iptunnel.c:430
+#: ../iptunnel.c:443
 msgid "  Drop packets out of sequence.\n"
 msgstr ""
 
-#: ../iptunnel.c:432
+#: ../iptunnel.c:445
 msgid "  Checksum in received packet is required.\n"
 msgstr ""
 
-#: ../iptunnel.c:434
+#: ../iptunnel.c:447
 msgid "  Sequence packets on output.\n"
 msgstr ""
 
-#: ../iptunnel.c:436
+#: ../iptunnel.c:449
 msgid "  Checksum output packets.\n"
 msgstr ""
 
-#: ../iptunnel.c:464
+#: ../iptunnel.c:477
 msgid "Wrong format of /proc/net/dev. Sorry.\n"
 msgstr ""
 
-#: ../iptunnel.c:477
+#: ../iptunnel.c:490
 #, c-format
 msgid "Failed to get type of [%s]\n"
 msgstr ""
 
-#: ../iptunnel.c:493
+#: ../iptunnel.c:506
 msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
 msgstr ""
 
-#: ../iptunnel.c:496
+#: ../iptunnel.c:509
 msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
 msgstr ""
 
@@ -2238,86 +2242,90 @@ msgstr ""
 msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
 msgstr ""
 
-#: ../ipmaddr.c:256
+#: ../ipmaddr.c:57
+msgid "       ipmaddr -V | -version\n"
+msgstr ""
+
+#: ../ipmaddr.c:257
 #, c-format
 msgid "family %d "
 msgstr ""
 
-#: ../ipmaddr.c:265
+#: ../ipmaddr.c:266
 #, c-format
 msgid " users %d"
 msgstr ""
 
-#: ../ipmaddr.c:351
+#: ../ipmaddr.c:352
 msgid "Cannot create socket"
 msgstr ""
 
-#: ../slattach.c:174
+#: ../slattach.c:175
 #, c-format
 msgid "slattach: /dev/%s already locked!\n"
 msgstr ""
 
-#: ../slattach.c:180
+#: ../slattach.c:181
 #, c-format
 msgid "slattach: tty_lock: (%s): %s\n"
 msgstr ""
 
-#: ../slattach.c:186
+#: ../slattach.c:187
 msgid "slattach: cannot write PID file\n"
 msgstr ""
 
-#: ../slattach.c:196
+#: ../slattach.c:197
 #, c-format
 msgid "slattach: tty_lock: UUCP user %s unknown!\n"
 msgstr ""
 
-#: ../slattach.c:424
+#: ../slattach.c:425
 #, c-format
 msgid "slattach: tty_hangup(DROP): %s\n"
 msgstr ""
 
-#: ../slattach.c:431
+#: ../slattach.c:432
 #, c-format
 msgid "slattach: tty_hangup(RAISE): %s\n"
 msgstr ""
 
-#: ../slattach.c:478
+#: ../slattach.c:479
 msgid "slattach: tty_open: cannot get current state!\n"
 msgstr ""
 
-#: ../slattach.c:485
+#: ../slattach.c:486
 msgid "slattach: tty_open: cannot get current line disc!\n"
 msgstr ""
 
-#: ../slattach.c:493
+#: ../slattach.c:494
 msgid "slattach: tty_open: cannot set RAW mode!\n"
 msgstr ""
 
-#: ../slattach.c:500
+#: ../slattach.c:501
 #, c-format
 msgid "slattach: tty_open: cannot set %s bps!\n"
 msgstr ""
 
-#: ../slattach.c:510
+#: ../slattach.c:511
 msgid "slattach: tty_open: cannot set 8N1 mode!\n"
 msgstr ""
 
-#: ../slattach.c:658
+#: ../slattach.c:656
 #, c-format
 msgid "slattach: unsupported protocol %s\n"
 msgstr ""
 
-#: ../slattach.c:685
+#: ../slattach.c:683
 #, c-format
 msgid "%s started"
 msgstr ""
 
-#: ../slattach.c:686
+#: ../slattach.c:684
 #, c-format
 msgid " on %s"
 msgstr ""
 
-#: ../slattach.c:687
+#: ../slattach.c:685
 #, c-format
 msgid " interface %s\n"
 msgstr ""