Few random typo/documentation fixes.

(Partly taken from the Debian netbase package.)
Released as 1.49

diff --git a/README b/README
index dcec959..42db2a3 100644 (file)
--- a/README
+++ b/README
@@ -84,4 +84,4 @@ may be more touchy.  Feel free to send patches if you have problems.
 
 Phil Blundell
 philb@gnu.org
-11th November 1998
+11th December 1998

diff --git a/README.ipv6 b/README.ipv6
index 94a7380..b069f19 100644 (file)
--- a/README.ipv6
+++ b/README.ipv6
@@ -1,13 +1,27 @@
-Notes for IPv6.
+Notes for IPv6
+--------------
 
 If you are using libc5, you may need to edit the Makefile so that
 libinet6 is linked in and your IPv6 include files are found in the
-right place.  The definitions in question are at about line 91. 
+right place.  The definitions in question are at about line 91.  You may
+also find that the header files provided with inet6-apps are not exactly
+what net-tools expects.  This is not a bug in net-tools as such and will
+not be fixed in future releases (though if anybody would like to contribute
+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 snapshot.  In this
-case you do not need to edit the Makefile or apply any patches.
-Version 2.0 of glibc has no support for IPv6.
+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.
 
-You may find that you are missing files such as <netinet/ip6.h>.  This is
-not a bug in net-tools; you should find some newer include files.
+Version 2.0 of glibc has no support for IPv6.  Patches did exist at one
+point but they are now seriously updated.  Consider upgrading to glibc 2.1
+instead.
+
+BUGS
+----
+
+"ifconfig eth0 add ..." does not currently auto-load the IPv6 module.
 

diff --git a/man/en_US/arp.8 b/man/en_US/arp.8
index b6dc42b..6beb0bb 100644 (file)
--- a/man/en_US/arp.8
+++ b/man/en_US/arp.8
@@ -102,8 +102,8 @@ entries the specified interface is the interface on which ARP requests will
 be answered. 
 .br
 .B NOTE:
-This has to be different from the interface to witch the IP
-Packages will be routed.
+This has to be different from the interface to which the IP
+datagrams will be routed.
 .TP
 .B "\-s hostname hw_addr, \-\-set hostname"
 Manually create an ARP address mapping entry for host

diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8
index a1cbf4d..94c21ad 100644 (file)
--- a/man/en_US/netstat.8
+++ b/man/en_US/netstat.8
@@ -19,7 +19,7 @@ netstat \- Display network connections, routing tables, interface statistics, ma
 .RB [ \-\-tcp | \-t ]
 .RB [ \-\-udp | \-u ]
 .RB [ \-\-raw | \-w ]
-.RB [ \-\-unix | \-u ] 
+.RB [ \-\-unix | \-x ] 
 .RB [ \-\-inet | \-\-ip ]
 .RB [ \-\-ax25 ]
 .RB [ \-\-ipx ] 

diff --git a/man/pt_BR/netstat.8 b/man/pt_BR/netstat.8
index a6c245f..b9b359a 100644 (file)
--- a/man/pt_BR/netstat.8
+++ b/man/pt_BR/netstat.8
@@ -20,7 +20,7 @@ mascaradas.
 .RB [ \-\-tcp | \-t ]
 .RB [ \-\-udp | \-u ]
 .RB [ \-\-raw | \-w ]
-.RB [ \-\-unix | \-u ] 
+.RB [ \-\-unix | \-x ] 
 .RB [ \-\-inet | \-\-ip ]
 .RB [ \-\-ax25 ]
 .RB [ \-\-ipx ] 

diff --git a/netstat.c b/netstat.c
index a0c0d94..1373e2d 100644 (file)
--- a/netstat.c
+++ b/netstat.c
@@ -7,7 +7,7 @@
  *              NET-3 Networking Distribution for the LINUX operating
  *              system.
  *
- * Version:     $Id: netstat.c,v 1.14 1998/12/06 16:17:46 philip Exp $
+ * Version:     $Id: netstat.c,v 1.15 1998/12/11 10:48:52 philip Exp $
  *
  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
@@ -1188,7 +1188,9 @@ static void usage(void)
     fprintf(stderr, _("        -r, --route              display routing table\n"));    /* xxx */
     fprintf(stderr, _("        -L, --netlink            display netlink kernel messages\n"));
     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
+#if HAVE_FW_MASQUERADE
     fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
+#endif
     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
     fprintf(stderr, _("        -n, --numeric            dont resolve names\n"));
     fprintf(stderr, _("        -e, --extend             display other/more informations\n"));
@@ -1217,7 +1219,9 @@ int main
        {"help", 0, 0, 'h'},
        {"route", 0, 0, 'r'},
        {"netlink", 2, 0, 'L'},
+#if HAVE_FW_MASQUERADE
        {"masquerade", 0, 0, 'M'},
+#endif
        {"protocol", 1, 0, 'A'},
        {"tcp", 0, 0, 't'},
        {"udp", 0, 0, 'u'},