diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index f69be86..ab0fe78 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -6,7 +6,7 @@
 
 @include version.texi
 
address@hidden Macros used through out the manul.
address@hidden Macros used throughout the manual.
 @macro synopsis{command}
 @noindent
 Synopsis:
@@ -265,18 +265,18 @@ NIS/YP domain name.
 There are no command specific options.
 
 @node hostname invocation
address@hidden @command{hostname}: Show or set system host name.
address@hidden @command{hostname}: Show or set the system's host name.
 @pindex hostname
 
address@hidden is a program to show or to set the name of a host
address@hidden is a program to show, or to set the name of a host
 system.
 
 @synopsis{hostname address@hidden@dots{}] address@hidden
 
 @noindent
-where @var{name} is the name to be used by the running host.
+where @var{name} is the name to be assigned to the running host.
 
-The program accepts the following options.  Also see @ref{Common
+The program accepts the following options.  See also @ref{Common
 options}.
 
 @table @option
@@ -342,28 +342,10 @@ Get NIS/YP domain name.
 @node Generic invocation
 @section Generic invocation
 
address@hidden Invocation on GNU/Linux
address@hidden Invocation on GNU/Linux
-
address@hidden address@hidden@dots{}] @var{name} address@hidden@*
-@ @ @ @ [broadcast @address@hidden
-@ @ @ @ [pointopoint|dstaddr @address@hidden
-@ @ @ @ [netmask @address@hidden
-@ @ @ @ [metric @address@hidden
-@ @ @ @ [mtu @address@hidden
-@ @ @ @ [txqueuelen @address@hidden
-@ @ @ @ [up|down] address@hidden
-
-The program accepts the following options on GNU/Linux.  Also see
+The program accepts the following generic options.  See also
 @ref{Common options}.
 
 @table @option
address@hidden -T @var{n}
address@hidden address@hidden
address@hidden -T
address@hidden --txqlen
-Set transmit queue length to @var{n}.
-
 @item -a
 @itemx --all
 @opindex -a
@@ -377,39 +359,30 @@ Display all available interfaces.
 Set interface address to @var{addr}.
 
 @item -B @var{addr}
address@hidden -b @var{addr}
 @itemx address@hidden
 @itemx address@hidden
address@hidden -b @var{addr}
 @opindex -B
address@hidden -b
 @opindex --brdaddr
 @opindex --broadcast
address@hidden -b
 Set broadcast address to @var{addr}.
 
address@hidden -d @var{addr}
address@hidden address@hidden
address@hidden address@hidden
address@hidden -p @var{addr}
address@hidden -d
address@hidden --dstaddr
address@hidden --peer
address@hidden -p
-Set destination (peer) address to @var{addr}.
-
 @item --down
 @opindex --down
 Shut the interface down.
 
address@hidden address@hidden
address@hidden --format
-Select output format; set to @samp{help} for info.
-
 @item -F @var{flag}[,@address@hidden
 @itemx address@hidden,@address@hidden
 @opindex -F
 @opindex --flags
 Set interface flags.
 
address@hidden address@hidden
address@hidden --format
+Select output format; set @var{format} to @samp{help} for
+available formats.
+
 @item -i @var{name}
 @itemx address@hidden
 @opindex -i
@@ -452,7 +425,43 @@ Activate the interface (default if address is given).
 @itemx --verbose
 @opindex -v
 @opindex --verbose
-Output information when configuring interface.
+Output information when configuring an interface.
+
address@hidden table
+
address@hidden Invocation on GNU/Linux
address@hidden Invocation on GNU/Linux
+
address@hidden address@hidden@dots{}] @var{name} address@hidden@*
+@ @ @ @ [broadcast @address@hidden
+@ @ @ @ [pointopoint|dstaddr @address@hidden
+@ @ @ @ [netmask @address@hidden
+@ @ @ @ [metric @address@hidden
+@ @ @ @ [mtu @address@hidden
+@ @ @ @ [txqueuelen @address@hidden
+@ @ @ @ [up|down] address@hidden
+
+The program accepts the following additional options on GNU/Linux.
+See also @ref{Common options} and the previous section on generic
+invocation.
+
address@hidden @option
address@hidden -d @var{addr}
address@hidden -p @var{addr}
address@hidden address@hidden
address@hidden address@hidden
address@hidden -d
address@hidden -p
address@hidden --dstaddr
address@hidden --peer
+Set destination (peer) address to @var{addr}.
+
address@hidden -T @var{n}
address@hidden address@hidden
address@hidden -T
address@hidden --txqlen
+Set transmit queue length to @var{n}.
+
 @end table
 
 @node Invocation on BSD
@@ -465,8 +474,8 @@ Output information when configuring interface.
 @ @ @ @ [mtu @address@hidden
 @ @ @ @ [up|down]}
 
-The program accepts the following options on BSD.  Also see
address@hidden options}.
+The program accepts no BSD specific options.  See the generic
+invocation and the @ref{Common options}.
 
 @node Invocation on QNX
 @section Invocation on QNX
@@ -481,8 +490,8 @@ The program accepts the following options on BSD.  Also see
 @ @ @ @ [mtu @address@hidden
 @ @ @ @ [up|down]}
 
-The program accepts the following options on Solaris.  Also see
address@hidden options}.
+The program accepts no Solaris specific options.  See the generic
+invocation and the @ref{Common options}.
 
 @node logger invocation
 @chapter @command{logger}: Send messages to system log.
@@ -497,7 +506,7 @@ Library Reference Manual}.
 
 The options are followed by the message which should be written to the
 system log.  If not specified, and the @option{-f} flag is not
-provided, standard input will be used..
+provided, standard input will be used.
 
 The program accepts the following options.  Also see @ref{Common
 options}.
@@ -516,7 +525,7 @@ is to use whatever IP version that matches the host.
 @opindex --ipv6
 Use IPv6 as transport when logging to a host.  The option is present
 also on systems without support for IPv6, but will then issue a
-warning and then fall back to IPv4 when delivering the message.
+warning and fall back to IPv4 when delivering the message.
 
 Both options are most influencial when the target host is named using
 a symbolic name, but numerical addresses for host or source must also
@@ -1314,8 +1323,8 @@ Commands can either be entered interactively, or piped as a batched
 job read from standard input.  @command{ftp} is able to distinguish
 between these two modes of operation.
 
address@hidden address@hidden@dots{}] address@hidden address@hidden@* pftp
address@hidden@dots{}] address@hidden address@hidden
address@hidden address@hidden@dots{}] address@hidden address@hidden@*
+pftp address@hidden@dots{}] address@hidden address@hidden
 
 @noindent
 The alternate name @command{pftp} starts @command{ftp} in passive