commit-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Inetutils branch, ams-munged, created. inetutils-1_9_2-34-g07


From: Alfred M. Szmidt
Subject: [SCM] GNU Inetutils branch, ams-munged, created. inetutils-1_9_2-34-g0735aac
Date: Tue, 09 Jun 2015 08:25:43 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, ams-munged has been created
        at  0735aacdd5cac460eacf0fd6ae4397cb9853526e (commit)

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0735aacdd5cac460eacf0fd6ae4397cb9853526e


commit 0735aacdd5cac460eacf0fd6ae4397cb9853526e
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Aug 18 13:25:40 2014 +0200

    doc ..

diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index a6e0a42..8116830 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -3138,135 +3138,6 @@ example @samp{mail.crit,*.err} will select the 
@samp{mail} facility
 messages at the level of @samp{err} or higher, not at the level of
 @samp{crit} or higher.
 
address@hidden ftpd invocation
address@hidden @command{ftpd}: FTP daemon
address@hidden ftpd
-
address@hidden is the Internet File Transfer Protocol server process.
-The server uses the TCP protocol and listens at the port specified in
-the @samp{ftp} service specification.
-
address@hidden
-ftpd address@hidden@dots{}
address@hidden example
-
address@hidden @option
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
-Daemon uses only IPv4 addressing.  Ignored in inetd mode.
-
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
-Daemon uses only IPv6 addressing.  Ignored in inetd mode.
-
address@hidden -A
address@hidden --anonymous-only
address@hidden -A
address@hidden --anonymous-only
-Only anonymous login is allowed.
-
address@hidden -a @var{auth}
address@hidden address@hidden
address@hidden -a
address@hidden --auth
-Specify what authentication mechanism to use for incoming connections.
-Possible values are: @samp{kerberos}, @samp{kerberos5}, @samp{opie},
address@hidden, and @samp{default}.
-
-Anonymous logins will continue to work when this option is used,
-unless the user @samp{ftp} is removed from the system.
-
address@hidden  -D
address@hidden --daemon
address@hidden -D
address@hidden --daemon
address@hidden enters daemon-mode.  That allows @command{ftpd} to be
-run without @command{inetd}.
-
address@hidden -d
address@hidden --debug
address@hidden -d
address@hidden --debug
-Debugging information is written to the @code{syslog} using facility
address@hidden
-
address@hidden -l
address@hidden --logging
address@hidden -l
address@hidden --logging
-Each successful and failed ftp session is logged using @code{syslog}
-with a facility of @samp{LOG_FTP}.  If this option is specified twice,
-the retrieve (@code{get}), store (@code{put}), append, delete, make
-directory, remove directory and rename operations and their filename
-arguments are also logged.
-
address@hidden --non-rfc2577
address@hidden --non-rfc2577
-Do not follow the suggestion of RFC 2577 to suppress messages
-that could help an attacker to conduct user name enumeration.
-This option allows the server to return with an error message
-immediately upon receipt of a user name.
-Such information includes non-existence claims and expiration claims.
-The ideal mode would otherwise be to fake the relevance of asking
-for a password, and only thereafter report an invalid login.
-
address@hidden -p @var{pidfile}
address@hidden address@hidden
address@hidden -p
address@hidden --pidfile
-Change default location of @var{pidfile}.
-
address@hidden -q
address@hidden --no-version
address@hidden -q
address@hidden --no-version
-Quiet mode.  No information about the version of the @command{ftpd} is
-given to the client.
-
address@hidden -T
address@hidden --max-timeout
address@hidden -T
address@hidden --max-timeout
-A client may also request a different timeout period; the maximum
-period allowed may be set to timeout seconds with the @option{-T}
-option.  The default limit is 2 hours.
-
address@hidden -t @var{timeout}
address@hidden address@hidden
address@hidden -t
address@hidden --timeout
-The inactivity timeout period is set to timeout seconds (the default
-is 15 minutes).
-
address@hidden -u @var{umask}
address@hidden address@hidden
address@hidden -u
address@hidden --umask
-Set default umask, expressed in base 8.
address@hidden table
-
-The file @file{/etc/nologin} can be used to disable FTP access.  If
-the file exists, @command{ftpd} displays it and exits.  If the file
address@hidden/etc/ftpwelcome} exists, @command{ftpd} prints it before issuing
-the @samp{ready} message.  If the file @file{/etc/motd} exists,
address@hidden prints it after a successful login.
-
-If this server was compiled with PAM support, then any non-anonymous
-connection request will also be checked for settings pertaining to
-the PAM service @samp{ftp}, before finally being accepted.
-
-Linux-PAM is particular in that it also provides a module
address@hidden influencing even anonymous access.
-By convention the present server relies on the functionality
-in that module when built on relevant systems.
-However, the module is known to be partially broken since
-ten years back, when one compares the claims in its manual page,
-so not all claimed trickery is available!
-
 @section Standards
 @anchor{ftpd standards}
 
@@ -3474,131 +3345,49 @@ that a single @samp{@@} on a line by itself in
 upon every user allowed to access the FTP service.
 This gives a Draconian, protective configuration.
 
address@hidden tftpd invocation
address@hidden @command{tftpd}: TFTP server
address@hidden tftpd
-
address@hidden is intended to be invoked via @command{inetd}
-at all times.
-
address@hidden
-Synopsis:
-
address@hidden
-tftpd address@hidden address@hidden @dots{}]
address@hidden example
-
address@hidden @option
address@hidden -g @var{group}
address@hidden address@hidden
address@hidden -g
address@hidden --group
-Specify group membership of the process owner.
-This is used only along with the option @option{-s},
-and replaces the group membership that comes from
-the process owner himself.
-
address@hidden -l
address@hidden --logging
address@hidden -l
address@hidden --logging
-Enable logging.
->>>>>>> a776a603369e644f031eee771bf388ab0edb3b91
-
address@hidden -n
address@hidden --no-detach
address@hidden -n
address@hidden --no-detach
-Do not enter daemon mode.
-
address@hidden --no -forward
address@hidden --no -forward
-Do not forward any messages (overrides @option{-h}).  This disables
-even temporary creation of forwarding sockets, an ability which is
-otherwise active when the option @option{-r} is left out.
-
address@hidden --no -klog
address@hidden --no -klog
-Do not listen to the kernel log device @file{/dev/klog}.
-
address@hidden --no -unixaf
address@hidden --no -unixaf
-Do not listen on UNIX domain sockets (overrides @option{-a} and
address@hidden).
-
address@hidden address@hidden
address@hidden --pidfile
-Override pidfile (the default file is @file{/var/run/syslogd.pid}).
-
address@hidden -p @var{file}
address@hidden address@hidden
address@hidden -p
address@hidden --socket
-Override default UNIX domain socket @file{/dev/log}.
-
address@hidden -r
address@hidden --inet
address@hidden -r
address@hidden --inet
-Receive remote messages via Internet domain socket.  Without this
-option no remote massages are received, since there is no listening
-socket.  Yet sockets for forwarding are created on the fly as needed,
-which might cause performance issues on busy systems.
-
address@hidden -s @var{domainlist}
address@hidden -s
-List of domains which should be stripped from the FQDN of hosts before
-logging their name.  Multiple lists are allowed.
-
address@hidden -S
address@hidden --sync
address@hidden -S
address@hidden --sync
address@hidden table
-
 @node ftpd invocation
address@hidden @command{ftpd}: FTP Daemon.
address@hidden ftpd
address@hidden @command{ftpd}: FTP daemon
address@hidden ftpd
 
 @command{ftpd} is the Internet File Transfer Protocol server process.
 The server uses the TCP protocol and listens at the port specified in
 the @samp{ftp} service specification.
 
address@hidden address@hidden@dots{}]}
-
-The program accepts the following options.  Also see @ref{Common
-options}.
address@hidden
+ftpd address@hidden@dots{}
address@hidden example
 
 @table @option
 @item -4
 @itemx --ipv4
 @opindex -4
 @opindex --ipv4
-Daemon uses only IPv4 addressing.  Ignored in @command{inetd} mode.
+Daemon uses only IPv4 addressing.  Ignored in inetd mode.
 
 @item -6
 @itemx --ipv6
 @opindex -6
 @opindex --ipv6
-Daemon uses only IPv6 addressing.  Ignored in @command{inetd} mode.
+Daemon uses only IPv6 addressing.  Ignored in inetd mode.
+
address@hidden -A
address@hidden --anonymous-only
address@hidden -A
address@hidden --anonymous-only
+Only anonymous login is allowed.
 
 @item -a @var{auth}
 @itemx address@hidden
 @opindex -a
 @opindex --auth
 Specify what authentication mechanism to use for incoming connections.
-Possible values are: @samp{default}.
+Possible values are: @samp{kerberos}, @samp{kerberos5}, @samp{opie},
address@hidden, and @samp{default}.
 
 Anonymous logins will continue to work when this option is used,
 unless the user @samp{ftp} is removed from the system.
 
address@hidden -A
address@hidden --anonymous-only
address@hidden -A
address@hidden --anonymous-only
-Only anonymous login is allowed.
-
address@hidden -D
address@hidden  -D
 @itemx --daemon
 @opindex -D
 @opindex --daemon
@@ -3624,13 +3413,13 @@ arguments are also logged.
 
 @item --non-rfc2577
 @opindex --non-rfc2577
-Do not follow the suggestion of RFC 2577 to suppress messages that
-could help an attacker to conduct user name enumeration.  This option
-allows the server to return with an error message immediately upon
-receipt of a user name.  Such information includes non-existence
-claims and expiration claims.  The ideal mode would otherwise be to
-fake the relevance of asking for a password, and only thereafter
-report an invalid login.
+Do not follow the suggestion of RFC 2577 to suppress messages
+that could help an attacker to conduct user name enumeration.
+This option allows the server to return with an error message
+immediately upon receipt of a user name.
+Such information includes non-existence claims and expiration claims.
+The ideal mode would otherwise be to fake the relevance of asking
+for a password, and only thereafter report an invalid login.
 
 @item -p @var{pidfile}
 @itemx address@hidden
@@ -3667,6 +3456,24 @@ is 15 minutes).
 Set default umask, expressed in base 8.
 @end table
 
+The file @file{/etc/nologin} can be used to disable FTP access.  If
+the file exists, @command{ftpd} displays it and exits.  If the file
address@hidden/etc/ftpwelcome} exists, @command{ftpd} prints it before issuing
+the @samp{ready} message.  If the file @file{/etc/motd} exists,
address@hidden prints it after a successful login.
+
+If this server was compiled with PAM support, then any non-anonymous
+connection request will also be checked for settings pertaining to
+the PAM service @samp{ftp}, before finally being accepted.
+
+Linux-PAM is particular in that it also provides a module
address@hidden influencing even anonymous access.
+By convention the present server relies on the functionality
+in that module when built on relevant systems.
+However, the module is known to be partially broken since
+ten years back, when one compares the claims in its manual page,
+so not all claimed trickery is available!
+
 @node rexecd invocation
 @chapter @command{rexecd}: Remote execution server.
 @pindex rexecd
@@ -4052,54 +3859,85 @@ among which the clients's address is included.
 @kerberos{}
 
 @node tftpd invocation
address@hidden @command{tftpd}: TFTP server.
address@hidden tftpd
address@hidden @command{tftpd}: TFTP server
address@hidden tftpd
 
address@hidden is a server that provides a minimalistic means for
-transferring files.
address@hidden is intended to be invoked via @command{inetd}
+at all times.
 
address@hidden address@hidden@dots{}] @address@hidden
address@hidden
+Synopsis:
 
-The program accepts the following options.  Also see @ref{Common
-options}.
address@hidden
+tftpd address@hidden address@hidden @dots{}]
address@hidden example
 
 @table @option
address@hidden -g @var{group}
address@hidden address@hidden
address@hidden -g
address@hidden --group
+Specify group membership of the process owner.
+This is used only along with the option @option{-s},
+and replaces the group membership that comes from
+the process owner himself.
+
 @item -l
 @itemx --logging
 @opindex -l
 @opindex --logging
 Enable logging.
+>>>>>>> a776a603369e644f031eee771bf388ab0edb3b91
 
 @item -n
address@hidden --nonexistent
address@hidden --no-detach
 @opindex -n
address@hidden --nonexistent
-Supress negative acknowledgement of requests for nonexistent relative
-filenames.
address@hidden --no-detach
+Do not enter daemon mode.
 
address@hidden -g @var{group}
address@hidden address@hidden
address@hidden -g
address@hidden --group
-Specify group membership of the process owner.  This is used only
-along with the option @option{-s}, and replaces the group membership
-that comes from the process owner himself.
address@hidden --no -forward
address@hidden --no -forward
+Do not forward any messages (overrides @option{-h}).  This disables
+even temporary creation of forwarding sockets, an ability which is
+otherwise active when the option @option{-r} is left out.
 
address@hidden -s @var{dir}
address@hidden address@hidden
address@hidden --no -klog
address@hidden --no -klog
+Do not listen to the kernel log device @file{/dev/klog}.
+
address@hidden --no -unixaf
address@hidden --no -unixaf
+Do not listen on UNIX domain sockets (overrides @option{-a} and
address@hidden).
+
address@hidden address@hidden
address@hidden --pidfile
+Override pidfile (the default file is @file{/var/run/syslogd.pid}).
+
address@hidden -p @var{file}
address@hidden address@hidden
address@hidden -p
address@hidden --socket
+Override default UNIX domain socket @file{/dev/log}.
+
address@hidden -r
address@hidden --inet
address@hidden -r
address@hidden --inet
+Receive remote messages via Internet domain socket.  Without this
+option no remote massages are received, since there is no listening
+socket.  Yet sockets for forwarding are created on the fly as needed,
+which might cause performance issues on busy systems.
+
address@hidden -s @var{domainlist}
 @opindex -s
address@hidden --secure-dir
-Let the serving process change its root directory to @var{dir} before
-attending to any requests.  This directory is not observable by any
-client, but improves server isolation, since servable contents must be
-located below this chrooted directory @var{dir}.
+List of domains which should be stripped from the FQDN of hosts before
+logging their name.  Multiple lists are allowed.
 
address@hidden -u @var{user}
address@hidden address@hidden
address@hidden -u
address@hidden --user
-Specify the process owner for serving requests.  Only relevant along
-with the option @option{-s}.  The default name is @samp{nobody}.
address@hidden -S
address@hidden --sync
address@hidden -S
address@hidden --sync
 @end table
 
 @node uucpd invocation

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=060a48a4315b11e0268bd7ba64d11800db7eda18


commit 060a48a4315b11e0268bd7ba64d11800db7eda18
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Aug 18 12:40:34 2014 +0200

    * doc/inetutils.texi: Rewrite manual.

diff --git a/ChangeLog b/ChangeLog
index 1c7f3a6..50a23e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-08-18  Alfred M. Szmidt  <address@hidden>
 
+       * doc/inetutils.texi: Rewrite manual.
+
        * configure.ac: Sort clients alphabetically.
 
 2014-07-30  Alfred M. Szmidt  <address@hidden>
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 81fd9ff..a6e0a42 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -6,6 +6,26 @@
 
 @include version.texi
 
address@hidden Macros used through out the manul.
address@hidden synopsis{command}
address@hidden
+Synopsis:
+
address@hidden
+\command\
address@hidden example
address@hidden macro
+
address@hidden kerberos
address@hidden kerberos
address@hidden
+The following options are available only if the program has been
+compiled with support for Kerberos authentication.
+
address@hidden @option
address@hidden table
address@hidden macro
+
 @c Define new indices for file names and options.
 @defcodeindex op
 @defcodeindex fl
@@ -19,46 +39,46 @@
 @syncodeindex pg cp
 @syncodeindex vr cp
 
address@hidden Francois Fran@,{c}ois
-
 @dircategory Basics
 @direntry
-* Inetutils: (inetutils).       GNU networking utilities.
-* Common options: (inetutils)Common options.      Common options.
+* Inetutils: (inetutils).                      GNU networking utilities.
+* Common options: (inetutils)Common options.   Common options.
+* Kerberos: (inetutils)Kerberos.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* ftp: (inetutils)ftp invocation.                 FTP client.
-* ftpd: (inetutils)ftpd invocation.               FTP Daemon.
-* hostname: (inetutils)hostname invocation.       Show or set system host name.
-* dnsdomainname: (inetutils)dnsdomainname invocation.       Show DNS domain 
name.
-* inetd: (inetutils)inetd invocation.             Internet super-server.
-* logger: (inetutils)logger invocation.           Send messages to the system 
log.
-* ping: (inetutils)ping invocation.               Packets to network hosts.
-* ping6: (inetutils)ping6 invocation.             Packets to IPv6 network 
hosts.
-* rcp: (inetutils)rcp invocation.                 Remote copy
-* rexec: (inetutils)rexec invocation.             Remote execution client.
-* rexecd: (inetutils)rexecd invocation.           Remote execution server.
-* rlogin: (inetutils)rlogin invocation.           Remote login.
-* rlogind: (inetutils)rlogind invocation.         Remote login server.
-* rsh: (inetutils)rsh invocation.                 Remote shell.
-* rshd: (inetutils)rshd invocation.               Remote shell server.
-* syslogd: (inetutils)syslogd invocation.         Syslog server.
-* talk: (inetutils)talk invocation.               Talk client.
-* talkd: (inetutils)talkd invocation.             Talk server.
-* telnet: (inetutils)telnet invocation.           User interface to TELNET.
-* telnetd: (inetutils)telnetd invocation.         Telnet server.
-* tftp: (inetutils)tftp invocation.               TFTP client.
-* tftpd: (inetutils)tftpd invocation.             TFTP server.
-* traceroute: (inetutils)traceroute invocation.   Trace the route to a host.
-* uucpd: (inetutils)uucpd invocation.             Unix to Unix Copy.
-* whois: (inetutils)whois invocation.             Whois user interface.
+* dnsdomainname invocation: (inetutils)dnsdomainname invocation.
+* hostname invocation: (inetutils)hostname invocation.
+* ifconfig invocation: (inetutils)ifconfig invocation.
+* logger invocation: (inetutils)logger invocation.
+* ping invocation: (inetutils)ping invocation.
+* ping6 invocation: (inetutils)ping6 invocation.
+* traceroute invocation: (inetutils)traceroute invocation.
+* whois invocation: (inetutils)whois invocation.
+* ftp invocation: (inetutils)ftp invocation.
+* rcp invocation: (inetutils)rcp invocation.
+* rexec invocation: (inetutils)rexec invocation.
+* rlogin invocation: (inetutils)rlogin invocation.
+* rsh invocation: (inetutils)rsh invocation.
+* talk invocation: (inetutils)talk invocation.
+* telnet invocation: (inetutils)telnet invocation.
+* tftp invocation: (inetutils)tftp invocation.
+* ftpd invocation: (inetutils)ftpd invocation.
+* inetd invocation: (inetutils)inetd invocation.
+* rexecd invocation: (inetutils)rexecd invocation.
+* rlogind invocation: (inetutils)rlogind invocation.
+* rshd invocation: (inetutils)rshd invocation.
+* syslogd invocation: (inetutils)syslogd invocation.
+* talkd invocation: (inetutils)talkd invocation.
+* telnetd invocation: (inetutils)telnetd invocation.
+* tftpd invocation: (inetutils)tftpd invocation.
+* uucpd invocation: (inetutils)uucpd invocation.
 @end direntry
 
 @copying
-This manual documents version @value{VERSION} of the @sc{gnu} networking
-utilities.
+This manual documents version @value{VERSION} of the @sc{gnu}
+networking utilities.
 
 Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
@@ -77,7 +97,7 @@ Documentation License''.
 @title @sc{gnu} @code{inetutils}
 @subtitle GNU networking utilities
 @subtitle for version @value{VERSION}, @value{UPDATED}
address@hidden Alain Magloire et al.
address@hidden Alfred M. Szmidt, et al.
 
 @page
 @vskip 0pt plus 1filll
@@ -93,51 +113,51 @@ Documentation License''.
 @insertcopying
 @end ifnottex
 
address@hidden networking utilities
-
 @menu
-* Introduction::                       Caveats, overview, and authors.
-* Common options::                     Common options.
+* Introduction::       Caveats, overview, and authors.
+* Common options::     Common options.
 
 Diagnostic programs
 
-* dnsdomainname invocation::           Show DNS domain name.
-* hostname invocation::                Show or set system host name.
-* logger invocation::                  Send messages to system log.
-* ping invocation::                    Packets to network hosts.
-* ping6 invocation::                   Packets to IPv6 network hosts.
-* traceroute invocation::              Trace the route to a host.
-* whois invocation::                   Whois user interface.
+* dnsdomainname invocation::   Show DNS domain name.
+* hostname invocation::                Show or set system host name.
+* ifconfig invocation::                Show or set network interfaces.
+* logger invocation::          Send messages to system log.
+* ping invocation::            Packets to network hosts.
+* ping6 invocation::           Packets to IPv6 network hosts.
+* traceroute invocation::      Trace the route to a host.
+* whois invocation::           Whois user interface.
 
 Clients
 
-* ftp invocation::                     FTP client.
-* rcp invocation::                     Remote copy
-* rexec invocation::                   Remote execution client.
-* rlogin invocation::                  Remote login.
-* rsh invocation::                     Remote shell.
-* talk invocation::                    Talk client.
-* telnet invocation::                  User interface to TELNET.
-* tftp invocation::                    TFTP client.
+* ftp invocation::             FTP client.
+* rcp invocation::             Remote copy
+* rexec invocation::           Remote execution client.
+* rlogin invocation::          Remote login.
+* rsh invocation::             Remote shell.
+* talk invocation::            Talk client.
+* telnet invocation::          User interface to TELNET.
+* tftp invocation::            TFTP client.
 
 Daemons
 
-* ftpd invocation::                    FTP Daemon.
-* inetd invocation::                   Internet super-server.
-* rexecd invocation::                  Remote execution server.
-* rlogind invocation::                 Remote login server.
-* rshd invocation::                    Remote shell server.
-* syslogd invocation::                 Syslog server.
-* talkd invocation::                   Talk server.
-* telnetd invocation::                 Telnet server.
-* tftpd invocation::                   TFTP server.
-* uucpd invocation::                   Unix to Unix Copy.
-
-* GNU Free Documentation License::     The license for this manual.
-* Index::                              Index of manual.
+* inetd invocation::           Internet super-server.
+* syslogd invocation::         Syslog server.
+* ftpd invocation::            FTP Daemon.
+* rexecd invocation::          Remote execution server.
+* rlogind invocation::         Remote login server.
+* rshd invocation::            Remote shell server.
+* talkd invocation::           Talk server.
+* telnetd invocation::         Telnet server.
+* tftpd invocation::           TFTP server.
+* uucpd invocation::           Unix to Unix Copy.
+
+Appendix
+
+* GNU Free Documentation License::     The license for this manual.
+* Index::                              Index of manual.
 @end menu
 
address@hidden OK -- 2009-04-27
 @node Introduction
 @chapter Introduction
 @cindex introduction
@@ -211,7 +231,7 @@ operands even if they begin with @samp{-}.
 @end table
 
 @menu
-* Exit status::                 Indicating program success or failure.
+* Exit status:: Indicating program success or failure.
 @end menu
 
 @node Exit status
@@ -229,26 +249,35 @@ Failure is indicated by a nonzero value --- typically 
@samp{1}, though
 it may differ on unusual platforms, as POSIX requires only that it be
 nonzero.
 
address@hidden hostname invocation
address@hidden @command{hostname}: Show or set system host name.
address@hidden hostname
address@hidden dnsdomainname invocation
address@hidden @command{dnsdomainname}: Show DNS domain name.
address@hidden dnsdomainname
+
address@hidden is a program to show the domain part of the
+system's @acronym{fully qualified domain name, FQDN}.  For example, if
+the FQDN of the system is @code{name.example.org} the command will
+show @code{example.org}.  The output is not necessarily related to the
+NIS/YP domain name.
 
address@hidden is a program to show or to set the name of a
-host system.
address@hidden address@hidden@dots{}]}
 
 @noindent
-Synopsis:
+There are no command specific options.
 
address@hidden
-hostname address@hidden@dots{}]
-hostname @var{name}
address@hidden example
address@hidden hostname invocation
address@hidden @command{hostname}: Show or set system host name.
address@hidden hostname
+
address@hidden is a program to show or to set the name of a host
+system.
+
address@hidden address@hidden@dots{}] address@hidden
 
 @noindent
 where @var{name} is the name to be used by the running host.
 
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -a
@@ -275,7 +304,7 @@ Get DNS host name or Fully Qualified Domain Name.
 @itemx address@hidden
 @opindex -F
 @opindex --file
-Set host name or NIS domain name from FILE.
+Set host name or NIS domain name from @var{file}.
 
 @item -i
 @itemx --ip-addresses
@@ -290,57 +319,188 @@ Get addresses for the host name.
 Get short host name.
 
 @item -y
address@hidden --yp
 @itemx --nis
address@hidden --yp
 @opindex -y
address@hidden --yp
 @opindex --nis
address@hidden --yp
 Get NIS/YP domain name.
 @end table
 
address@hidden dnsdomainname invocation
address@hidden @command{dnsdomainname}: Show DNS domain name
address@hidden dnsdomainname
address@hidden ifconfig invocation
address@hidden @command{ifconfig}: Show or set network interfaces.
address@hidden ifconfig
 
address@hidden is a program to show the domain part of the
-system's fully qualified domain name.  For example, if the FQDN of the
-system is @code{name.example.org} the command will show
address@hidden
-The output is not necessarily related to the NIS/YP domain name.
address@hidden
+* Generic invocation::
+* Invocation on GNU/Linux::
+* Invocation on BSD::
+* Invocation on QNX::
+* Invocation on Solaris::
address@hidden menu
 
-The tool uses gethostname to get the host name of the system and
-then getaddrinfo to resolve it into a canonical name.
-The domain part of the canonical name is shown, i.e., the part
-after the first address@hidden(@code{.}) of the official name.
address@hidden Generic invocation
address@hidden Generic invocation
 
address@hidden
-Synopsis:
address@hidden Invocation on GNU/Linux
address@hidden Invocation on GNU/Linux
 
address@hidden
-dnsdomainname address@hidden@dots{}]
address@hidden example
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
 
address@hidden
-There is no command specific option.
+The program accepts the following options on GNU/Linux.  Also see
address@hidden options}.
+
address@hidden @option
address@hidden -T @var{n}
address@hidden address@hidden
address@hidden -T
address@hidden --txqlen
+Set transmit queue length to @var{n}.
+
address@hidden -a
address@hidden --all
address@hidden -a
address@hidden --all
+Display all available interfaces.
+
address@hidden -A @var{addr}
address@hidden address@hidden
address@hidden -A
address@hidden --address
+Set interface address to @var{addr}.
+
address@hidden -B @var{addr}
address@hidden address@hidden
address@hidden address@hidden
address@hidden -b @var{addr}
address@hidden -B
address@hidden --brdaddr
address@hidden --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}.
+
address@hidden --down
address@hidden --down
+Shut the interface down.
+
address@hidden address@hidden
address@hidden --format
+Select output format; set to @samp{help} for info.
+
address@hidden -F @var{flag}[,@address@hidden
address@hidden address@hidden,@address@hidden
address@hidden -F
address@hidden --flags
+Set interface flags.
+
address@hidden -i @var{name}
address@hidden address@hidden
address@hidden -i
address@hidden --interface
+Configure network interface @var{name}.
+
address@hidden -l
address@hidden --list
address@hidden -l
address@hidden --list
+List available or selected interfaces.
+
address@hidden -m @var{mask}
address@hidden address@hidden
address@hidden -m
address@hidden --netmask
+Set netmask to @var{mask}.
+
address@hidden address@hidden
address@hidden --metric
+Set metric of interface to @var{n}.
+
address@hidden -M
address@hidden address@hidden
address@hidden -M
address@hidden --mtu
+Set MTU of interface to @var{n}.
+
address@hidden -s
address@hidden --short
address@hidden -s
address@hidden --short
+Short output format.
+
address@hidden --up
address@hidden --up
+Activate the interface (default if address is given).
+
address@hidden -v
address@hidden --verbose
address@hidden -v
address@hidden --verbose
+Output information when configuring interface.
address@hidden table
+
address@hidden Invocation on BSD
address@hidden Invocation on BSD
+
address@hidden @var{name} address@hidden address@hidden@*
+@ @ @ @ [broadcast @address@hidden
+@ @ @ @ [netmask @address@hidden
+@ @ @ @ [metric @address@hidden
+@ @ @ @ [mtu @address@hidden
+@ @ @ @ [up|down]}
+
+The program accepts the following options on BSD.  Also see
address@hidden options}.
+
address@hidden Invocation on QNX
address@hidden Invocation on QNX
+
address@hidden Invocation on Solaris
address@hidden Invocation on Solaris
+
address@hidden @var{name} address@hidden address@hidden@*
+@ @ @ @ [broadcast @address@hidden
+@ @ @ @ [netmask @address@hidden
+@ @ @ @ [metric @address@hidden
+@ @ @ @ [mtu @address@hidden
+@ @ @ @ [up|down]}
+
+The program accepts the following options on Solaris.  Also see
address@hidden options}.
 
 @node logger invocation
address@hidden @command{logger}: Send messages to system log
address@hidden logger
address@hidden @command{logger}: Send messages to system log.
address@hidden logger
 
 @command{logger} is a program to send entries to system log.  It
 provides a shell command interface similar to the system log module.
-For background information,
address@hidden, , Syslog, libc, The GNU C Library Reference Manual}.
+For background information, @pxref{Syslog, , Syslog, libc, The GNU C
+Library Reference Manual}.
 
address@hidden
-Synopsis:
address@hidden address@hidden@dots{}] address@hidden
 
address@hidden
-logger address@hidden@dots{}] address@hidden
address@hidden example
+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..
 
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -355,8 +515,8 @@ is to use whatever IP version that matches the host.
 @opindex -6
 @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.
+also on systems without support for IPv6, but will then issue a
+warning and then 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
@@ -375,22 +535,16 @@ standard input is assumed.
 @opindex --host
 Send messages to the given host or socket.  The @var{host} argument
 can be either a local UNIX socket name (containing a slash @samp{/}),
-or be of the form
-
address@hidden
address@hidden:@var{port}]
address@hidden smallexample
-
address@hidden
-where @var{host} is the remote host name or IP address, and the
-optional @var{port} is a decimal port number or symbolic service
-name from @file{/etc/services}.  If @var{port} is not specified,
-the port number corresponding to the @samp{syslog} service is used.
-If a numerical IPv6 address is given without a port specification,
-then the address must be enclosed within brackets (like [::1]).
-
address@hidden address@hidden
address@hidden address@hidden
+or be of the form @address@hidden:@var{port}]}, where @var{host} is
+the remote host name or IP address, and the optional @var{port} is a
+decimal port number or symbolic service name from
address@hidden/etc/services}.  If @var{port} is not specified, the port number
+corresponding to the @samp{syslog} service is used.  If a numerical
+IPv6 address is given without a port specification, then the address
+must be enclosed within brackets (like @samp{[::1]}).
+
address@hidden -i address@hidden
address@hidden address@hidden
 @opindex -i
 @opindex --id
 Add process ID to each message.  If @var{pid} is not supplied, use the
@@ -424,8 +578,8 @@ Log the message to standard error, as well as to the system 
log.
 @opindex --source
 Supply the source IP address for INET connections.  This option is
 useful in conjunction with @option{--host} (see above).  The kind of
-address specified here (IPv4 or IPv6) will propagate to influence
-the resolution of the host address, if it is a symbolic name.
+address specified here (IPv4 or IPv6) will propagate to influence the
+resolution of the host address, if it is a symbolic name.
 
 @item -t @var{tag}
 @itemx address@hidden
@@ -435,117 +589,46 @@ Mark every line in the log with the specified tag.
 
 @item -u @var{socket}
 @itemx address@hidden
address@hidden -h
address@hidden --host
-Send messages to the given local UNIX socket.  The @var{socket} argument
-can be either an absolute path (starting with a slash @samp{/}), or a relative
-path understood relative to the current working directory.
address@hidden -u
address@hidden --unix
+Send messages to the given local UNIX socket.  The @var{socket}
+argument can be either an absolute path (starting with a slash
address@hidden/}), or a relative path understood relative to the current
+working directory.
 @end table
 
-The options are followed by the message which should be written to the
-log.  If not specified, and the @option{-f} flag is not provided,
-standard input is logged.
-
address@hidden Examples
address@hidden examples}
-
-The following examples illustrate the usage of the @command{logger}
-command:
-
address@hidden 1
address@hidden Log the message @samp{System rebooted} to the local syslog.
-Use default facility and priority:
-
address@hidden
-logger System rebooted
address@hidden example
-
address@hidden Run command and send its error output to the channel
address@hidden  Mark each message with tag @samp{cmd}:
-
address@hidden
-command 2>&1 | logger -p local0.err -t cmd
address@hidden example
-
address@hidden Log each line from file @file{warnings} to channel
address@hidden on host @samp{logger.runasimi.org},
-using the source IP @samp{10.10.10.1}:
-
address@hidden
-logger -p daemon.warn -h logger.runasimi.org -S 10.10.10.1  \
address@hidden|       |}--file warnings
address@hidden example
address@hidden enumerate
-
 @node ping invocation
address@hidden @command{ping}: Packets to network hosts
address@hidden ping
-
address@hidden FIXME: The text is far to detailed about the actual 
implementation
address@hidden of ping.  A user doesn't need to know that we are using TIMEVAL, 
or
address@hidden how things are padded.
-
address@hidden uses ICMP datagrams to provoke a response
-from the chosen destination host, mainly intending to probe
-whether it is alive.
-
-The used datagram, of type @code{ECHO_REQUEST}, contains some header
-information and some additional payload, usually a time stamp.
-By a suitable choice of payload, different host or router properties
-are detectable, as the emitted datagram travels to its destination.
-
address@hidden %* Too detailed for end user.
address@hidden uses the ICMP protocol's mandatory
address@hidden datagram to elicit an ICMP type @code{ECHO_REPLY}
-packet from a host or gateway.
address@hidden datagrams (@dfn{pings}) have an IP and
-an ICMP header, followed by a @dfn{struct timeval} and then
-an arbitrary number of @dfn{padding} bytes used to fill out the packet.
address@hidden ignore
address@hidden @command{ping}: Packets to network hosts.
address@hidden ping
 
address@hidden
-Synopsis:
address@hidden uses ICMP datagrams to provoke a response from the
+chosen destination host, mainly intending to probe whether it is
+alive.
 
address@hidden
-ping address@hidden@dots{}] @var{host}
address@hidden example
address@hidden address@hidden@dots{}] @address@hidden
 
 @noindent
-Sending echo requests is the standard use of @command{ping},
-but by far not the only use case.
+By default, @command{ping} sends echo requests to the host.
 
 @menu
-* Ping options::
-* Fault isolation::
-* Duplicate and damaged packets::
-* Data patterns::
-* TTL details::
-* Further remarks::
+* Fault isolation:: Using ping for network fault isolation
 @end menu
 
address@hidden Ping options
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden Options controlling ICMP request types:
address@hidden       --address              Send ICMP_ADDRESS packets (root 
only)
address@hidden       --echo                 Send ICMP_ECHO packets (default)
address@hidden       --mask                 Same as --address
address@hidden       --timestamp            Send ICMP_TIMESTAMP packets
address@hidden   -t, --type=TYPE            Send TYPE packets
-
-Selection of packet type is handled by these first options:
address@hidden
+Options controlling ICMP request types:
 
 @table @option
 @item --address
 @opindex --address
-Send ICMP_ADDRESS packets, thus requesting the address netmask
-in use by the targetted host.
+Send ``ICMP address'' packets, thus requesting the address netmask in
+use by the targetted host.
 
 @item --echo
 @opindex --echo
-Send ICMP_ECHO requests.
-This is the default action.
+Send ``ICMP echo'' requests.  This is the default action.
 
 @item --mask
 @opindex --mask
@@ -553,45 +636,38 @@ Identical to @option{--address}.
 
 @item --timestamp
 @opindex --timestamp
-Send ICMP_TIMESTAMP packets, thereby requesting a timed response
-from the targetted host.
-
-In successful cases three time values are returned.
-All are expected to state the number of milliseconds since
address@hidden
-The first of these, @samp{icmp_otime}, contains the original
-time of sending the request.
-Then comes @samp{icmp_rtime}, the time of reception by the target,
-and finally, @samp{icmp_ttime}, the time of transmitting an answer
-back to the originator.
+Send ``ICMP timestamp'' packets, thereby requesting a timed response
+from the targetted host.  Three values are returned, they are:
+
address@hidden @samp
address@hidden icmp_otime
+The original time of sending the request.
address@hidden icmp_rtime
+The time of reception by the target, and finally,
address@hidden icmp_ttime
+The time of transmitting an answer back to the originator.
address@hidden table
+
+All values are milliseconds since address@hidden
 
 @item -t @var{type}
 @itemx address@hidden
address@hidden --type
 @opindex -t
address@hidden --type
 Send @var{type} packets.  Accepted values are @samp{address},
 @samp{echo}, @samp{mask}, and @samp{timestamp}.
 @end table
 
address@hidden Options valid for all request types:
address@hidden   -c, --count=NUMBER         Stop after sending NUMBER packets
address@hidden   -d, --debug                Set the SO_DEBUG option
address@hidden   -i, --interval=NUMBER      Wait NUMBER seconds between sending 
each packet
address@hidden   -n, --numeric              Do not resolve host addresses
address@hidden   -r, --ignore-routing       Send directly to a host on an 
attached network
address@hidden   -T, --tos=NUM              Set type-of-service to NUM
address@hidden       --ttl=NUMBER           Set specified time-to-live on packet
-
 @noindent
-The following options are available for all packet types:
+Options valid for all request types:
 
 @table @option
 @item -c @var{n}
 @itemx address@hidden
 @opindex -c
 @opindex --count
-Stop after sending and receiving answers to a total of
address@hidden packets.
+Stop after sending and receiving answers to a total of @var{n}
+packets.
 
 @item -d
 @itemx --debug
@@ -603,33 +679,32 @@ Set the SO_DEBUG option on the socket being used.
 @itemx address@hidden
 @opindex -i
 @opindex --interval
-Wait @var{n} seconds until sending next packet.
-The default is to wait for one second between packets.
-This option is incompatible with the option @option{-f}.
+Wait @var{n} seconds until sending next packet.  The default is to
+wait for one second between packets.  This option is incompatible with
+the option @option{-f}.
 
 @item -n
 @itemx --numeric
 @opindex -n
 @opindex --numeric
-Numeric output only.  No attempt will be made to resolve
-symbolic names for host addresses.
+Numeric output only.  No attempt will be made to resolve symbolic
+names for host addresses.
 
 @item -r
 @itemx --ignore-routing
 @opindex -r
address@hidden --ignore-routing-log
address@hidden --ignore-routing
 Bypass the normal routing tables and send directly to a host on an
 attached network.  If the host is not on a directly attached network,
 an error is returned.  This option can be used to ping a local host
-through an interface that has no route through it (e.g., after the
-interface was dropped by @command{routed}).
+through an interface that has no route through it (for example, after
+the interface was dropped by @command{routed}).
 
 @item -T @var{num}
 @itemx address@hidden
 @opindex -T
 @opindex --tos
-Set type-of-service, TOS field, to @var{num} on
-transmitted packets.
+Set type-of-service, TOS field, to @var{num} on transmitted packets.
 
 @item address@hidden
 @opindex --ttl
@@ -655,20 +730,8 @@ Stop after @var{n} seconds.
 Maximum number of seconds @var{n} to wait for a response.
 @end table
 
address@hidden Options valid for --echo requests:
address@hidden   -f, --flood                Flood ping (root only)
address@hidden       --ip-timestamp=FLAG    Timestamp IP option of types tsonly,
address@hidden                              tsaddr, or (not yet implemented) 
prespec.
address@hidden   -l, --preload=NUMBER       Send NUMBER packets as fast as 
possible before
address@hidden                              falling into normal mode of 
behavior (root only)
address@hidden   -p, --pattern=PATTERN      Fill ICMP packet with given pattern 
(hex)
address@hidden   -q, --quiet                no packet message
address@hidden   -R, --route                Record route IP option
address@hidden   -s, --size=NUMBER          Send NUMBER data octets
-
-Finally, these last options are relevant only for sending echo requests,
-allowing many variations in order to detect various peculiarities of
-the targeted host, or the intermediary routers for that matter.
address@hidden
+Options valid for @option{--echo} requests:
 
 @table @option
 @item -f
@@ -678,17 +741,17 @@ the targeted host, or the intermediary routers for that 
matter.
 Flood ping.  Outputs packets as fast as they come back or one hundred
 times per second, whichever is more.  For every ECHO_REQUEST packet
 sent, a period @samp{.} is printed, while for every ECHO_REPLY
-received in reply, a backspace is printed.
-This provides a rapid display of how many packets are being dropped.
-Only the super-user may use this option.
-This can be very hard on a network and should be used with caution.
-
address@hidden address@hidden
address@hidden --ip-timestamp
-Include IP option Timestamp in transmitted packets.
-The value @var{flag} is either @samp{tsonly}, which only records up
-to nine time stamps, or @samp{tsaddr}, which records IP
-addresses as well as time stamps, but for at most four hosts.
+received in reply, a backspace is printed.  This provides a rapid
+display of how many packets are being dropped.  Only the super-user
+may use this option.  This can be very hard on a network and should be
+used with caution.
+
address@hidden --ip address@hidden
address@hidden --ip -timestamp
+Include IP option Timestamp in transmitted packets.  The value
address@hidden is either @samp{tsonly}, which only records up to nine time
+stamps, or @samp{tsaddr}, which records IP addresses as well as time
+stamps, but for at most four hosts.
 
 @item -l @var{n}
 @itemx address@hidden
@@ -711,14 +774,14 @@ with all ones.
 @opindex -q
 @opindex --quiet
 Do not print timing for each transmitted packet.
+
 @item -R
 @itemx --route
 @opindex -R
 @opindex --route
 Record route.  Includes the @code{RECORD_ROUTE} field in the
 ECHO_REQUEST packet and displays the route buffer on returned packets.
-Note that the IP header is only large enough for nine
-such routes.
+Note that the IP header is only large enough for nine such routes.
 Many hosts ignore or discard this option.
 
 @item -s @var{n}
@@ -726,12 +789,12 @@ Many hosts ignore or discard this option.
 @opindex -s
 @opindex --size
 Specifies the number of data bytes to be sent.  The default is 56,
-which translates into address@hidden data bytes, taking
-the address@hidden of ICMP header data into account.
+which translates into address@hidden data bytes, taking the address@hidden
+of ICMP header data into account.
 @end table
 
 @node Fault isolation
address@hidden Using ping for network fault isolation
address@hidden Using @command{ping} for network fault isolation
 
 When using @command{ping} for fault isolation, it should first be run
 on the local host, to verify that the local network interface is up
@@ -748,40 +811,28 @@ This program is intended for use in network testing, 
measurement and
 management.  Because of the load it can impose on the network, it is
 unwise to use ping during normal operations or from automated scripts.
 
address@hidden
address@hidden ICMP Packet Details
-
-An IP header without options consists of 20 bytes.
-An ICMP type ECHO_REQUEST packet contains an additional
-8 bytes worth of ICMP header followed by an arbitrary
-amount of data.
-When a packet size is stated, that indicates
-the size of the extra piece of data (the default is 56).
-Thus the amount of data received as an IP packet
-with an ICMP type ECHO_REPLY, will always be 8 bytes larger
-than the requested data space (the ICMP header).
-
-If the data space is at least eight bytes large, ping uses the first
-eight bytes of this space to include a timestamp which it uses in the
-computation of round trip times.  If less than eight bytes of pad are
-specified, no round trip times are given.
address@hidden ignore
address@hidden
+* Duplicate and damaged packets::      Duplicate and damaged packets
+* Data patterns::                      Trying different data patterns
+* TTL details::                                TTL details
+* Further observations::               Further observations
address@hidden menu
 
 @node Duplicate and damaged packets
address@hidden Duplicate and damaged packets
address@hidden Duplicate and damaged packets
 
-Ping will report duplicate and damaged packets.  Duplicate packets
-should never occur, and seem to be caused by inappropriate link-level
-retransmissions.  Duplicates may occur in many situations and are
-rarely (if ever) a good sign, although the presence of low levels of
-duplicates may not always be cause for alarm.
address@hidden will report duplicate and damaged packets.  Duplicate
+packets should never occur, and seem to be caused by inappropriate
+link-level retransmissions.  Duplicates may occur in many situations
+and are rarely (if ever) a good sign, although the presence of low
+levels of duplicates may not always be cause for alarm.
 
 Damaged packets are obviously serious cause for alarm and often
 indicate broken hardware somewhere in the ping packet's path (in the
 network or in the hosts).
 
 @node Data patterns
address@hidden Trying different data patterns
address@hidden Trying different data patterns
 
 The (inter)network layer should never treat packets differently
 depending on the data contained in the data portion.  Unfortunately,
@@ -803,108 +854,93 @@ You can then examine this file for repeated patterns 
that you can test
 using the @option{-p} option of ping.
 
 @node TTL details
address@hidden TTL details
address@hidden TTL details
 
-The TTL field, @dfn{Time To Live}, of an IP
-packet represents the maximum number of IP routers
-that the packet can go through before being discarded.
-In current practice you can expect each router on the
-Internet to decrement the TTL field by exactly one.
+The TTL field, @dfn{Time To Live}, of an IP packet represents the
+maximum number of IP routers that the packet can go through before
+being discarded.  In current practice you can expect each router on
+the Internet to decrement the TTL field by exactly one.
 
-The TCP/IP specification states that the TTL field
-of a new TCP packet should be set to 60,
-but many systems use smaller values (4.3BSD used 30
-and 4.2BSD used 15).
+The TCP/IP specification states that the TTL field of a new TCP packet
+should be set to 60, but many systems use smaller values (4.3BSD used
+30 and 4.2BSD used 15).
 
 The maximum possible value of this field is 255, and most UNIX systems
-set the TTL field of ICMP (type @code{ECHO_REQUEST})
-packets to 255.  This is why you will find you can ping some hosts,
-but not reach them with @command{telnet} or @command{ftp}.
+set the TTL field of ICMP (type @code{ECHO_REQUEST}) packets to 255.
+This is why you will find you can ping some hosts, but not reach them
+with @command{telnet} or @command{ftp}.
 
-During normal operation, @command{ping} prints the TTL value
-for every packet it receives.
-When a remote system receives an ICMP packet,
-it can do one of three things to the TTL field
-in its response packet:
+During normal operation, @command{ping} prints the TTL value for every
+packet it receives.  When a remote system receives an ICMP packet, it
+can do one of three things to the TTL field in its response packet:
 
 @itemize @bullet
address@hidden
-Not to change it.  This is what Berkeley UNIX systems did before the
-4.3BSD-Tahoe release.  In this case the TTL value in the
-received packet will be 255 minus the number of routers in the
-round-trip path.
-
address@hidden
-Set it to 255.  This is what current Berkeley UNIX systems do.  In this
-case the TTL value in the received packet will be 255 minus the
-number of routers in the path from the remote system to the pinging
-host.
-
address@hidden
-Set it to some other value.  Some machines use the same value for
-ICMP packets that they use for TCP packets,
-for example either 30 or 60.
-Others may use completely arbitrary values.
-
address@hidden Not to change it.
+This is what Berkeley UNIX systems did before the 4.3BSD-Tahoe
+release.  In this case the TTL value in the received packet will be
+255 minus the number of routers in the round-trip path.
+
address@hidden Set it to 255.
+This is what current Berkeley UNIX systems do.  In this case the TTL
+value in the received packet will be 255 minus the number of routers
+in the path from the remote system to the pinging host.
+
address@hidden Set it to some other value.
+Some machines use the same value for ICMP packets that they use for
+TCP packets, for example either 30 or 60.  Others may use completely
+arbitrary values.
 @end itemize
 
address@hidden Further remarks
address@hidden Further observations
address@hidden Further observations
address@hidden Further observations
+
 Many hosts and gateways ignore the @code{RECORD_ROUTE} field, since
-the maximum IP header length is far to small to hold all
-the routes.
+the maximum IP header length is far to small to hold all the routes.
 There is not much that can be done about this.
 
 Flood pinging is not recommended in general, and flood pinging the
 broadcast address should only be done under very controlled
 conditions.
 
-Some BSD variants offer a kernel setting to inhibit all replies
-to ICMP_MASKREQ packets, but in general, Unices are designed either
-to answer the request with a valid netmask, or to drop the request,
+Some BSD variants offer a kernel setting to inhibit all replies to
+ICMP_MASKREQ packets, but in general, Unices are designed either to
+answer the request with a valid netmask, or to drop the request,
 causing @command{ping} to wait for a timeout condition.
 
 @node ping6 invocation
address@hidden @command{ping6}: Packets to IPv6 network hosts
address@hidden ping6
address@hidden @command{ping6}: Packets to IPv6 network hosts.
address@hidden ping6
 
address@hidden uses ICMPv6 datagrams to get a response
-from the chosen destination host.
-The most common use is to probe whether the remote
-system is responsive.
-Observe that this program only uses IPv6 datagrams.
address@hidden uses ICMPv6 datagrams to get a response from the
+chosen destination host.  The most common use is to probe whether the
+remote system is responsive.  Observe that this program only uses IPv6
+datagrams.
 
-Each datagram, of type @code{ECHO_REQUEST}, carries some header
-information and some additional payload, usually a time stamp.
-Making a suitable choice of payload, it is possible to probe
-different host or router properties on the way as the emitted
-datagram travels to its destination.
address@hidden address@hidden@dots{}] @address@hidden
 
 @noindent
-Synopsis:
-
address@hidden
-ping6 address@hidden@dots{}] @var{host}
address@hidden example
+By default, @command{ping} sends echo requests to the host.  This
+command is a close parallel to @command{ping}, except that it handles
+IPv6 and is thus not able to handle peculiarities of IPv4.
 
address@hidden
-Sending simple, timed echo requests is the standard use
-of @command{ping6}, but is by far not the only use case.
+The documentation of @command{ping} provides several pieces of
+information, and discussions, relevant to the use of @command{ping6}.
+Keep in mind, though, that the differing address family causes some
+discrepancy.  @xref{Fault isolation}.
 
-This command is a close parallel to @command{ping},
-except that it handles IPv6 and is thus not able
-to handle peculiarities of IPv4.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden Command line options
address@hidden options}
address@hidden
+Options valid for all request types:
 
 @table @option
 @item -c @var{n}
 @itemx address@hidden
 @opindex -c
 @opindex --count
-Stop after sending and receiving answers to a total of
address@hidden packets.
+Stop after sending and receiving answers to a total of @var{n}
+packets.
 
 @item -d
 @itemx --debug
@@ -912,85 +948,39 @@ Stop after sending and receiving answers to a total of
 @opindex --debug
 Set the SO_DEBUG option on the socket being used.
 
address@hidden -f
address@hidden --flood
address@hidden -f
address@hidden --flood
-Flood ping.
-Outputs packets as fast as they come back,
-or one hundred times per second, whichever is more.
-For every ECHO_REQUEST packet sent, a period @samp{.} is printed,
-while for every ECHO_REPLY received in reply, a backspace is printed.
-
-This provides a rapid display of how many packets are being dropped.
-Only the super-user may use this option.
-This mode can be very hard on a network.
-It should be used with caution!
-
 @item address@hidden
 @opindex --hoplimit
-Limit maximal distance to @var{n}.
-Acceptable values are 1 to 255, inclusive.
+Limit maximal distance to @var{n}.  Acceptable values are 1 to 255,
+inclusive.
 
 @item -i @var{n}
 @itemx address@hidden
 @opindex -i
 @opindex --interval
-Wait @var{n} seconds until sending next packet.
-The default is to wait for one second between packets.
-This option is incompatible with the option @option{-f}.
-
address@hidden -l @var{n}
address@hidden address@hidden
address@hidden -l
address@hidden --preload
-Sends @var{n} packets as fast as possible before falling
-back to the normal mode of operation.
+Wait @var{n} seconds until sending next packet.  The default is to
+wait for one second between packets.  This option is incompatible with
+the option @option{-f}.
 
 @item -n
 @itemx --numeric
 @opindex -n
 @opindex --numeric
-Numeric output only.
-No attempt will be made to resolve symbolic names for host addresses.
-
address@hidden -p @var{pattern}
address@hidden address@hidden
address@hidden -p
address@hidden --pattern
-Up to 16 hexadecimal pad bytes are given as @var{pattern}.
-These are use for filling out the packets you send.
-This option is useful for diagnosing data-dependent problems
-within a network.
-As an example, @option{-p ff} will cause the sent packets
-to have payloads with every bit set to one.
-
address@hidden -q
address@hidden --quiet
address@hidden -q
address@hidden --quiet
-Do not print timing result of each transmitted packet.
+Numeric output only.  No attempt will be made to resolve symbolic
+names for host addresses.
 
 @item -r
 @itemx --ignore-routing
 @opindex -r
address@hidden --ignore-routing-log
-Bypass the normal routing tables and send directly
-to a host on an attached network.
-If the host is not on a directly attached network,
-an error is returned.
-This option can be used to ping a local host
-through an interface, for which there is no
-assigned route, such as when the interface
-was dropped by @command{routed}.
address@hidden --ignore-routing
+Bypass the normal routing tables and send directly to a host on an
+attached network.  If the host is not on a directly attached network,
+an error is returned.  This option can be used to ping a local host
+through an interface, for which there is no assigned route, such as
+when the interface was dropped by @command{routed}.
 
address@hidden -s @var{n}
address@hidden address@hidden
address@hidden -s
address@hidden --size
-Specifies the number of data bytes to be sent.  The default is 56,
-which translates into address@hidden data bytes, taking
-the address@hidden of ICMP header data into account.
address@hidden address@hidden
address@hidden --ttl
+Synonym for @option{--hoplimit}.
 
 @item -T @var{num}
 @itemx address@hidden
@@ -998,10 +988,6 @@ the address@hidden of ICMP header data into account.
 @opindex --tos
 Set the traffic class to @var{num} on transmitted packets.
 
address@hidden address@hidden
address@hidden --ttl
-Synonym for @option{--hoplimit}.
-
 @item -v
 @itemx --verbose
 @opindex -v
@@ -1015,29 +1001,66 @@ Produce more verbose output, giving more statistics.
 Stop after @var{n} seconds.
 @end table
 
-The documentation of @command{ping} provides several
-pieces of information, and discussions, relevant to
-the use of @command{ping6}.
-Keep in mind, though, that the differing address family
-causes some discrepancy.
address@hidden invocation}.
address@hidden
+Options valid for @option{--echo} requests:
 
address@hidden traceroute invocation
address@hidden @command{traceroute}: Trace the route to a host
address@hidden traceroute
address@hidden @option
address@hidden -f
address@hidden --flood
address@hidden -f
address@hidden --flood
+Flood ping.  Outputs packets as fast as they come back, or one hundred
+times per second, whichever is more.  For every ECHO_REQUEST packet
+sent, a period @samp{.} is printed, while for every ECHO_REPLY
+received in reply, a backspace is printed.
 
address@hidden prints a trace of the route
address@hidden are travelling to a remote host.
+This provides a rapid display of how many packets are being dropped.
+Only the super-user may use this option.  This mode can be very hard
+on a network.  It should be used with caution!
 
address@hidden
-Synopsis:
address@hidden -l @var{n}
address@hidden address@hidden
address@hidden -l
address@hidden --preload
+Sends @var{n} packets as fast as possible before falling back to the
+normal mode of operation.
 
address@hidden
-traceroute address@hidden@dots{}] @var{host}
address@hidden example
address@hidden -p @var{pattern}
address@hidden address@hidden
address@hidden -p
address@hidden --pattern
+Up to 16 hexadecimal pad bytes are given as @var{pattern}.  These are
+use for filling out the packets you send.  This option is useful for
+diagnosing data-dependent problems within a network.  As an example,
address@hidden ff} will cause the sent packets to have payloads with every
+bit set to one.
+
address@hidden -q
address@hidden --quiet
address@hidden -q
address@hidden --quiet
+Do not print timing result of each transmitted packet.
+
address@hidden -s @var{n}
address@hidden address@hidden
address@hidden -s
address@hidden --size
+Specifies the number of data bytes to be sent.  The default is 56,
+which translates into address@hidden data bytes, taking the address@hidden
+of ICMP header data into account.
address@hidden table
+
address@hidden traceroute invocation
address@hidden @command{traceroute}: Trace the route to a host.
address@hidden traceroute
+
address@hidden prints a trace of the route address@hidden are
+travelling to a remote host.
 
address@hidden Command line options
address@hidden options}
address@hidden address@hidden@dots{}] @var{host}}
+
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -f @var{num}
@@ -1045,22 +1068,21 @@ traceroute address@hidden@dots{}] @var{host}
 @opindex -f
 @opindex --first-hop
 Set the initial hop distance to @var{num}, instead of the default 1.
-This immediately allows probing packets to sense routing
-properties closer to the target host, skipping routers close
-to the local host.  Quicker analysis of problems known to lie
-at some routing distance is the outcome.
+This immediately allows probing packets to sense routing properties
+closer to the target host, skipping routers close to the local host.
+Quicker analysis of problems known to lie at some routing distance is
+the outcome.
 
 @item -g @var{gates}
 @itemx address@hidden
 @opindex -g
 @opindex --gateways
-Set intermediary hosts used in loose source routing.
-The argument @var{gates} is a list of gateways,
-using spaces, commata, or semicola as separators.
-These hosts must be traversed in the given order
-before the intended host receives any datagram.
-At most eight host names or addresses may be specified.
-Multiple uses of @option{-g} produce a concatenated list.
+Set intermediary hosts used in loose source routing.  The argument
address@hidden is a list of gateways, using spaces, commata, or semicola
+as separators.  These hosts must be traversed in the given order
+before the intended host receives any datagram.  At most eight host
+names or addresses may be specified.  Multiple uses of @option{-g}
+produce a concatenated list.
 
 @item -I
 @itemx --icmp
@@ -1072,25 +1094,24 @@ Use ICMP ECHO datagrams for probing the remote host.
 @itemx address@hidden
 @opindex -m
 @opindex --max-hop
-Set the maximum time-to-live allowed for probing.
-In other words, stop probing when the hop distance
-is in excess of @var{num}.
-The default limit is 64.
+Set the maximum time-to-live allowed for probing.  In other words,
+stop probing when the hop distance is in excess of @var{num}.  The
+default limit is 64.
 
 @item -M @var{method}
 @itemx address@hidden
 @opindex -M
 @opindex --type
 Use @var{method} as carrier packets for traceroute operations.
-Supported choices are @samp{icmp} and @samp{udp}, where @samp{udp}
-is the default type.
+Supported choices are @samp{icmp} and @samp{udp}, where @samp{udp} is
+the default type.
 
 @item -p @var{port}
 @itemx address@hidden
 @opindex -p
 @opindex --port
-Set destination port of target to @var{port}.
-The default value is 33434.
+Set destination port of target to @var{port}.  The default value is
+33434.
 
 @item -q @var{num}
 @itemx address@hidden
@@ -1098,45 +1119,41 @@ The default value is 33434.
 @opindex --tries
 Send a total of @var{num} probe packets per hop, defaulting to 3.
 
address@hidden --resolve-hostnames
address@hidden --resolve-hostnames
address@hidden --resolve -hostnames
address@hidden --resolve -hostnames
 Attempt to resolve all addresses as hostnames.
 
 @item -t @var{num}
 @itemx address@hidden
 @opindex -t
 @opindex --tos
-Set type-of-service, TOS field, to @var{num} on
-transmitted packets.
+Set type-of-service, TOS field, to @var{num} on transmitted packets.
 
 @item -w @var{num}
 @itemx address@hidden
 @opindex -w
 @opindex --wait
-Set timeout in seconds, within which a returning response
-packet is accepted as such.
-Default waiting time is three seconds.
+Set timeout in seconds, within which a returning response packet is
+accepted as such.  Default waiting time is three seconds.
 @end table
 
address@hidden Diagnostic tokens
address@hidden printing}
address@hidden @command{traceroute} diagnostics
 
-During execution, @command{traceroute} sends three datagrams
-for each value for the TTL field, printing a diagnostic line
-of output for these.  The TTL field is then steadily increased
-until the intended host responds, or some intermediary gateway
-returns a datagram to the effect that the target cannot be
-reached due to one reason or another.
+During execution, @command{traceroute} sends three datagrams for each
+value for the TTL field, printing a diagnostic line of output for
+these.  The TTL field is then steadily increased until the intended
+host responds, or some intermediary gateway returns a datagram to the
+effect that the target cannot be reached due to one reason or another.
 
-Each line of output displays a sequence number, followed by
-diagnostic annotation.  Any responding host has its address
-printed without repetition, together with a measured timing.
-In case there is no response within a time period of three seconds,
-an asterisque @samp{*} is printed.
+Each line of output displays a sequence number, followed by diagnostic
+annotation.  Any responding host has its address printed without
+repetition, together with a measured timing.  In case there is no
+response within a time period of three seconds, an asterisque @samp{*}
+is printed.
 
-When an intermediate router responds with an exceptional state,
-the time elapsed since emitting the original datagram is printed,
-followed by an additional short hand hint of the reason:
+When an intermediate router responds with an exceptional state, the
+time elapsed since emitting the original datagram is printed, followed
+by an additional short hand hint of the reason:
 
 @table @samp
 @item !F
@@ -1165,31 +1182,25 @@ Forbidden by remote administration.
 @end table
 
 @node whois invocation
address@hidden @command{whois}: User interface to WHOIS data bases.
address@hidden whois
-
-The functionality of a world wide Internet is dependent on
-stored node information of different kinds.
-Registrars keep much relevant material in WHOIS data bases.
-This utility @command{whois} is able to query those sources
-for general and for particular properties of most domains.
-
-For many domains there are names of suitable data base servers
-hard coded into @command{whois}, ready to query for domain
-relevant information.
-Since servers' names do change from time to time,
-this utility might occasionally need some guidance using
-a suitable command line option.
address@hidden @command{whois}: Whois user interface.
address@hidden whois
 
address@hidden
-Synopsis:
+The functionality of a world wide Internet is dependent on stored node
+information of different kinds.  Registrars keep much relevant
+material in WHOIS data bases.  This utility @command{whois} is able to
+query those sources for general and for particular properties of most
+domains.
 
address@hidden
-whois address@hidden@dots{}] @address@hidden
address@hidden example
+For many domains there are names of suitable data base servers hard
+coded into @command{whois}, ready to query for domain relevant
+information.  Since servers' names do change from time to time, this
+utility might occasionally need some guidance using a suitable command
+line option.
+
address@hidden address@hidden@dots{}] @address@hidden
 
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -a
@@ -1198,33 +1209,22 @@ Search all data bases.
 
 @item -F
 @opindex -F
-Fast and raw output. Implies @option{-r}.
+Fast and raw output.  Implies @option{-r}.
 
 @item -g @var{source}:@address@hidden
 @opindex -g
-Find updates for an object from provider @var{source},
-starting from the version with serial key @var{first},
-and ending with serial key @var{last}.
-
address@hidden -h @var{host}
address@hidden address@hidden
address@hidden -h
address@hidden --server
-Connect to server @var{host}.
-
address@hidden -H
address@hidden -H
-Hide legal disclaimers.
+Find updates for an object from provider @var{source}, starting from
+the version with serial key @var{first}, and ending with serial key
address@hidden
 
 @item -i @var{attr}[,@address@hidden
 @opindex -i
-Do an inverse lookup for specified attributes.
-Use a comma separated list for multiple attributes.
+Do an inverse lookup for specified attributes.  Use a comma separated
+list for multiple attributes.
 
 @item -l
 @opindex -l
-One level less specific lookup.
-Applies to RPSL only.
+One level less specific lookup.  Applies to RPSL only.
 
 @item -L
 @opindex -L
@@ -1238,14 +1238,9 @@ Find more specific matches, one level deeper.
 @opindex -M
 Find all more specific matches.
 
address@hidden -p @var{port}
address@hidden -p
-Connect to server port @var{port}.
-
address@hidden -q @{version|address@hidden
address@hidden -q
-Query specified server info.
-Applies to RPSL only.
address@hidden -q version|sources
address@hidden -q version|sources
+Query specified server info.  Applies to RPSL only.
 
 @item -r
 @opindex -r
@@ -1253,13 +1248,13 @@ Turn off recursive lookups.
 
 @item -R
 @opindex -R
-Force output to show local copy of the domain object,
-even if it contains a referral.
+Force output to show local copy of the domain object, even if it
+contains a referral.
 
 @item -s @var{source}[,@address@hidden
 @opindex -s
-Search the data base at @var{source}.
-A comma separated list queries multiple providers.
+Search the data base at @var{source}.  A comma separated list queries
+multiple providers.
 
 @item -S
 @opindex -S
@@ -1267,103 +1262,71 @@ Tell server to refrain from syntactic sugar.
 
 @item -t @var{type}
 @opindex -t
-Request a template for objects of type @var{type}.
-Use the value @samp{all} for a list of possible types.
+Request a template for objects of type @var{type}.  Use the value
address@hidden for a list of possible types.
 
 @item -T @var{type}[,@address@hidden
 @opindex -T
-Search only for objects of type @var{type}.
-A comma separated list allows for multiple types.
-
address@hidden -V
address@hidden --verbose
address@hidden -V
address@hidden --verbose
-Verbosely explain all actions taken.
+Search only for objects of type @var{type}.  A comma separated list
+allows for multiple types.
 
 @item -x
 @opindex -x
-Search only for exact matches.
-Applicable only to RPSL.
address@hidden table
+Search only for exact matches.  Applicable only to RPSL.
 
address@hidden Environment variables
address@hidden environment}
-
address@hidden holds an internal list of information servers
-and their assigned data bases.
-Queries are examined against this list to select the most
-plausible server, but the hint can always be overruled on
-the command line by use of the option @option{-h}.
-If neither of these have a say, then the default server to ask
-is @samp{whois.internic.net}, but this name is in turn overruled
-by a server name in the environment variable @env{WHOIS_SERVER}.
-
address@hidden @env
address@hidden LANG
-When the server @samp{whois.nic.ad.jp} is queried, and only then,
-any non-Japanese locale in @env{LANG} will ask the server to reply
-with English text, not Japanese.
address@hidden -h @var{host}
address@hidden address@hidden
address@hidden -h
address@hidden --server
+Connect to server @var{host}.
 
address@hidden WHOIS_HIDE
-When set, the effect on @command{whois} is as if the
-option @option{-H} had been given.
address@hidden -H
address@hidden -H
+Hide legal disclaimers.
 
address@hidden WHOIS_SERVER
-Data base server to query when internal hinting is inconclusive.
-When unset, @samp{whois.internic.net} is used as default server.
address@hidden -p @var{port}
address@hidden -p
+Connect to server port @var{port}.
 
address@hidden -V
address@hidden --verbose
address@hidden -V
address@hidden --verbose
+Verbosely explain all actions taken.
 @end table
 
address@hidden Clients
 
 @node ftp invocation
address@hidden @command{ftp}: FTP client
address@hidden ftp
address@hidden @command{ftp}: FTP client.
address@hidden ftp, pftp
 
address@hidden is the user interface to FTP,
-the File Transfer Protocol.
-The program allows a user to transfer files to and from a remote
-network site.
address@hidden is the user interface to FTP, the File Transfer
+Protocol.  The program allows a user to transfer files to and from a
+remote network site.
 
address@hidden
-Synopsis:
+The client host with which @command{ftp} is to communicate may be
+specified on the command line.  If this is done, @command{ftp} will
+immediately attempt to establish a connection to the FTP server
+running on that host.  Otherwise, the program will start a command
+interpreter and will await further instructions from the user.
+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
-ftp address@hidden@dots{}] address@hidden address@hidden
-pftp address@hidden@dots{}] address@hidden address@hidden
address@hidden example
address@hidden address@hidden@dots{}] address@hidden address@hidden@* pftp
address@hidden@dots{}] address@hidden address@hidden
 
 @noindent
-The alternate name @command{pftp} is starting in passive mode,
-but is otherwise identical to @command{ftp}.
-
-The client host with which @command{ftp} is to communicate may be
-specified on the command line.
-If this is done, @command{ftp} will immediately attempt to establish
-a connection to the FTP server running on that host.
-Otherwise, the program will start a command interpreter and will await
-further instructions from the user.
-Commands can either be entered interactively,
-or piped as a batched job read from standard input.
address@hidden is able to distinguish between these two modes
-of operation.
+The alternate name @command{pftp} starts @command{ftp} in passive
+mode, it is otherwise identical to @command{ftp}.
 
 @menu
-* Ftp options::
-* Ftp commands::
-* Ftp environment::
 * The .netrc file::
-* Aborting a file transfer::
-* File naming conventions::
-* File transfer parameters::
 @end menu
 
address@hidden Ftp options
address@hidden Command line options
address@hidden options}
-
-Many command line options have counterparts among the
-commands handled by the internal interpreter.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -1394,8 +1357,8 @@ Enable debugging output and possibly also socket 
debugging.
 @itemx --no-edit
 @opindex -e
 @opindex --no-edit
-Disables the editing of commands.  This is default setting
-for batch mode, without a TTY.
+Disables the editing of commands.  This is default setting for batch
+mode, without a TTY.
 
 @item -g
 @itemx --no-glob
@@ -1409,15 +1372,6 @@ Disables file name globbing.
 @opindex --no-prompt
 Turns off interactive prompting during multiple file transfers.
 
address@hidden -N @var{netrc}
address@hidden address@hidden
address@hidden -N
address@hidden --netrc
-Set a preferred location of the @file{.netrc} file,
-thus overriding any environment setting in @env{NETRC},
-as well as the default location @file{$HOME/.netrc},
address@hidden .netrc file}.
-
 @item -n
 @itemx --no-login
 @opindex -n
@@ -1435,10 +1389,10 @@ login.
 @itemx --passive
 @opindex -p
 @opindex --passive
-Enable passive mode transfer.  Default mode when invoked
-as @command{pftp}.
+Enable passive mode transfer.  Default mode when invoked as
address@hidden
 
address@hidden address@hidden
address@hidden --prompt address@hidden
 @opindex --prompt
 Print a command-line prompt, even if not on a tty.  If @var{prompt} is
 supplied, its value is used instead of the default @samp{ftp> }.
@@ -1454,42 +1408,39 @@ Enable packet tracing (not implemented).
 @itemx --verbose
 @opindex -v
 @opindex --verbose
-Start in verbose mode, printing informational messages.
-This is default for interactive mode.
+Start in verbose mode, printing informational messages.  This is
+default for interactive mode.
 @end table
 
address@hidden Ftp commands
address@hidden Commands interpreted by @command{ftp}
address@hidden Interacting with @command{ftp}
 
-When @command{ftp} is awaiting commands from the user,
-a prompt is displayed.
-The default string is @samp{ftp>}, but it can been
-changed with a command line option, perhaps to enhance
-uniqueness while recording a session.
+When @command{ftp} is awaiting commands from the user, a prompt is
+displayed.  The default string is @samp{ftp>}, but it can been changed
+with a command line option, perhaps to enhance uniqueness while
+recording a session.
 
-Be aware that correct execution of many commands depends upon
-a proper behavior of the remote server.
-The following commands are recognized by @command{ftp} itself.
-Command names can be abbreviated to the shortest unique
-string with identical beginning.
+Be aware that correct execution of many commands depends upon a proper
+behavior of the remote server.  The following commands are recognized
+by @command{ftp} itself.  Command names can be abbreviated to the
+shortest unique string with identical beginning.
 
address@hidden @code
address@hidden ! address@hidden address@hidden
address@hidden @option
address@hidden ! address@hidden@dots{}]
 Invoke an interactive shell on the local machine.  If there are
 arguments, the first is taken to be a command to execute directly,
 with the rest of the arguments as its arguments.
 
address@hidden $ @var{macro-name} address@hidden
address@hidden $ macro-name
 Execute the macro @var{macro-name} that was defined with the macdef
 command.  Arguments are passed to the macro unglobbed.
 
address@hidden account address@hidden
-Supply a supplemental password required by a remote system for access
-to resources, once a login has been successfully completed.  If no
address@hidden account [password]
+Supply a supplemental password required by a remote system for accesst
+o resources, once a login has been successfully completed.  If no
 argument is included, the user will be prompted for an account
 password in non-echoing input mode.
 
address@hidden append @var{local-file} address@hidden
address@hidden append [local-file [remote-file]]
 Append a local file to a file on the remote machine.  If
 @var{remote-file} is left unspecified, the local file name is used in
 naming the remote file after being altered by any @code{ntrans} or
@@ -1505,10 +1456,11 @@ Arrange that a bell be sounded after each file transfer 
command is
 completed.
 
 @item binary
-Set the file transfer type to support binary image transfer.
-This transfer type is selected during initial handshake, should
-the client on a Unix system recognize that the server is also
-running on a Unix system.
address@hidden image
+Set the file transfer type to support binary image transfer.  This
+transfer type is selected during initial handshake, should the client
+on a Unix system recognize that the server is also running on a Unix
+system.
 
 @item bye
 @itemx quit
@@ -1518,14 +1470,12 @@ exit.
 
 @item case
 Toggle the remote computer's use of letter case mapping during
address@hidden commands.
-When @code{case} is @samp{on},
-a file name at the remote site whose every letter appear
-in upper case, will be renamed in such a way that all letters
-are changed to lower case for a local copy of the same file.
-The default setting is @samp{off},
-
address@hidden cd @var{remote-directory}
address@hidden commands.  When @code{case} is @samp{on}, a file name at
+the remote site whose every letter appear in upper case, will be
+renamed in such a way that all letters are changed to lower case for a
+local copy of the same file.  The default setting is @samp{off},
+
address@hidden cd [remote-directory]
 Change the working directory on the remote machine to
 @var{remote-directory}.
 
@@ -1533,15 +1483,14 @@ Change the working directory on the remote machine to
 Change the remote machine's working directory to the parent of the
 current working directory.
 
address@hidden chmod @var{mode} @var{file-name}
address@hidden chmod address@hidden @var{file-name}]
 Change the access permission of the file @var{file-name} on the remote
 system to @var{mode}.
 
 @item close
address@hidden disconnect
-Terminate the FTP session with the present remote server,
-and return to the command interpreter.
-Any defined macros are erased.
address@hidden disconnect
+Terminate the FTP session with the present remote server, and return
+to the command interpreter.  Any defined macros are erased.
 
 @item cr
 Toggle carriage return stripping during ASCII type file retrieval.
@@ -1553,71 +1502,67 @@ systems may contain single linefeeds; when an ASCII 
type transfer is
 made, these linefeeds may be distinguished from a record delimiter
 only when @code{cr} is @samp{off}.
 
address@hidden delete @var{remote-file}
-Delete the file @var{remote-file} on the remote machine.
-
 @item debug address@hidden
 Toggle debugging mode.  If an optional @var{debug-value} is specified
 it is used to set the debugging level.  When debugging is on,
 @command{ftp} prints each command sent to the remote machine, preceded
 by the string @samp{-->}.
 
address@hidden delete [remote-file]
+Delete the file @var{remote-file} on the remote machine.
+
 @item dir address@hidden address@hidden
 Print a listing of the contents in the directory
 @var{remote-directory}, and, optionally, place the output in
 @var{local-file}.  If interactive prompting is set, @command{ftp} will
-prompt the user to verify that the last argument is the intended
-local file to receive output.  If no directory is specified,
-the current working directory on the remote machine is used.  If no
-local file is specified, or if @var{local-file} is a dash @samp{-},
-then output is displayed on the terminal.
+prompt the user to verify that the last argument is the intended local
+file to receive output.  If no directory is specified, the current
+working directory on the remote machine is used.  If no local file is
+specified, or if @var{local-file} is a dash @samp{-}, then output is
+displayed on the terminal.
+
address@hidden form address@hidden
+Set the file transfer form to @var{format}.  The only supported format
+is @samp{non-print}.
 
 @item epsv4
 Toggle the use of EPSV/EPRT for IPv4 addressing.  Default is off.
 
address@hidden form @var{format}
-Set the file transfer form to @var{format}.  The only supported
-format is @samp{non-print}.
-
address@hidden get @var{remote-file} address@hidden
address@hidden recv @var{remote-file} address@hidden
-Retrieve the @var{remote-file} and store it on the local machine.
-If a local file name is not specified, the local copy is given the
-same name as is stated for the remote original, subject to alteration
-by the current @code{case}, @code{ntrans}, and @code{nmap} settings.
-The current settings for @code{type}, @code{form}, @code{mode},
-and @code{structure} are effective during file transfer.
address@hidden get address@hidden address@hidden
address@hidden recv address@hidden address@hidden
+Retrieve the @var{remote-file} and store it on the local machine.  If
+a local file name is not specified, the local copy is given the same
+name as is stated for the remote original, subject to alteration by
+the current @code{case}, @code{ntrans}, and @code{nmap} settings.  The
+current settings for @code{type}, @code{form}, @code{mode}, and
address@hidden are effective during file transfer.
 
 @item glob
 Toggle file name expansion for @code{mdelete}, @code{mget}, and
 @code{mput}.  If globbing is turned off with @code{glob}, the file
 name arguments are taken literally and are not expanded.  Globbing for
address@hidden is done as in @command{csh} syntax.
-For @code{mdelete} and
address@hidden, each remote file name is expanded separately on the
address@hidden is done as in @command{csh} syntax.  For @code{mdelete}
+and @code{mget}, each remote file name is expanded separately on the
 remote machine and the lists are not merged.  Expansion of a directory
 name is likely to be different from expansion of the name of an
-ordinary file: the exact result depends on the remote operating
-system and on the FTP server, and can be previewed by
-issuing @samp{mls remote-files -}.
+ordinary file: the exact result depends on the remote operating system
+and on the FTP server, and can be previewed by issuing @samp{mls
+remote-files -}.
 
 Note: @code{mget} and @code{mput} are not meant to transfer entire
-directory subtrees of files.  That can be achieved by transferring
-an already created @command{tar} or @command{cpio} archive of the
+directory subtrees of files.  That can be achieved by transferring an
+already created @command{tar} or @command{cpio} archive of the
 subtree, then making certain that @command{ftp} uses binary mode.
 
address@hidden hash address@hidden
-In the absence of an argument, toggle the state of hash-sign (@samp{#})
-printing after each transferred data block.
-The optional argument selects the size of data blocks,
-and unconditionally activates printing.
-The default size is 1024 bytes.
-For convenience, the size can be written with postfix multipliers
-'k', 'K', 'm', 'M', and 'g', 'G', to specify kilobytes, Megabytes,
-and Gigabytes, respectively.
-
address@hidden help address@hidden
address@hidden ? address@hidden
address@hidden hash [size]
+Toggle hash-sign (@samp{#}) printing for each data block transferred.
+The size of a data block can optionally be specified.  If not given,
+it defaults to 1024 bytes.  The size can be written with multipliers
+'k', 'K', 'm', 'M', and 'g', 'G', to specify kilobytes, megabytes,
+or gigabytes.
+
address@hidden help [command]
address@hidden ? [command]
 Print an informative message about the meaning of command.  If no
 argument is given, @command{ftp} prints a list of the known commands.
 
@@ -1626,15 +1571,15 @@ Set the inactivity timer on the remote server to 
@var{seconds}
 seconds.  If seconds is omitted, the current inactivity timer is
 printed.
 
address@hidden ipany
+Allow IPv4 as well as IPv6 addressing.
+
 @item ipv4
 Select IPv4 as the only addressing scheme.
 
 @item ipv6
 Select IPv6 as the only addressing scheme.
 
address@hidden ipany
-Allow IPv4 as well as IPv6 addressing.
-
 @item lcd address@hidden
 Change the working directory on the local machine.  If no directory is
 specified, the user's home directory is used.
@@ -1642,153 +1587,147 @@ specified, the user's home directory is used.
 @item lpwd
 Print the name of the current working directory on the local machine.
 
address@hidden ls address@hidden address@hidden
address@hidden ls address@hidden address@hidden
 Print a listing of the contents of a directory on the remote machine.
 The listing includes any system-dependent information that the server
 chooses to include; for example, most UNIX systems will produce output
-like the command @command{ls -l} does.
-Use @code{nlist} for a simple file listing.
+like the command @command{ls -l} does.  Use @code{nlist} for a simple
+file listing.
 
 If @var{remote-directory} is left unspecified, the current working
-directory is used.  With interactive prompting set,
address@hidden will prompt the user to verify that the
-last argument is indeed the intended local file for storing output.
-Should no local file be specified, or if @var{local-file} is a
address@hidden@samp{-}, then output is sent to the terminal.
+directory is used.  With interactive prompting set, @command{ftp} will
+prompt the user to verify that the last argument is indeed the
+intended local file for storing output.  Should no local file be
+specified, or if @var{local-file} is a address@hidden@samp{-}, then output
+is sent to the terminal.
 
address@hidden macdef @var{macro-name}
address@hidden macdef address@hidden
 Define a macro called @var{macro-name}, with subsequent lines as the
-macro definition. A null line (consecutive newline characters in a
-file, or carriage returns at a terminal) terminates macro input
-mode.  There is a limit of 16 macros and a total of 4096 characters
-shared by all defined macros.  Only the first eight characters in
address@hidden are significant when determining which
-macro to execute.
-Macros remain defined until a close command is executed.
-
-The macro processor interprets @samp{$} and @samp{\} as
-special characters.  A @samp{$} followed by a number (one or more
-digits) is replaced by the corresponding argument on the macro's
-invocation command line.
-A @samp{$} followed by the letter @samp{i} tells the macro processor
-that the macro is to perform a loop.
-On the first pass, @samp{$i} is replaced by the first argument on
-the macro's invocation command line, while on the second pass it is
-replaced by the second argument, and so forth.
-Iteration proceeds until all arguments have been consumed.
+macro definition.  A null line (consecutive newline characters in a
+file, or carriage returns at a terminal) terminates macro input mode.
+There is a limit of 16 macros and a total of 4096 characters shared by
+all defined macros.  Only the first eight characters in
address@hidden are significant when determining which macro to
+execute.  Macros remain defined until a close command is executed.
+
+The macro processor interprets @samp{$} and @samp{\} as special
+characters.  A @samp{$} followed by a number (one or more digits) is
+replaced by the corresponding argument on the macro's invocation
+command line.  A @samp{$} followed by the letter @samp{i} tells the
+macro processor that the macro is to perform a loop.  On the first
+pass, @samp{$i} is replaced by the first argument on the macro's
+invocation command line, while on the second pass it is replaced by
+the second argument, and so forth.  Iteration proceeds until all
+arguments have been consumed.
 
 A backslash @samp{\} followed by any character is replaced by that
-character.  Use the backslash @samp{\} to prevent special treatment
-of the dollar sign @samp{$}, as was just explained.
+character.  Use the backslash @samp{\} to prevent special treatment of
+the dollar sign @samp{$}, as was just explained.
 
 @item mdelete address@hidden
 Delete all @var{remote-files} on the remote machine.
 
address@hidden mdir @var{remote-files} @var{local-file}
address@hidden mdir address@hidden address@hidden
 Like @code{dir}, except multiple remote files may be specified.  If
 interactive prompting is on, @command{ftp} will prompt the user to
 verify that the last argument is indeed the intended local file for
 storing any output from @code{mdir}.
 
 @item mget @var{remote-files}
-Expand the @var{remote-files} on the remote machine and execute
-a @code{get} for each file name thus produced.
-Resulting file names will then be processed according to
address@hidden, @code{ntrans}, and @code{nmap} settings.
-Files are transferred to the local working directory,
-which can be changed with @code{lcd directory}; new local directories
-can be created with @code{! mkdir directory}.
-
address@hidden mkdir @var{directory-name}
+Expand the @var{remote-files} on the remote machine and execute a
address@hidden for each file name thus produced.  Resulting file names
+will then be processed according to @code{case}, @code{ntrans}, and
address@hidden settings.  Files are transferred to the local working
+directory, which can be changed with @code{lcd directory}; new local
+directories can be created with @code{! mkdir directory}.
+
address@hidden mkdir address@hidden
 Make a directory on the remote machine.
 
address@hidden mls @var{remote-files} @var{local-file}
address@hidden mls address@hidden @var{local-file}]
 Like @code{nlist}, except multiple remote files may be specified, and
 the @var{local-file} must be specified.  If interactive prompting is
 on, @command{ftp} will prompt the user to verify that the last
-argument is the intended local file for storing output.
-A dash @samp{-} is accepted as last argument without check!
+argument is the intended local file for storing output.  A dash
address@hidden is accepted as last argument without check!
 
 @item mode address@hidden
 Set the file transfer mode to @var{mode-name}.  The default mode is
 @samp{stream}, and it is also the only implemented mode.
 
address@hidden modtime @var{file-name}
address@hidden modtime
address@hidden modtime address@hidden
 Show the last modification time of the file on the remote machine.
 
address@hidden mput @var{local-files}
address@hidden mput address@hidden
 Consider the arguments to be local names and expand any wild card.
-Execute a @code{put} for each file in the resulting list.
-The remote file names are then computed by use of
address@hidden and @code{nmap} settings.
+Execute a @code{put} for each file in the resulting list.  The remote
+file names are then computed by use of @code{ntrans} and @code{nmap}
+settings.
 
address@hidden newer @var{file-name}
address@hidden newer address@hidden
 Get the file only if the modification time of the remote file is more
 recent than the file on the current system.  If the file does not
-exist on the current system, the remote file is considered newer.
-In other respects, this command is identical to @code{get}.
+exist on the current system, the remote file is considered newer.  In
+other respects, this command is identical to @code{get}.
 
 @item nlist address@hidden address@hidden
 Print a list of the files in a directory on the remote machine.  If
 @var{remote-directory} is left unspecified, the current working
 directory is used.  If interactive prompting is on, @command{ftp} will
-prompt the user to verify that the last argument is the intended
-local file for storing output.  If no local file is specified,
-or if @var{local-file} is @samp{-}, the output is sent to the
-terminal.
+prompt the user to verify that the last argument is the intended local
+file for storing output.  If no local file is specified, or if
address@hidden is @samp{-}, the output is sent to the terminal.
 
 @item nmap address@hidden @var{outpattern}]
 Set or unset the file name mapping mechanism.  If no arguments are
-specified, the file name mapping mechanism is unset.
-Name mapping is applied during @code{mput} and
address@hidden commands issued without a specified remote target filename.
-It as also applied to local file names during
address@hidden and @code{get} commands issued without
-local target file name.  This command is useful when
-connecting to a non-UNIX remote computer with different file naming
-conventions or practices.
+specified, the file name mapping mechanism is unset.  Name mapping is
+applied during @code{mput} and @code{put} commands issued without a
+specified remote target filename.  It as also applied to local file
+names during @code{mget} and @code{get} commands issued without local
+target file name.  This command is useful when connecting to a
+non-UNIX remote computer with different file naming conventions or
+practices.
 
 The mapping follows the pattern set by @var{inpattern} and
 @var{outpattern}.  The template @var{inpattern} is used on incoming
 filenames (which may have already been processed according to the
address@hidden and @code{case} settings).
-Variable templating is accomplished
-by including the sequences @samp{$1}, @samp{$2}, @dots{}, @samp{$9} in
address@hidden  Use @samp{\} to prevent this special treatment of
-the character @samp{$}.  All other characters are treated literally,
-and must be matched in a file name for @var{inpattern}
-to bind substrings to variables.
address@hidden and @code{case} settings).  Variable templating is
+accomplished by including the sequences @samp{$1}, @samp{$2}, @dots{},
address@hidden in @var{inpattern}.  Use @samp{\} to prevent this special
+treatment of the character @samp{$}.  All other characters are treated
+literally, and must be matched in a file name for @var{inpattern} to
+bind substrings to variables.
 
 For example, take a pattern @samp{$1.$2} and a file name
address@hidden
-Then @samp{$1} would have the value @samp{mydata}, and
address@hidden would be @samp{data}.
-
address@hidden determines the final file name.
-The sequences @samp{$1} to @samp{$9} are
-replaced by any values bound to them by @var{inpattern}.
-A special sequence @samp{$0} always contains the original filename.
-In addition, a bracketted sequence @address@hidden,@var{seq2}]}
-expands to @var{seq1} if @var{seq1} contains a non-empty string,
-and expands to @var{seq2} otherwise.  For example, the command
address@hidden  Then @samp{$1} would have the value
address@hidden, and @samp{$2} would be @samp{data}.
+
address@hidden determines the final file name.  The sequences
address@hidden to @samp{$9} are replaced by any values bound to them by
address@hidden  A special sequence @samp{$0} always contains the
+original filename.  In addition, a bracketted sequence
address@hidden@var{seq1},@var{seq2}]} expands to @var{seq1} if @var{seq1}
+contains a non-empty string, and expands to @var{seq2} otherwise.  For
+example, the command
 
 @example
 nmap $1.$2.$3 [$1,$2].[$2,file]
 @end example
 
 would yield the output file name @file{myfile.data} for input names
address@hidden and @file{myfile.data.old},
-but produces @file{myfile.file} from the input @file{myfile},
-and @file{myfile.myfile} from @file{.myfile}.
address@hidden and @file{myfile.data.old}, but produces
address@hidden from the input @file{myfile}, and
address@hidden from @file{.myfile}.
 
 Spaces may be included in @var{outpattern}, but are easily removed:
 
 @smallexample
-nmap $1 |sed "s/ *$//" > $1
+nmap $1 | sed "s/ *$//" > $1
 @end smallexample
 
-Use a backslash @samp{\} to escape the characters
address@hidden, @samp{[}, @samp{]}, and @samp{,}.
+Use a backslash @samp{\} to escape the characters @samp{$}, @samp{[},
address@hidden, and @samp{,}.
 
 @item ntrans address@hidden address@hidden
 Set or unset the filename character translation mechanism.  If no
@@ -1807,13 +1746,12 @@ replaced with the corresponding character in 
@var{outchars}.  If the
 character's position in @var{inchars} is longer than the length of
 @var{outchars}, the character is deleted from the file name.
 
address@hidden open @var{host} address@hidden
-Establish a connection to the specified FTP server
-at @var{host}.  An optional port number may be supplied,
-in which case, @command{ftp} will attempt to contact the server
-at that specific TCP port.  If the @code{autologin} option
-is on (is so by default), @command{ftp} will also attempt to
-automatically log the user in to the FTP server.
address@hidden open address@hidden address@hidden
+Establish a connection to the specified FTP server at @var{host}.  An
+optional port number may be supplied, in which case, @command{ftp}
+will attempt to contact the server at that specific TCP port.  If the
address@hidden option is on (is so by default), @command{ftp} will
+also attempt to automatically log the user in to the FTP server.
 
 @item passive
 Toggle passive mode.  If passive mode is turned on (default is off),
@@ -1827,10 +1765,10 @@ sends that address to the remote server, who connects 
back to it.
 Passive mode is useful when using @command{ftp} through a gateway
 router or host that controls the directionality of traffic.  (Note
 that though @command{ftp} servers are required to support the
address@hidden command by RFC 1123, some do not.)  If @command{epsv4}
-has been set to on, the client will attempt @code{EPSV} before
address@hidden for IPv4.  As a last resort @code{LPSV} is attempted.
-With IPv6 only @code{EPSV} and @code{LPSV} are possible.
address@hidden command by RFC 1123, some do not.) If @command{epsv4} has
+been set to on, the client will attempt @code{EPSV} before @code{PASV}
+for IPv4.  As a last resort @code{LPSV} is attempted.  With IPv6 only
address@hidden and @code{LPSV} are possible.
 
 @item prompt
 Toggle interactive prompting.  Interactive prompting occurs during
@@ -1839,27 +1777,27 @@ store files.  If prompting is turned off (default is 
on), any
 @code{mget} or @code{mput} will transfer all files, and any
 @code{mdelete} will delete all files.
 
address@hidden proxy @var{ftp-command}
address@hidden proxy address@hidden
 Execute an @command{ftp} command on a secondary control connection.
 This command allows simultaneous connection to two remote FTP servers
 for transferring files between the two servers.  The first proxy
 command should be @code{open}, to establish the secondary control
-connection.  Enter the command @code{proxy ?} to see other
-commands usable for the secondary connection.  The following
-commands behave differently when prefaced by @code{proxy}: @code{open}
-will not define new macros during the auto-login process, @code{close}
-will not erase existing macro definitions, @code{get} and @code{mget}
-transfer files from the host on the primary control connection to the
-host on the secondary control connection, and @code{put}, @code{mput},
-and @code{append} transfer files from the host on the secondary
-control connection to the host on the primary control connection.
-
-Note that the protocol command @code{PASV} must be understood
-by the server on the secondary control connection for this kind
-of file transfer to succeed.
-
address@hidden put @var{local-file} address@hidden
address@hidden send @var{local-file} address@hidden
+connection.  Enter the command @code{proxy ?} to see other commands
+usable for the secondary connection.  The following commands behave
+differently when prefaced by @code{proxy}: @code{open} will not define
+new macros during the auto-login process, @code{close} will not erase
+existing macro definitions, @code{get} and @code{mget} transfer files
+from the host on the primary control connection to the host on the
+secondary control connection, and @code{put}, @code{mput}, and
address@hidden transfer files from the host on the secondary control
+connection to the host on the primary control connection.
+
+Note that the protocol command @code{PASV} must be understood by the
+server on the secondary control connection for this kind of file
+transfer to succeed.
+
address@hidden put [local-file [remote-file]]
address@hidden send [local-file [remote-file]]
 Store a local file on the remote machine.  If @var{remote-file} is
 left unspecified, the local file name is used after processing
 according to any @code{ntrans} or @code{nmap} settings in naming the
@@ -1872,7 +1810,7 @@ Print the name of the current working directory on the 
remote machine.
 @item quote @address@hidden
 The arguments specified are sent, verbatim, to the remote FTP server.
 
address@hidden reget @var{remote-file} address@hidden
address@hidden reget address@hidden address@hidden
 @code{reget} acts like @code{get}, except that if @var{local-file}
 exists and is smaller than @var{remote-file}, then @var{local-file} is
 presumed to be a partially transferred copy of @var{remote-file} and
@@ -1880,17 +1818,9 @@ the transfer is continued from the apparent point of 
failure.  This
 command is useful when transferring very large files over networks
 that are prone to dropping connections.
 
address@hidden rhelp address@hidden
-Request help from the remote FTP server.
-If @var{command-name} is specified it is passed to the server as well.
-
address@hidden rstatus address@hidden
-With no arguments, show status of remote machine.  If filename is
-specified, show status of @var{file-name} on remote machine.
-
address@hidden rename address@hidden address@hidden
-Rename the file @var{from} on the remote machine as @var{to}.
-Name mapping takes effect without @var{to}.
address@hidden rename address@hidden address@hidden
+Rename the file @var{from} on the remote machine as @var{to}.  Name
+mapping takes effect without @var{to}.
 
 @item reset
 Clear reply queue.  This command re-synchronizes command/reply
@@ -1900,23 +1830,30 @@ server.
 
 @item restart @var{marker}
 Restart the immediately following @code{get} or @code{put} at the
-indicated marker.  On UNIX systems, @code{marker} is usually
-a byte offset into the file.
+indicated marker.  On UNIX systems, @code{marker} is usually a byte
+offset into the file.
+
address@hidden rhelp address@hidden
+Request help from the remote FTP server.  If @var{command-name} is
+specified it is passed to the server as well.
 
address@hidden rmdir @var{directory-name}
address@hidden rmdir address@hidden
 Delete a directory on the remote machine.
 
address@hidden rstatus address@hidden
+With no arguments, show status of remote machine.  If filename is
+specified, show status of @var{file-name} on remote machine.
+
 @item runique
 Toggle the storing of files on the local system with unique filenames.
 If a file already exists with a name equal to the inteded local file
-name for a @code{get} or @code{mget} command,
-then a string @samp{.1} is appended to the name.
-If the resulting name matches another existing file,
address@hidden is appended to the original name.  If this process continues
-up to @samp{.99}, an error message is printed, and the transfer does
-not take place.  The generated unique filename will be reported.  Note
-that @code{runique} will not affect local files generated from a shell
-command.  The default value is off.
+name for a @code{get} or @code{mget} command, then a string @samp{.1}
+is appended to the name.  If the resulting name matches another
+existing file, @samp{.2} is appended to the original name.  If this
+process continues up to @samp{.99}, an error message is printed, and
+the transfer does not take place.  The generated unique filename will
+be reported.  Note that @code{runique} will not affect local files
+generated from a shell command.  The default value is off.
 
 @item sendport
 Toggle the use of @code{PORT} commands.  By default, @command{ftp}
@@ -1933,7 +1870,7 @@ commands but, incorrectly, indicate they've been accepted.
 The arguments specified are sent, verbatim, to the remote FTP server
 as a @code{SITE} command.
 
address@hidden size @var{file-name}
address@hidden size address@hidden
 Return size of @var{file-name} on remote machine.
 
 @item status
@@ -1941,8 +1878,7 @@ Show the current status of @command{ftp}.
 
 @item struct address@hidden
 Set the file transfer structure to @var{struct-name}.  By default
address@hidden structure is used, which also is the only supported
-value.
address@hidden structure is used, which also is the only supported value.
 
 @item sunique
 Toggle storing of files on remote machine under unique file names.
@@ -1959,18 +1895,17 @@ Set the file transfer type to that needed to talk to 
TENEX machines.
 @item trace
 Toggle packet tracing (feature is not implemented).
 
address@hidden type address@hidden
-Set the file transfer type to @var{type-name}.  If no type is
-specified, the current type is printed.
-The recognized type names are @samp{ascii}, @samp{binary},
address@hidden, @samp{image}, and @samp{tenex}.
-The default type is network ASCII.
address@hidden type
address@hidden Set the file transfer type to @var{type-name}.  If
+no type is specified, the current type is printed.  The recognized
+type names are @samp{ascii}, @samp{binary}, @samp{ebcdic},
address@hidden, and @samp{tenex}.  The default type is network ASCII.
 
 @item umask address@hidden
 Set the default umask on the remote server to @var{newmask}.  If
 @var{newmask} is omitted, the current umask is printed.
 
address@hidden user @var{user-name} address@hidden address@hidden
address@hidden user address@hidden address@hidden address@hidden
 Identify yourself to the remote FTP server.  If the password is not
 specified and the server requires it, @command{ftp} will prompt the
 user for it (after disabling local echo).  If an account field is not
@@ -1988,115 +1923,17 @@ a file transfer completes, statistics regarding the 
efficiency of the
 transfer are reported.  By default, verbose is on.
 @end table
 
-Command arguments which have embedded spaces may be inclosed within
-citation characters @samp{"}.
-
address@hidden Aborting a file transfer
address@hidden Aborting a file transfer
-
-To abort a file transfer, use the terminal interrupt key (usually
address@hidden).  Sending transfers will be immediately halted.
-Receiving transfers will be halted by sending a FTP
-protocol command @code{ABOR} to the remote server,
-discarding any further data received.  The speed at
-which this is accomplished depends upon the remote server's support
-for @code{ABOR} processing.  If the remote server does not support the
address@hidden command, an @samp{ftp>} prompt will not appear until the
-remote server has completed sending the requested file.
-
-The terminal interrupt key sequence will be ignored when @command{ftp}
-has completed any local processing and is awaiting a reply from the
-remote server.  A long delay in this mode may result from the
address@hidden processing described above, or from unexpected behavior by
-the remote server, including violations of the FTP protocol.
-If the
-delay results from unexpected remote server behavior, the local
address@hidden program must be killed by hand.
-
address@hidden File naming conventions
address@hidden File naming conventions
-
-Files specified as arguments to @command{ftp} commands are processed
-according to the following rules.
-
address@hidden
address@hidden
-If the file name @samp{-} is specified, standard input (for reading)
-or standard output (for writing) is used.
-
address@hidden
-If the first character of the file name is @samp{|}, the remainder of
-the argument is interpreted as a shell command.  @command{ftp} then
-forks a shell, using @code{popen} with the argument supplied, and
-reads/writes from standard input/output.  If the shell command
-includes spaces, the argument must be quoted; e.g.  @samp{"ls -lt"}.
-
-A particularly useful example of this mechanism in action, is
-
address@hidden
-ftp> dir . |less
address@hidden smallexample
-
-which allows the user to scroll through a long directory listing.
-
address@hidden
-Failing the above checks, if @dfn{globbing} is enabled, local file
-names are expanded according to the rules used by @command{csh};
-c.f. the @code{glob} command.  If the @command{ftp} command expects a
-single local file (e.g. @code{put}), only the first filename
-generated by the globbing operation is used.
-
address@hidden
-For the commands @code{mget} and @code{get} with unspecified
-local file name, the local file name is set to the remote file name,
-which may be altered by a @code{case}, @code{ntrans}, or @code{nmap}
-settings.
-The resulting file name may then be modified if @code{runique} is set.
-
address@hidden
-For the commands @code{mput} and @code{put} with unspecified
-remote file name, the remote file name is copied from the local
-file name, which may be altered by a @code{ntrans} or @code{nmap}
-settings.
-The resulting file name may also be modified by the remote server if
address@hidden is set.
address@hidden enumerate
-
address@hidden File transfer parameters
address@hidden File transfer parameters
-
-The FTP specification includes many parameters which may affect a
-file transfer.  The type may be one of @samp{ascii}, @samp{image}
-(binary), @samp{ebcdic}, and @samp{local} byte size (for PDP-10's and
-PDP-20's mostly).  @command{ftp} supports the @samp{ascii} and
address@hidden types of file transfer, plus local byte size 8 for tenex
-mode transfers.
-
address@hidden supports only the default values for the remaining file
-transfer parameters: @code{mode}, @code{form}, and @code{struct}.
-
-An error in the treatment of carriage returns in the 4.2BSD ascii-mode
-transfer code has been corrected by the present implementation.
-This correction may result in corrupt transfers of binary files
-to and from 4.2BSD servers, when done using the ascii type.
-Avoid this problem by using the binary image type.
-
 @node The .netrc file
 @section The @file{.netrc} file
 @flindex .netrc
 
 The @file{.netrc} file contains login and initialization information
-used by the auto-login process.  It generally resides in the user's
-home directory, but a location outside of the home directory
-can be set using the environment variable @env{NETRC}.
-Both locations are overridden by the command line option @option{-N}.
-The selected file must be a regular file, or access will be denied.
-
-The following tokens are recognized; they may be separated
+used by the auto-login process.  It resides in the user's home
+directory.  The following tokens are recognized; they may be separated
 by spaces, tabs, or new-lines:
 
address@hidden @samp
address@hidden machine name
address@hidden @code
address@hidden machine @var{name}
 Identify a remote machine name.  The auto-login process searches the
 @file{.netrc} file for a machine token that matches the remote machine
 specified on the @command{ftp} command line or as an open command
@@ -2117,11 +1954,11 @@ thereby giving the user automatic anonymous ftp login 
to machines not
 specified in @file{.netrc}.  This can be overridden by using the
 @option{-n} flag to disable auto-login.
 
address@hidden login name
address@hidden login @var{name}
 Identify a user on the remote machine.  If this token is present, the
 auto-login process will initiate a login using the specified name.
 
address@hidden password string
address@hidden password @var{string}
 Supply a password.  If this token is present, the auto-login process
 will supply the specified string if the remote server requires a
 password as part of the login process.  Note that if this token is
@@ -2129,13 +1966,13 @@ present in the @file{.netrc} file for any user other 
than anonymous,
 @command{ftp} will abort the auto-login process if the @file{.netrc}
 is readable by anyone besides the user.
 
address@hidden account string
address@hidden account @var{string}
 Supply an additional account password.  If this token is present, the
 auto-login process will supply the specified string if the remote
 server requires an additional account password, or the auto-login
 process will initiate an @code{ACCT} command if it does not.
 
address@hidden macdef name
address@hidden macdef @var{name}
 Define a macro.  This token functions like the @command{ftp}
 @code{macdef} command functions.  A macro is defined with the
 specified name; its contents begin with the next @file{.netrc} line
@@ -2144,155 +1981,163 @@ encountered.  If a macro named init is defined, it is 
automatically
 executed as the last step in the auto-login process.
 @end table
 
address@hidden Ftp environment
address@hidden Environment variables in use
address@hidden rcp invocation
address@hidden @command{rcp}: Remote copy
address@hidden rcp
 
address@hidden accesses the following environment variables.
address@hidden copies files between machines.  Each file or directory
+argument is either a remote file name of the form
address@hidden@@rhost:path}, or a local file name (containing no @samp{:}
+characters, or a @samp{/} before any @samp{:}s).
 
address@hidden @env
address@hidden HOME
-Used for locating a @file{.netrc} file, if one exists.
address@hidden address@hidden@dots{}] @var{source} @address@hidden
+rcp address@hidden@dots{}] @address@hidden @address@hidden
+rcp address@hidden@dots{}] address@hidden @address@hidden
 
address@hidden NETRC
-Alternate location of the @file{.netrc} file,
-taking precedence over the standard location.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden SHELL
-For determining the default shell interpreter.
address@hidden table
address@hidden @option
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
+Use only IPv4.
 
address@hidden tftp invocation
address@hidden @command{tftp}: TFTP client
address@hidden tftp
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
+Use only IPv6.
 
address@hidden is the user interface to the Internet TFTP, Trivial
-File Transfer Protocol, which allows users to transfer files to and
-from a remote machine.  The remote host may be specified on the
-command line, in which case @command{tftp} uses host as the default
-host for future transfers.
address@hidden -d @var{directory}
address@hidden address@hidden
address@hidden -d
address@hidden --target-directory
+Copy all source arguments into @var{directory}.
 
address@hidden
-Synopsis:
address@hidden -f
address@hidden --from
address@hidden -f
address@hidden --from
+(Server mode only.) Copying from remote host.
 
address@hidden
-tftp address@hidden@dots{} @var{host}
address@hidden example
address@hidden -p
address@hidden --preserve
address@hidden -p
address@hidden --preserve
+Causes @code{rcp} to attempt to preserve (duplicate) in its copies the
+modification times and modes of the source files, ignoring the umask.
+By default, the mode and owner of the target file are preserved if the
+target itself already exists; otherwise the mode of the source file is
+modified by the @code{umask} setting on the destination host.
 
address@hidden Commands
address@hidden -r
address@hidden --recursive
address@hidden -r
address@hidden --recursive
+If any of the source files are directories, @command{rcp} copies each
+subtree rooted at that name; in this case the destination must be a
+directory.
 
-Once @command{tftp} is running, it issues the prompt and recognizes
-the following commands:
address@hidden -t
address@hidden --to
address@hidden -t
address@hidden --to
+(Server mode only.) Copying to remote host.
address@hidden table
 
address@hidden @code
address@hidden ? @var{command-name}
-Print help information.
address@hidden
 
address@hidden ascii
-Shorthand for @code{mode ascii}
address@hidden rexec invocation
address@hidden @command{rexec}: Remote execution client.
address@hidden rexec
 
address@hidden binary
-Shorthand for @code{mode binary}
address@hidden is a program that executes a program on another host.
 
address@hidden connect @var{host-name} address@hidden
-Set the host (and optionally port) for transfers.  Note that the TFTP
-protocol, unlike the FTP protocol, does not maintain connections
-between transfers; thus, the connect command does not actually create
-a connection, but merely remembers what host is to be used for
-transfers.  You do not have to use the connect command; the remote
-host can be specified as part of the get or put commands.
address@hidden address@hidden@dots{}] @var{command}}
 
address@hidden get @var{file-name}
address@hidden get @var{remotename} @var{localname}
address@hidden get @address@hidden
-Get a file, or a set of files, from the specified sources.  The source can
-be in one of two forms: a file name on the remote host, if the host has
-already been specified, or a string of the form @samp{host:filename}
-to specify both a host and file name at the same time.  If the latter
-form is used, the last hostname specified becomes the default for
-future transfers.  When specifying a numeric IPv6 address as host
-part, then this address must be enclosed between square brackets,
-since it contains colons and would interfere with the delimiter
-before the file name.  Brackets are optional for IPv4 addresses.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden
-tftp> get [2001:1234::12]:issue
address@hidden example
address@hidden @option
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
+Use only IPv4 connections as all times.
 
address@hidden mode @var{transfer-mode}
-Set the mode for transfers; @var{transfer-mode} may be one of
address@hidden or @samp{binary}.  The default is @samp{ascii}.
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
+Use only IPv6 connections.
 
address@hidden put @var{file}
address@hidden put @var{localfile} @var{remotefile}
address@hidden put @address@hidden @var{remote-directory}
-Put a file or set of files to the specified remote file or directory.
-The destination can be in one of two forms: a filename on the remote
-host, if the host has already been specified, or a string of the form
address@hidden:filename} to specify both a host and filename at the same
-time.  If the latter form is used, the hostname specified becomes the
-default for future transfers.  If the @file{remote-directory} form is
-used, the remote host is assumed to be a UNIX machine.  The same use
-of square brackets for enclosing numeric IPv6 addresses applies here,
-as was mentioned for the command @command{get}.
address@hidden -a
address@hidden --ipany
address@hidden -a
address@hidden --ipany
+Allow any address family for connections.  This is the default.
 
address@hidden quit
-Exit @command{tftp}.  An end of file also exits.
address@hidden -e
address@hidden address@hidden
address@hidden -e
address@hidden --error
+Specify the TCP port to use for standard error redirection, in case it
+is not specified a random port will be used.
 
address@hidden rexmt @var{retransmission-timeout}
-Set the per-packet retransmission timeout, in seconds.
address@hidden address@hidden
address@hidden -h
address@hidden --host
address@hidden -h
+Specify the host with whom to connect: symbolic name or address.
 
address@hidden status
-Show current status.
address@hidden -n
address@hidden --noerr
address@hidden -n
address@hidden --noerr
+If specified, an error stream will not be created.
 
address@hidden timeout @var{total-transmission-timeout}
-Set the total transmission timeout, in seconds.
address@hidden -p
address@hidden address@hidden
address@hidden -p
address@hidden --password
+Specify the password for logging-in.  The special value consisting of
+a single dash @samp{-} will make @command{rexec} read a single line
+from stdin.  This input is then used as password and is passed as such
+to the remote server.  Thus it is possible to hide vital access
+information slightly better than the full disclosure implicit in the
+text of a command line option.
 
address@hidden trace
-Toggle packet tracing.
address@hidden -P
address@hidden address@hidden
address@hidden -P
address@hidden --port
+Specify to which numerical port a connection shall be sought.  If it
+is not specified, then use port 512/tcp by default.
 
address@hidden verbose
-Toggle verbose mode.
address@hidden -u
address@hidden address@hidden
address@hidden -u
address@hidden --user
+Specify the user with whom to log into the server.
 @end table
 
-Because there is no user-login or validation within the @command{tftp}
-protocol, the remote site will probably have some sort of file-access
-restrictions in place.  The exact methods are specific to each site
-and therefore difficult to document here.
-
address@hidden rsh invocation
address@hidden @command{rsh}: Remote shell
address@hidden rsh
-
address@hidden executes commands on a remote host and copies its local
-standard input to that of the remote command, as well as the remote
-standard output to the local standard output, and the remote standard
-error to the local standard error.  Locally raised interrupt, quit and
-terminate signals are all propagated to the remote command. Normally
address@hidden terminates when the remote command does so.
-
-When using the @command{rsh} command, you can for convenience create
-a link in your path, using a host name as name of the link.  For example:
-
address@hidden
-# ln -s /usr/bin/rsh @var{hostname}
-# @var{hostname} ls
address@hidden example
-
address@hidden
-Afterwards, @var{hostname} will be passed to @command{rsh} as host name
-whenever the command @var{hostname} is issued.
-
address@hidden allows access to the remote host without the use of a
-password.  The prerequisite is a suitable specification in @file{~/.rhosts}.
-For details, @xref{rcmd, , rcmd, libc, The GNU C Library Reference Manual}.
address@hidden rlogin invocation
address@hidden @command{rlogin}: Remote login.
address@hidden rlogin
 
-If no command is specified for @command{rsh} ar argument following the
-host name, then you will be logged in on the remote host using 
@command{rlogin}.
+The @command{rlogin} command starts a terminal session on the
+specified remote host, provided the required authentication is
+successful.  The remote terminal type is the same as that given in the
address@hidden local environment variable.  The terminal and the window
+size stay the same, if the remote host supports them, and any changes
+in size are transferred as need may be.
 
address@hidden Command line options
address@hidden options}
address@hidden address@hidden@dots{}] @var{host}}
 
-The options are as follows :
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -2306,158 +2151,14 @@ Use only IPv4.
 @opindex -6
 @opindex --ipv6
 Use only IPv6.
-
address@hidden -d
address@hidden --debug
address@hidden -d
address@hidden --debug
-Turns on socket debugging used for communication with the remote host.
-
address@hidden -l @var{user}
address@hidden address@hidden
address@hidden -l
address@hidden --user
-By default, the remote username is the same as the local username.
-The @option{-l} option and the @samp{username@@host} format allow the
-remote user name to be specified.  Kerberos authentication is used,
-whenever available, and authorization is determined as in @command{rlogin}
-(@pxref{rlogin invocation}).
-
address@hidden -n
address@hidden --no-input
address@hidden -n
address@hidden --no-input
-Use @file{/dev/null} for all input, telling the server side that
-we send no material.  This can prevent the remote process from
-blocking, should it optionally accept more input.
-The option is void together with encryption.
address@hidden table
-
address@hidden
-The next three options are available only if the program
-has been compiled with support for Kerberos authentication.
-
address@hidden @option
address@hidden -k @var{realm}
address@hidden address@hidden
address@hidden -k
address@hidden --realm
-The option requests rsh to obtain tickets for the remote host in
-realm @var{realm} instead of the remote host's realm.
-
address@hidden -K
address@hidden --kerberos
address@hidden -K
address@hidden --kerberos
-Turns off all Kerberos authentication.
-
address@hidden -x
address@hidden --encrypt
address@hidden -x
address@hidden --encrypt
-Turns on encryption for all data passed via the rsh session.  This
-may impact response time and CPU utilization, but provides increased
-security.
address@hidden table
-
address@hidden
-Finally, some compatibility options are present:
-
address@hidden @option
address@hidden -8
address@hidden --8-bit
address@hidden -e @var{char}
address@hidden address@hidden
address@hidden -E
address@hidden --no-escape
-Ignored during normal operation, but passed on to @command{rlogin}
-when @command{rsh} is invoked without a command argument.
address@hidden table
-
address@hidden Note on stream redirections
-
-Beware that non-quoted shell metacharacters are interpreted on the local
-machine, while quoted metacharacters are interpreted on the remote
-machine.  For example:
-
address@hidden
-rsh otherhost  cat remotefile >> localfile
-rsh otherhost  cat remotefile ">>" otherfile
address@hidden example
-
address@hidden
-The first command appends the contents of @file{remotefile}, as found
-on the remote host, to the file @file{localfile} on the local host,
-since the local shell will intercept the redirection and will thus
-receive whatever the remote process directs to stdout.
-
-In contrast, the second command will append the contents of the same
-file @file{remotefile} to a file named @file{otherfile} again, but this
-time the file is located on the remote host.  The effect of quoting
-the redirection operator is to execute the command
-
address@hidden
-cat remotefile >> localfile
address@hidden smallexample
-
address@hidden
-entirely on the remote most, whence stdout at the remote host will
-have nothing to transmit to the listening local host!.
-
address@hidden rlogin invocation
address@hidden @command{rlogin}: Remote login
address@hidden rlogin
-
-The @command{rlogin} command starts a terminal session on the
-specified remote host, provided the required authentication
-is successful.  The remote terminal type is the same as that
-given in the @env{TERM} local environment variable.
-The terminal and the window size stay the same, if the remote
-host supports them, and any changes in size are transferred
-as need may be.
-
-When using the @command{rlogin} command, you can create a link
-in your path, using a host name as the link name.  For example:
-
address@hidden
-# ln -s /usr/bin/rlogin @var{hostname}
-# @var{hostname} -8
address@hidden example
-
address@hidden
-Afterwards, the use of @var{hostname} will automatically invoke
address@hidden to direct a log in request to the remote host
-named @var{hostname}.
-
address@hidden allows access to the remote host without the use of a
-password.  The prerequisite is a suitable specification in @file{~/.rhosts}.
-For details, @xref{rcmd, , rcmd, libc, The GNU C Library Reference Manual}.
-
address@hidden Command line options
address@hidden options}
-
-The options are as follows :
-
address@hidden @option
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
-Use only IPv4.
-
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
-Use only IPv6.
-
address@hidden -8
address@hidden --8-bit
address@hidden -8
address@hidden --8-bit
-Allows an eight-bit input data path at all times; otherwise parity
-bits are stripped except when the remote side's stop and start
-characters are other than @kbd{C-S}/@kbd{C-Q}.
+
address@hidden -8
address@hidden --8-bit
address@hidden -8
address@hidden --8-bit
+Allows an eight-bit input data path at all times; otherwise parity
+bits are stripped except when the remote side's stop and start
+characters are other than @kbd{C-S}/@kbd{C-Q}.
 
 @item -d
 @itemx --debug
@@ -2487,94 +2188,14 @@ transparent connection.
 @opindex -l
 @opindex --user
 By default, the remote username is the same as the local username.
-This option, and the @samp{user@@host} format, allow the remote
-user name to be made explicit, or changed.
address@hidden table
-
address@hidden
-The next three options are available only if the program
-has been compiled with support for Kerberos authentication.
-
address@hidden @option
address@hidden -k @var{realm}
address@hidden address@hidden
address@hidden -k
address@hidden --realm
-The option requests rlogin to obtain tickets for the remote host in
-realm @var{realm} instead of the remote host's realm.
-
address@hidden -K
address@hidden --kerberos
address@hidden -K
address@hidden --kerberos
-Turns off all Kerberos authentication.
-
address@hidden -x
address@hidden --encrypt
address@hidden -x
address@hidden --encrypt
-Turns on encryption for all data passed via the rlogin session.
-This may impact response time and CPU utilization, but provides
-increased security.
+This option, and the @samp{user@@host} format, allow the remote user
+name to be made explicit, or changed.
 @end table
 
address@hidden Escape characters and flow control
-
-As long as the connection stands, the client program @command{rsh}
-is observing the input stream in order to detect so called
-escape sequences, allowing the user to execute some local
-actions without having to tear down the remote connection.
-
-The sequences consist of two characters, the first of which
-always is the distinguished character @var{escape-char}.
-The following sequences are supported:
-
address@hidden An input line of the form of the two-character sequence
address@hidden @bullet
address@hidden
address@hidden@var{escape-char} .} disconnects from the remote host.
-
address@hidden
address@hidden@var{escape-char} C-d} does the same.
-(Termios character @samp{VEOF}.)
-
address@hidden
address@hidden@var{escape-char} C-z} suspends the session, halting the
-remote process, but keeping it ready for resumed processing.
-The user is given access to a local shell.
-(Termios character @samp{VSUSP}.)
-
address@hidden
address@hidden@var{escape-char} @var{delayed-suspend-char}} implements
-a half-way suspend, in the sense of stopping local input from
-reaching the remote side, but still displaying all output from
-the remote host on the local terminal.  The remote process is
-still running, but the local user is given a local shell until
-the resuming the original command.
-Normally, only BSD systems offer this mode.
-(Termios character @samp{VDSUSP}.)
address@hidden itemize
-
address@hidden
-By default, the character tilde @samp{~} is assigned to @var{escape-char},
-but it can be changed using the option @option{--escape}.
-The processing of escape sequences can even be disable using
-the option @option{--no-escape}.
-On BSD systems, @var{delayed-suspend-char} is usually set to @kbd{C-Y}.
-It displays as @samp{dsusp} using @command{stty}.
-
-All echoing takes place at the remote site, so that the @command{rlogin}
-is transparent except possibly for transmission delays.
-Flow control via @kbd{C-S} and @kbd{C-Q}, if at all supported,
-will stop and start the flow of data on the local terminal.
-Flushing of input and output on interrupts is also
-handled properly.
-
-On the server side the @code{iruserok} and @code{ruserok} functions
-are used to authenticate the connection request, unless Kerberised
-mode is in effect.  See the appropriate man pages for more information.
address@hidden
 
 @section Kerberos Authentication
address@hidden kerberos
 
 If @command{rlogin} was compiled with kerberos support, options
 @option{-x}, @option{-k}, @option{-K} are available.  Each user may
@@ -2586,29 +2207,29 @@ originating user is authenticated to one of the 
principals named in
 @samp{accountname@@localrealm} is granted access if there is no
 @file{.k5login} file.  Otherwise a login and password will be prompted
 for on the remote machine as in @command{login}.  To avoid certain
-security problems, the @file{.k5login} file must be owned by the remote
-user.  If Kerberos authentication fails, a warning message is printed
-and the standard Berkeley rlogin is used instead.
+security problems, the @file{.k5login} file must be owned by the
+remote user.  If Kerberos authentication fails, a warning message is
+printed and the standard Berkeley @command{rlogin} is used instead.
 
address@hidden rcp invocation
address@hidden @command{rcp}: Copy files between machines
address@hidden rcp
address@hidden rsh invocation
address@hidden @command{rsh}: Remote shell.
address@hidden rsh
 
address@hidden copies files between machines.  Each file or directory
-argument is either a remote file name of the form
address@hidden@@rhost:path}, or a local file name (containing no @samp{:}
-characters, or a @samp{/} before any @samp{:}s).
address@hidden executes commands on a remote host and copies its local
+standard input to that of the remote command, as well as the remote
+standard output to the local standard output, and the remote standard
+error to the local standard error.  Locally raised interrupt, quit and
+terminate signals are all propagated to the remote command.  Normally
address@hidden terminates when the remote command does so.
 
address@hidden
-Synopsis:
address@hidden address@hidden@dots{}] address@hidden@@address@hidden 
address@hidden address@hidden@dots{}]]}
 
address@hidden
-rcp address@hidden@dots{} @var{old-file} @var{new-file}
-rcp address@hidden@dots{} @address@hidden @var{directory}
address@hidden example
+If no command is specified for @command{rsh} ar argument following the
+host name, then you will be logged in on the remote host using
address@hidden
 
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -2623,247 +2244,71 @@ Use only IPv4.
 @opindex --ipv6
 Use only IPv6.
 
address@hidden -d @var{directory}
address@hidden address@hidden
address@hidden -d
address@hidden --target-directory
-Copy all source arguments into @var{directory}.
-
address@hidden -f
address@hidden --from
address@hidden -f
address@hidden --from
-(Server mode only.) Copying from remote host.
-
address@hidden -k @var{realm}
address@hidden address@hidden
address@hidden -k
address@hidden --realm
-The option requests rcp to obtain tickets for the remote host in
-realm @var{realm} instead of the remote host's realm.
-
address@hidden -K
address@hidden --kerberos
address@hidden -K
address@hidden --kerberos
-Turns off all Kerberos authentication.
-
address@hidden -p
address@hidden --preserve
address@hidden -p
address@hidden --preserve
-Causes @code{rcp} to attempt to preserve (duplicate) in its copies the
-modification times and modes of the source files, ignoring the umask.
-By default, the mode and owner of the target file are preserved
-if the target itself already exists; otherwise the mode of the source
-file is modified by the @code{umask} setting on the destination host.
-
address@hidden -r
address@hidden --recursive
address@hidden -r
address@hidden --recursive
-If any of the source files are directories, @command{rcp} copies each
-subtree rooted at that name; in this case the destination must be a
-directory.
-
address@hidden -t
address@hidden --to
address@hidden -t
address@hidden --to
-(Server mode only.) Copying to remote host.
-
address@hidden -x
address@hidden --encrypt
address@hidden -x
address@hidden --encrypt
-Turns on encryption for all data passed via the @command{rcp} session.
-This may impact response time and CPU utilization, but provides increased
-security.
-
address@hidden table
-
address@hidden doesn't detect all cases where the target of a copy
-might be a file in cases where only a directory should be legal.
-
address@hidden can be confused by any output generated by commands in a
address@hidden, @file{.profile}, or @file{.cshrc} file on the remote
-host.
-
-The destination user and hostname may have to be specified as
address@hidden when the destination machine is running the 4.2BSD
-version of @command{rcp}.
-
address@hidden rexec invocation
address@hidden @command{rexec}: a remote execution program
address@hidden rexec
-
address@hidden is a program that executes a program on another host.
-
address@hidden
-Synopsis:
-
address@hidden
-rexec address@hidden address@hidden address@hidden  \
address@hidden|      |}[OPTION] @var{command}
address@hidden example
-
address@hidden Command line options
address@hidden options}
-
address@hidden @option
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
-Use only IPv4 connections as all times.
-
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
-Use only IPv6 connections.
-
address@hidden -a
address@hidden --ipany
address@hidden -a
address@hidden --ipany
-Allow any address family for connections.  This is the default.
address@hidden -8
address@hidden --8-bit
address@hidden -8
address@hidden --8-bit
+Allows an eight-bit input data path at all times; otherwise parity
+bits are stripped except when the remote side's stop and start
+characters are other than @kbd{C-S}/@kbd{C-Q}.
 
address@hidden -e
address@hidden address@hidden
address@hidden -e @var{char}
address@hidden address@hidden
 @opindex -e
address@hidden --error
-Specify the TCP port to use for stderr redirection, in case it is not
-specified a random port will be used.
address@hidden --escape
+Allows user specification of the escape character, which is @samp{~}
+by default.  This specification may be as a literal character, or as
+an octal value in the form @samp{\nnn}.
 
address@hidden -h
address@hidden address@hidden
address@hidden -h
address@hidden --host
-Specify the host with whom to connect: symbolic name or address.
address@hidden -d
address@hidden --debug
address@hidden -d
address@hidden --debug
+Turns on socket debugging used for communication with the remote host.
+
address@hidden -l @var{user}
address@hidden address@hidden
address@hidden -l
address@hidden --user
+By default, the remote username is the same as the local username.
+The @option{-l} option and the @samp{username@@host} format allow the
+remote user name to be specified.
 
 @item -n
address@hidden --noerr
address@hidden --no-input
 @opindex -n
address@hidden --noerr
-If specified, an error stream will not be created.
-
address@hidden -p
address@hidden address@hidden
address@hidden -p
address@hidden --password
-Specify the password for logging-in.  The special value
-consisting of a single dash @samp{-} will make @command{rexec}
-read a single line from stdin.  This input is then used
-as password and is passed as such to the remote server.
-Thus it is possible to hide vital access information
-slightly better than the full disclosure implicit in
-the text of a command line option.
-
address@hidden -P
address@hidden address@hidden
address@hidden -P
address@hidden --port
-Specify to which numerical port a connection shall be sought.
-If it is not specified, then use port 512/tcp by default.
-
address@hidden -u
address@hidden address@hidden
address@hidden -u
address@hidden --user
-Specify the user with whom to log into the server.
address@hidden --no-input
+Use @file{/dev/null} for all input, telling the server side that we
+send no material.  This can prevent the remote process from blocking,
+should it optionally accept more input.  The option is void together
+with encryption.
 @end table
 
address@hidden
 
 @node talk invocation
address@hidden @command{talk}: a communication program
address@hidden talk
address@hidden @command{talk}: Talk client.
address@hidden talk
 
 @command{talk} is a visual communication program which copies lines
 from your terminal to that of another user.
 
address@hidden
-Synopsis:
-
address@hidden
-talk @var{person} address@hidden
address@hidden example
-
address@hidden Invoking
-
-The command line arguments are as follows:
-
address@hidden @var
address@hidden person
-If you wish to talk to someone on your own machine, then @var{person}
-is just the other person's login name.
-If you wish to talk to a user on another host,
-then @var{person} is of the form @samp{user@@host}.
-
address@hidden ttyname
-If you wish to talk to a local user who is logged in more than once,
-the argument @var{ttyname} may be used to indicate the appropriate
-terminal name, where @var{ttyname} typically is of the form @samp{ttyXX},
-or @samp{pts/X}.
address@hidden table
-
-When first called, @command{talk} sends a message to
-the addressed user:
-
address@hidden
-Message from TalkDaemon@@address@hidden
-talk: connection requested by your_name@@your_machine.
-talk: respond with: talk your_name@@your_machine
address@hidden example
address@hidden address@hidden@dots{}] @var{person} address@hidden
 
 @noindent
-At this point, the recipient of the message could elect
-to accept the call and to establish a connection by typing:
-
address@hidden
-talk @var{your_name}@@@var{your_machine}
address@hidden example
-
-It doesn't matter from which machine the recipient replies, as long as
-his login-name is the same.  Once communication is established, the
-two parties may type text simultaneously, with their output appearing
-in separate windows.
-Typing @kbd{C-L} will cause the screen to be
-reprinted, while erase, kill, and word kill characters will
-behave normally.
-In addition, @kbd{C-D} will cause both windows to be
-locally cleared of all text.
-This keystroke will appear as a simple @samp{^D} on the remote
-terminal, though.
-It signals to the other party that you yourself have just
-cleared your terminal of all text.
-
-To exit, just type an interrupt character @kbd{C-C};
address@hidden then moves the cursor to the bottom of the screen
-and restores the terminal to its previous state.
-
-The ability to talk may be enabled or disabled by use of the
address@hidden command.  It is system dependent whether
-this message passing is enabled at the outset of a terminal session.
-Certain commands, in particular @command{nroff} and @command{pr},
-disable messages in order to prevent messy output.
+There are no command specific options.
 
 @node telnet invocation
address@hidden @command{telnet}: User interface to TELNET
address@hidden telnet
address@hidden @command{telnet}: User interface to TELNET.
address@hidden telnet
 
-Login to a remote system HOST, optionally using a (non-standard)
-service port PORT.
+Login to a remote system @var{host}, optionally using a (non-standard)
+service port @var{port}.
 
address@hidden
-Synopsis:
address@hidden address@hidden@dots{}] address@hidden address@hidden
 
address@hidden
-telnet address@hidden address@hidden address@hidden
address@hidden example
-
address@hidden Command line options
address@hidden options}
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -2908,68 +2353,147 @@ Turn on socket level debugging.
 @opindex --escape
 Use @var{char} as escape character.
 
address@hidden -E
address@hidden --no-escape
address@hidden -E
address@hidden --no-escape
-Do not use an escape character.
address@hidden -E
address@hidden --no-escape
address@hidden -E
address@hidden --no-escape
+Do not use an escape character.
+
address@hidden -l @var{user}
address@hidden address@hidden
address@hidden -l
address@hidden --user
+Attempt automatic login as @var{user}.
+
address@hidden -L
address@hidden --binary-output
address@hidden -L
address@hidden --binary-output
+Use an 8-bit data path for output only.
+
address@hidden -n @var{file}
address@hidden address@hidden
address@hidden -n
address@hidden --trace
+Record trace information into @var{file}.
+
address@hidden -r
address@hidden --rlogin
address@hidden -r
address@hidden --rlogin
+Display a user-interface similar to that of @command{rlogin}.
address@hidden table
+
address@hidden
+
address@hidden tftp invocation
address@hidden @command{tftp}: TFTP client.
address@hidden tftp
+
address@hidden is the user interface to the Internet TFTP, Trivial
+File Transfer Protocol, which allows users to transfer files to and
+from a remote machine.  The remote host may be specified on the
+command line, in which case @command{tftp} uses host as the default
+host for future transfers.
+
address@hidden address@hidden@dots{}] address@hidden address@hidden
+
+The program accepts the following options.  Also see @ref{Common
+options}.
+
address@hidden @option
address@hidden -v
address@hidden --verbose
address@hidden -v
address@hidden --verbose
+Produce more verbose output, giving more statistics.
address@hidden table
+
address@hidden Interacting with @command{tftp}
+
+When @command{tftp} is awaiting commands from the user, a prompt is
+displayed.
+
+Because there is no user-login or validation within the @command{tftp}
+protocol, the remote site will probably have some sort of file-access
+restrictions in place.  The exact methods are specific to each site
+and therefore difficult to document here.
+
address@hidden @code
address@hidden ? address@hidden
+Print help information.
+
address@hidden ascii
+Shorthand for @code{mode ascii}
+
address@hidden binary
+Shorthand for @code{mode binary}
+
address@hidden connect @var{host} address@hidden
+Set the host (and optionally port) for transfers.  Note that the TFTP
+protocol, unlike the FTP protocol, does not maintain connections
+between transfers; thus, the connect command does not actually create
+a connection, but merely remembers what host is to be used for
+transfers.  You do not have to use the connect command; the remote
+host can be specified as part of the get or put commands.
+
address@hidden get @var{remote-file}
address@hidden get @var{remote-file} @var{local-file}
address@hidden get @address@hidden
+Get a file, or a set of files, from the specified sources.  The source
+can be in one of two forms: a file name on the remote host, if the
+host has already been specified, or a string of the form
address@hidden:filename} to specify both a host and file name at the same
+time.  If the latter form is used, the last hostname specified becomes
+the default for future transfers.
+
+When specifying a numeric IPv6 address as host part, then this address
+must be enclosed between square brackets, since it contains colons and
+would interfere with the delimiter before the file name.  Brackets are
+optional for IPv4 addresses.
 
address@hidden -k @var{realm}
address@hidden address@hidden
address@hidden -k
address@hidden --realm
-Request Kerberos realm @var{realm} instead of whatever is
-declared as default realm in the system's or user's settings.
address@hidden mode @var{transfer-mode}
+Set the mode for transfers; @var{transfer-mode} may be one of
address@hidden or @samp{binary}.  The default is @samp{ascii}.
 
address@hidden -K
address@hidden --no-login
address@hidden -K
address@hidden --no-login
-Do not automatically login to the remote system.
address@hidden put @var{local-file}
address@hidden put @var{local-file} @var{remote-file}
address@hidden put @address@hidden @var{remote-directory}
+Put a file or set of files to the specified remote file or directory.
+The destination can be in one of two forms: a filename on the remote
+host, if the host has already been specified, or a string of the form
address@hidden:filename} to specify both a host and filename at the same
+time.  If the latter form is used, the hostname specified becomes the
+default for future transfers.  If the @file{remote-directory} form is
+used, the remote host is assumed to be a UNIX machine.  The same use
+of square brackets for enclosing numeric IPv6 addresses applies here,
+as was mentioned for the command @command{get}.
 
address@hidden -l @var{user}
address@hidden address@hidden
address@hidden -l
address@hidden --user
-Attempt automatic login as @var{user}.
address@hidden quit
+Exit @command{tftp}.  An end of file character also exits
address@hidden
 
address@hidden -L
address@hidden --binary-output
address@hidden -L
address@hidden --binary-output
-Use an 8-bit data path for output only.
address@hidden rexmt @var{timeout}
+Set the per-packet retransmission timeout, in seconds.
 
address@hidden -n @var{file}
address@hidden address@hidden
address@hidden -n
address@hidden --trace
-Record trace information into @var{file}.
address@hidden status
+Show current status.
 
address@hidden -r
address@hidden --rlogin
address@hidden -r
address@hidden --rlogin
-Display a user-interface similar to that of @command{rlogin}.
address@hidden timeout @var{timeout}
+Set the total transmission timeout, in seconds.
 
address@hidden -x
address@hidden --encrypt
address@hidden -x
address@hidden --encrypt
-If possible, encrypt the data stream.
-
address@hidden -X @var{atype}
address@hidden address@hidden
address@hidden -X
address@hidden --disable-auth
-Disable authentication of type @var{atype}.
-Use this option multiple times if more than one type
-is to be disabled.  Standard choices are @samp{null},
address@hidden, and @samp{kerberos_v5}.
address@hidden trace
+Toggle packet tracing.
+
address@hidden verbose
+Toggle verbose mode.
 @end table
+
address@hidden Daemons
 
 @node inetd invocation
address@hidden @command{inetd}: Internet super-server
address@hidden inetd
address@hidden @command{inetd}: Internet super-server.
address@hidden inetd
 
 @command{inetd} program should be run at boot time by /etc/rc.  It
 then listens for connections on certain internet sockets.  When a
@@ -2977,48 +2501,37 @@ connection is found on one of its sockets, it decides 
what service the
 socket corresponds to, and invokes a program to service the request.
 The server program is invoked with the service socket as its standard
 input, output and error descriptors.  After the program is finished,
-inetd continues to listen on the socket (except in some cases which
-will be described below).  Essentially, inetd allows running one
-daemon to invoke several others, reducing load on the system.
-
-There are two types of services that inetd can start: standard and
-TCPMUX.  A standard service has a well-known port assigned to it; it
-may be a service that implements an official Internet standard or is a
-BSD-specific service.  As described in RFC 1078, TCPMUX services are
-nonstandard services that do not have a well-known port assigned to
-them.  They are invoked from inetd when a program connects to the
-``tcpmux'' well-known port and specifies the service name.  This
-feature is useful for adding locally-developed servers.
address@hidden continues to listen on the socket (except in some
+cases which will be described below).  Essentially, @command{inetd}
+allows running one daemon to invoke several others, reducing load on
+the system.
+
address@hidden address@hidden@dots{}] address@hidden address@hidden@dots{}}
 
 @menu
-* Invocation::
-* Configuration file::
 * Built-in services::
-* TCPMUX::
+* The TCPMUX protocol::
 * Inetd Environment::
 * Error Messages::
 @end menu
 
address@hidden Invocation
address@hidden Invocation
-
-Normally, @command{inetd} is invoked without any arguments.  It does,
-however, support several command line options.  These are:
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
address@hidden -d
address@hidden --debug
 @item -d
 @itemx --debug
address@hidden -d
address@hidden --debug
 Turns on debugging.  With this option, @command{inetd} stays in
-foreground and prints additional debugging information of stderr.
+foreground and prints additional debugging information of standard
+error.
 
 @item --environment
 @opindex --environment
 Pass local and remote socket information in environment variables.
address@hidden Environment}.
 
address@hidden address@hidden
address@hidden -p address@hidden
 @itemx address@hidden
 @opindex -p
 @opindex --pidfile
@@ -3029,31 +2542,29 @@ argument will disable the use of a file for storing the 
process ID.
 @item --resolve
 @opindex --resolve
 Resolve IP addresses when setting environment variables.
address@hidden Environment}.
 
 @item -R @var{rate}
 @itemx address@hidden
address@hidden --r
address@hidden -R
 @opindex --rate
 Specify the maximum number of times a service can be invoked in one
 minute; the default is 1000.
 @end table
 
address@hidden Configuration file
 @section Configuration file
 
-Upon execution, inetd reads its configuration information from
-configuration files and directories named on the command line.
+Upon execution, @command{inetd} reads its configuration information
+from configuration files and directories named on the command line.
 By default these are @file{/etc/inetd.conf} and @file{/etc/initd.d}.
 If the configuration pathname is a directory, all files in the
-directory are read and interpreted like a configuration file.
-All of the configuration files are read and the results are merged.
+directory are read and interpreted like a configuration file.  All of
+the configuration files are read and the results are merged.
 
-There must be an entry for each field in the configuration file,
-with entries for each field separated by a tab or a space.
-Comments are denoted by a ``#'' at the beginning of a line.
-The available fields of the configuration file are summarized
-in the table below (optional parts are enclosed in square brackets):
+There must be an entry for each field in the configuration file, with
+entries for each field separated by a tab or a space.  Comments are
+denoted by a ``#'' at the beginning of a line.  The available fields
+of the configuration file are summarized in the table below (optional
+parts are enclosed in square brackets):
 
 @table @asis
 @item [service node:]service name
@@ -3064,39 +2575,31 @@ services}), the service name must be the official name 
of the service
 representation thereof.  For TCPMUX services, the value of the
 @samp{service name} field consists of the string @samp{tcpmux}
 followed by a slash and the locally-chosen service name
-(@pxref{TCPMUX}).
+(@pxref{The TCPMUX protocol}).
 
-An optional @samp{service node} prefix is allowed for internet services.
-When present, it supplies the local addresses @command{inetd} should
-use when listening for that service.  @samp{Service node} consists of
-a comma-separated list of addresses.  Both symbolic host names and
-numeric IP addresses are allowed.  Symbolic hostnames are looked up in
-DNS service.  If a hostname has multiple address mappings,
address@hidden creates a socket to listen on each address.
+An optional @samp{service node} prefix is allowed for internet
+services.  When present, it supplies the local addresses
address@hidden should use when listening for that service.
address@hidden node} consists of a comma-separated list of addresses.
+Both symbolic host names and numeric IP addresses are allowed.
+Symbolic hostnames are looked up in DNS service.  If a hostname has
+multiple address mappings, @command{inetd} creates a socket to listen
+on each address.
 
 To avoid repeating an address that occurs frequently, a line with a
 host address specifier and colon, but no further fields is allowed,
-e.g.:
-
address@hidden
-127.0.0.1,192.168.0.5:
address@hidden smallexample
+e.g. @samp{127.0.0.1,192.168.0.5:}.
 
 The address specifier from such a line is remembered and used for all
 further lines lacking an explicit host specifier.  Such a default
 address remains in effect until another such line or end of the
 configuration is encountered, whichever occurs first.
 
-A special hostname @samp{*} stands for the wildcard address.
-When used in a normal configuration line, it causes the default address
+A special hostname @samp{*} stands for the wildcard address.  When
+used in a normal configuration line, it causes the default address
 specifier to be ignored for that line.  When used in a default address
-specification, e.g.:
-
address@hidden
-*:
address@hidden smallexample
-
-it causes any previous default address specifier to be forgotten.
+specification, e.g. @code{*:}, it causes any previous default address
+specifier to be forgotten.
 
 @item socket type
 The socket type should be one of @samp{stream}, @samp{dgram},
@@ -3109,29 +2612,30 @@ The protocol must be a valid protocol as given in
 @file{/etc/protocols}.  Examples might be @samp{tcp} or @samp{udp}.
 TCPMUX services must use @samp{tcp}.  If IPv6 support is enabled the
 sockets will accept both IPv4 and IPv6 connections if that is
-supported by the OS.  If inetd should only accept IPv4 or IPv6
-connections, add @samp{4} or @samp{6} to the protocol name.  For
+supported by the OS.  If @command{inetd} should only accept IPv4 or
+IPv6 connections, add @samp{4} or @samp{6} to the protocol name.  For
 example @samp{tcp4} will only accept IPv4 tcp connections and
 @samp{udp6} will only accept IPv6 udp connections.
 
 @item wait/nowait[.max]
 The @samp{wait/nowait} entry specifies whether the server that is
 invoked by @command{inetd} will take over the socket associated with
-the service access point, and thus whether inetd should wait for the
-server to exit before listening for new service requests.  Datagram
-servers must use @samp{wait}, as they are always invoked with the
-original datagram socket bound to the specified service address.
+the service access point, and thus whether @command{inetd} should wait
+for the server to exit before listening for new service requests.
+Datagram servers must use @samp{wait}, as they are always invoked with
+the original datagram socket bound to the specified service address.
 These servers must read at least one datagram from the socket before
 exiting.  If a datagram server connects to its peer, freeing the
-socket so inetd can received further messages on the socket, it is
-said to be a ``multi-threaded'' server; it should read one datagram
-from the socket and create a new socket connected to the peer.  It
-should fork, and the parent should then exit to allow inetd to check
-for new service requests to spawn new servers.  Datagram servers which
-process all incoming datagrams on a socket and eventually time out are
-said to be ``single-threaded''.  @command{comsat} and @command{talkd} are
-both examples of the latter type of datagram server.  @command{tftpd} is an
-example of a multi-threaded datagram server.
+socket so @command{inetd} can received further messages on the socket,
+it is said to be a ``multi-threaded'' server; it should read one
+datagram from the socket and create a new socket connected to the
+peer.  It should fork, and the parent should then exit to allow
address@hidden to check for new service requests to spawn new
+servers.  Datagram servers which process all incoming datagrams on a
+socket and eventually time out are said to be ``single-threaded''.
address@hidden and @command{talkd} are both examples of the latter
+type of datagram server.  @command{tftpd} is an example of a
+multi-threaded datagram server.
 
 Servers using stream sockets generally are multi-threaded and use the
 @samp{nowait} entry.  Connection requests for these services are
@@ -3145,21 +2649,21 @@ e.g.: @samp{nowait.15}.
 Stream-based servers that use @samp{wait} are started with the
 listening service socket, and must accept at least one connection
 request before exiting.  Such a server would normally accept and
-process incoming connection requests until a timeout.
-Other services must use @samp{nowait}.
+process incoming connection requests until a timeout.  Other services
+must use @samp{nowait}.
 
 @item user
 The user entry should contain the user name of the user as whom the
 server should run.  This allows for servers to be given less
-permission than root.  An optional form includes also a group name
-as a suffix, separated from the user name by colon or a period, i.e.,
+permission than root.  An optional form includes also a group name as
+a suffix, separated from the user name by colon or a period, i.e.,
 @samp{user:group} or @samp{user.group}.
 
 @item server program
 The server-program entry should contain the pathname of the program
-which is to be executed by inetd when a request is found on its
-socket.  If inetd provides this service internally, this entry should
-be @samp{internal}.
+which is to be executed by @command{inetd} when a request is found on
+its socket.  If @command{inetd} provides this service internally, this
+entry should be @samp{internal}.
 
 It is common usage to specify @file{/usr/sbin/tcpd} in this field.
 
@@ -3205,9 +2709,8 @@ Send back the current date and time as a 32-bit integer 
number,
 nrepresenting the number of seconds since midnight, January 1, 1900.
 @end table
 
address@hidden TCPMUX
address@hidden TCPMUX
-The TCPMUX protocol.
address@hidden The TCPMUX protocol
address@hidden The TCPMUX protocol
 
 @quotation
 A TCP client connects to a foreign host on TCP port 1.  It sends the
@@ -3225,7 +2728,7 @@ returns the positive reply for the program.  This allows 
you to invoke
 programs that use stdin/stdout without putting any special server code
 in them.
 
-The special service name @samp{help} causes inetd to list TCPMUX
+The special service name @samp{help} causes @command{inetd} to list TCPMUX
 services in @file{inetd.conf}.
 
 To define TCPMUX services, the configuration file must contain a
@@ -3280,8 +2783,8 @@ DNS name of @env{TCPREMOTEIP}.
 @node Error Messages
 @section Error Messages
 
-The inetd server logs error messages using syslog.  Important error
-messages and their explanations are:
+The @command{inetd} server logs error messages using syslog.
+Important error messages and their explanations are:
 
 @table @samp
 @item service/protocol server failing (looping), service terminated.
@@ -3304,14 +2807,14 @@ automatically in 10 minutes.
 @item service/protocol: No such user 'user', service ignored
 @itemx service/protocol: getpwnam: user: No such user
 No entry for user exists in the passwd file.  The first message occurs
-when inetd (re)reads the configuration file.  The second message
-occurs when the service is invoked.
+when @command{inetd} (re)reads the configuration file.  The second
+message occurs when the service is invoked.
 
 @item service/protocol: No such user 'user', service ignored
 @itemx service/protocol: getpwnam: user: No such user
 No entry for user exists in the passwd file.  The first message occurs
-when inetd (re)reads the configuration file.  The second message
-occurs when the service is invoked.
+when @command{inetd} (re)reads the configuration file.  The second
+message occurs when the service is invoked.
 
 @item service: can't set uid number
 @itemx service: can't set gid number
@@ -3319,8 +2822,8 @@ The user or group ID for the entry's user is invalid.
 @end table
 
 @node syslogd invocation
address@hidden @command{syslogd}: system service logging faclity
address@hidden syslogd
address@hidden @command{syslogd}: Syslog server.
address@hidden syslogd
 
 @command{syslogd} is a system service that provides error logging
 facility.  Messages are read from the UNIX domain socket
@@ -3328,6 +2831,8 @@ facility.  Messages are read from the UNIX domain socket
 @file{/etc/services}, and from the special device @file{/dev/klog} (to
 read kernel messages).
 
address@hidden address@hidden@dots{}]}
+
 @command{syslogd} creates the file @file{/var/run/syslog.pid}, and
 stores its process id there.  This can be used to kill or reconfigure
 @command{syslogd}.
@@ -3338,11 +2843,17 @@ decimal number in angle braces, for example, 
@code{<5>}.  This
 priority code should map into the priorities defined in the include
 file @code{sys/syslog.h}.
 
address@hidden
-syslogd address@hidden@dots{}
address@hidden example
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
+<<<<<<< HEAD
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
+Use only IPv4 for Internet domain sockets.
+=======
 @item -f @var{file}
 @itemx address@hidden
 @opindex -f
@@ -3372,67 +2883,51 @@ Do not enter daemon mode.
 @opindex -d
 @opindex --debug
 Print debug information (implies @option{-n}).
+>>>>>>> a776a603369e644f031eee771bf388ab0edb3b91
 
address@hidden -p @var{file}
address@hidden address@hidden
address@hidden -p
address@hidden --socket
-Override default UNIX domain socket @file{/dev/log}.
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
+Use only IPv6 for Internet domain sockets.
 
 @item -a @var{socket}
address@hidden -a
 Add UNIX socket to listen.  An unlimited number of sockets is allowed.
 
address@hidden -r
address@hidden --inet
address@hidden -r
address@hidden --inet
-Receive remote messages via Internet domain socket.
-Without this option no remote massages are received,
-since there is no listening socket. Yet sockets for
-forwarding are created on the fly as needed,
-which might cause performance issues on busy systems.
-
 @item -b @var{address}
 @itemx address@hidden
 @opindex -b
 @opindex --bind
 Restrict the listening Internet domain socket to a single address.
 The default (given the use of @option{-r}) is a wildcard address,
-implying that the server listens at every available address.
-Any name will be resolved, and the lookup result will depend
-on the options @option{-4}, @option{-6}, and @option{--ipany}.
-
address@hidden --no-unixaf
address@hidden --no-unixaf
-Do not listen on UNIX domain sockets (overrides @option{-a} and
address@hidden).
+implying that the server listens at every available address.  Any name
+will be resolved, and the lookup result will depend on the options
address@hidden, @option{-6}, and @option{--ipany}.
 
address@hidden --no-klog
address@hidden --no-klog
-Do not listen to the kernel log device @file{/dev/klog}.
-
address@hidden --ipany
address@hidden --ipany
-Allow both address families: IPv4 and IPv6.
address@hidden -B @var{port}
address@hidden address@hidden
address@hidden -B
address@hidden --bind-port
 
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
-Use only IPv4 for Internet domain sockets.
address@hidden -d
address@hidden -d
address@hidden --debug
address@hidden --debug
+Print debug information (implies @option{-n}).
 
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
-Use only IPv6 for Internet domain sockets.
address@hidden -D @var{dir}
address@hidden address@hidden
address@hidden -D
address@hidden --rcdir
+Override configuration directory (the default is
address@hidden/etc/syslog.d}).
 
address@hidden --no-forward
address@hidden --no-forward
-Do not forward any messages (overrides @option{-h}).
-This disables even temporary creation of forwarding
-sockets, an ability which is otherwise active when
-the option @option{-r} is left out.
address@hidden -f @var{file}
address@hidden address@hidden
address@hidden -f
address@hidden --rcfile
+Override configuration (the default file is @file{/etc/syslog.conf}).
 
 @item -h
 @itemx --hop
@@ -3440,17 +2935,23 @@ the option @option{-r} is left out.
 @opindex --hop
 Forward messages from remote hosts.
 
address@hidden -m @var{interval}
address@hidden address@hidden
address@hidden -m
address@hidden --mark
-Specify timestamp interval expressed in minutes (0 for no timestamping).
address@hidden --ipany
address@hidden --ipany
+Allow both address families: IPv4 and IPv6.
 
 @item -l @var{hostlist}
 @opindex -l
 Log hosts in @var{hostlist} by their hostname.  Multiple lists are
 allowed.
 
+<<<<<<< HEAD
address@hidden -m @var{interval}
address@hidden address@hidden
address@hidden -m
address@hidden --mark
+Specify timestamp interval expressed in minutes (0 for no
+timestamping).
+=======
 @item -s @var{domainlist}
 @opindex -s
 List of domains which should be stripped from the FQDN of hosts before
@@ -4002,386 +3503,206 @@ the process owner himself.
 @opindex -l
 @opindex --logging
 Enable logging.
+>>>>>>> a776a603369e644f031eee771bf388ab0edb3b91
 
 @item -n
address@hidden --nonexistent
address@hidden --no-detach
 @opindex -n
address@hidden --nonexistent
-Supress negative acknowledgement of requests for nonexistent relative
-filenames.
-
address@hidden -s @var{dir}
address@hidden address@hidden
address@hidden -s
address@hidden --secure-dir
-Let the serving process change its root directory to @var{dir}
-before attending to any requests.
-This directory is not observable by any client, but improves
-server isolation, since servable contents must be located
-below this chrooted directory @var{dir}.
-
address@hidden -u @var{user}
address@hidden address@hidden
address@hidden -u
address@hidden --user
-Specify the process owner for serving requests.
-Only relevant along with the option @option{-s}.
-The default name is @samp{nobody}.
address@hidden table
-
address@hidden Directory prefixes
address@hidden validation}
-
-In addition to options, an invocation of @command{tftpd} can
-specify an optional list of directory prefixes.
-These are approved of according to two principles:
-
address@hidden @bullet
address@hidden
-Relative pathnames are ignored.
-
address@hidden
-At most twenty prefixes are approved, the rest is discarded.
address@hidden itemize
-
address@hidden
-A request for a file is decided upon as a consequence
-of evaluating these criteria:
-
address@hidden @bullet
address@hidden
-Every file request containing the substring @samp{/../} is denied,
-as is a file name beginning with @samp{../}.
-
address@hidden
-Write requests must specify absolute locations.
-
address@hidden
-A file request, if specified as an @emph{absolute} pathname,
-must begin with one of the approved directory prefixes,
-should at least one such prefix have been accepted.
-
address@hidden
-In the absence of a prefix collection, any absolute pathname is
-accepted, should the corresponding file exist.
-
address@hidden
-A file request, if specified as a @emph{relative} name,
-will only be searched for below the acceptable prefixes,
-should at least one such prefix have been approved.
-
address@hidden
-A request for a relatively named file, is denied in the absence
-of approved directory prefixes.
-
address@hidden
-The resulting file must be world readable, or world writable,
-for a read request, or a write request, to succeed.
address@hidden itemize
-
address@hidden Use cases
address@hidden setup cases}
-
-The standard use case is an entry in @file{/etc/inetd.conf} like
-
address@hidden
-tftp dgram udp4 wait root /usr/sbin/tftpd \
address@hidden        } tftpd /tftpboot /altboot
address@hidden example
-
address@hidden
-This would allow the TFTP client to use any of
-
address@hidden
-get kernel
-get /tftpboot/kernel
-get kernel.alt
-get /altboot/kernel.alt
-get /etc/motd
address@hidden smallexample
-
address@hidden
-given that @file{/tftpboot/kernel} and @file{/altboot/kernel.alt} exist.
-Observe that also @file{/etc/motd} is accessible, inspite there being
-no explicit mention of standard file locations.
-
-A stronger mode of running a TFTP server is to use the `secure mode',
-meaning that the serving process is running in a chrooted mode.
-Then a suitable configuration could be
-
address@hidden
-tftp dgram udp4 wait root /usr/sbin/tftpd \
address@hidden        } tftpd --secure-dir=/srv/tftp-root  /tftpboot /altboot
address@hidden example
-
address@hidden
-Supposing that the files @file{/srv/tftp-root/tftpboot/kernel}
-and @file{/srv/tftp-root/altboot/kernel.alt} were available,
-all the previously suggested client requests for a kernel would
-still be granted, but now any request for @file{/etc/motd}
-would be declined, and would get a reply `File not found' back.
-
-The chrooted setting is denying access outside of
address@hidden/srv/tftp-root}, yet is not indicating this lock-in
-to the client, and is thus improving server isolation.
-Since neither of @option{-u} and @option{-g} were specified,
-the configuration reproduced above will in fact have the
-transmitting server process running with the default
-owner set to @samp{nobody:nogroup}.
-
address@hidden rshd invocation
address@hidden @command{rshd}: Remote shell server
address@hidden rshd
-
-The @command{rshd} server is the server for the @code{rcmd} routine
-and, consequently, for the @command{rsh} (@pxref{rsh invocation})
-program.  The server provides remote execution facilities with
-authentication based on privileged port numbers from trusted hosts.
-The @command{rshd} server listens for service requests at the port
-indicated in the @samp{cmd} service specification.  When a service
-request is received the following protocol is initiated:
-
address@hidden
address@hidden
-The server checks the client's source port.  If the port is not in the
-range 512--1023, the server aborts the connection.  However, this
-condition is not applied for Kerberized service.
-
address@hidden
-The server reads characters from the socket up to a NUL (@samp{\0})
-byte.  The resultant string is interpreted as an ASCII number, base
-10.
-
address@hidden
-If the number received in step 2 is non-zero, it is interpreted as the
-port number of a secondary stream to be used for the stderr.  A second
-connection is then created to the specified port on the client's
-machine.  The source port of this second connection is also in the
-range 512--1023.
address@hidden --no-detach
+Do not enter daemon mode.
 
address@hidden
-The server checks the client's source address and requests the
-corresponding host name.  If the hostname cannot be determined, the
-dot-notation representation of the host address is used.  If the
-hostname is in the same domain as the server (according to the last
-two components of the domain name), or if the @option{-a} option is
-given, the addresses for the hostname are requested, verifying that
-the name and address correspond.  If address verification fails, the
-connection is aborted with the message, @samp{Host address mismatch.}
address@hidden --no -forward
address@hidden --no -forward
+Do not forward any messages (overrides @option{-h}).  This disables
+even temporary creation of forwarding sockets, an ability which is
+otherwise active when the option @option{-r} is left out.
 
address@hidden
-A null terminated user name of at most 16 characters is retrieved on
-the initial socket.  This user name is interpreted as the user
-identity on the client's machine.
address@hidden --no -klog
address@hidden --no -klog
+Do not listen to the kernel log device @file{/dev/klog}.
 
address@hidden
-A null terminated user name of at most 16 characters is retrieved on
-the initial socket.  This user name is interpreted as a user identity
-to use on the server's machine.
address@hidden --no -unixaf
address@hidden --no -unixaf
+Do not listen on UNIX domain sockets (overrides @option{-a} and
address@hidden).
 
address@hidden
-A null terminated command to be passed to a shell is retrieved on the
-initial socket.  The length of the command is limited by the upper
-bound on the size of the system's argument list.
address@hidden address@hidden
address@hidden --pidfile
+Override pidfile (the default file is @file{/var/run/syslogd.pid}).
 
address@hidden
-Rshd then validates the user using @code{ruserok}, which uses the file
address@hidden/etc/hosts.equiv} and the @file{.rhosts} file found in the
-user's home directory.  The @option{-l} option prevents @code{ruserok}
-from doing any validation based on the user's @file{.rhosts} file,
-unless the user is the superuser.
address@hidden -p @var{file}
address@hidden address@hidden
address@hidden -p
address@hidden --socket
+Override default UNIX domain socket @file{/dev/log}.
 
address@hidden
-If the file @file{/etc/nologin} exists and the user is not the
-superuser, the connection is closed.
address@hidden -r
address@hidden --inet
address@hidden -r
address@hidden --inet
+Receive remote messages via Internet domain socket.  Without this
+option no remote massages are received, since there is no listening
+socket.  Yet sockets for forwarding are created on the fly as needed,
+which might cause performance issues on busy systems.
 
address@hidden
-A null byte is returned on the initial socket and the command line is
-passed to the normal login shell of the user.  The shell inherits the
-network connections established by @command{rshd}.
address@hidden -s @var{domainlist}
address@hidden -s
+List of domains which should be stripped from the FQDN of hosts before
+logging their name.  Multiple lists are allowed.
 
address@hidden
-Transport-level keepalive messages are enabled unless the @option{-n}
-option is present.  The use of keepalive messages allows sessions to
-be timed out if the client crashes or becomes unreachable.
address@hidden -S
address@hidden --sync
address@hidden -S
address@hidden --sync
address@hidden table
 
address@hidden
-The @option{-L} option causes all successful accesses to be logged to
address@hidden (@pxref{syslogd invocation}) as @samp{auth.info}
-messages.
address@hidden enumerate
address@hidden ftpd invocation
address@hidden @command{ftpd}: FTP Daemon.
address@hidden ftpd
 
address@hidden, , ruserok, libc, The GNU C Library Reference Manual},
-for details.
address@hidden is the Internet File Transfer Protocol server process.
+The server uses the TCP protocol and listens at the port specified in
+the @samp{ftp} service specification.
 
address@hidden Invoking
address@hidden address@hidden@dots{}]}
 
-The options are as follows:
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
address@hidden -a
address@hidden --verify-hostname
address@hidden -a
address@hidden --verify-hostname
-Ask hostname for verification.
address@hidden -4
address@hidden --ipv4
address@hidden -4
address@hidden --ipv4
+Daemon uses only IPv4 addressing.  Ignored in @command{inetd} mode.
 
address@hidden @item -d
address@hidden @itemx --daemon
address@hidden @opindex -d
address@hidden @opindex --daemon
address@hidden Daemon mode.
address@hidden -6
address@hidden --ipv6
address@hidden -6
address@hidden --ipv6
+Daemon uses only IPv6 addressing.  Ignored in @command{inetd} mode.
 
address@hidden -k
address@hidden --kerberos
address@hidden -k
address@hidden --kerberos
-Use Kerberos authentication.
address@hidden -a @var{auth}
address@hidden address@hidden
address@hidden -a
address@hidden --auth
+Specify what authentication mechanism to use for incoming connections.
+Possible values are: @samp{default}.
 
address@hidden -l
address@hidden --no-rhosts
address@hidden -l
address@hidden --no-rhosts
-Ignore @file{.rhosts} file.
+Anonymous logins will continue to work when this option is used,
+unless the user @samp{ftp} is removed from the system.
 
address@hidden -L
address@hidden --log-sessions
address@hidden -L
address@hidden --log-sessions
-Log successful logins.
address@hidden -A
address@hidden --anonymous-only
address@hidden -A
address@hidden --anonymous-only
+Only anonymous login is allowed.
 
address@hidden -n
address@hidden --no-keepalive
address@hidden -n
address@hidden --no-keepalive
-Do not set SO_KEEPALIVE.
address@hidden -D
address@hidden --daemon
address@hidden -D
address@hidden --daemon
address@hidden enters daemon-mode.  That allows @command{ftpd} to be
+run without @command{inetd}.
 
address@hidden -S @var{name}
address@hidden address@hidden
address@hidden -S
address@hidden --servername
-Set Kerberos server name, overriding canonical hostname.
address@hidden -d
address@hidden --debug
address@hidden -d
address@hidden --debug
+Debugging information is written to the @code{syslog} using facility
address@hidden
 
address@hidden -v
address@hidden --vacuous
address@hidden -v
address@hidden --vacuous
-Fail any call asking for non-Kerberos authentication.
-
address@hidden OBSOLETE?
address@hidden @item -x
address@hidden @itemx --encrypt
address@hidden @opindex -x
address@hidden @opindex --encrypt
address@hidden Turns on DES encryption for all data passed via the 
@command{rshd}
address@hidden session.  This may impact response time and CPU utilization, but
address@hidden provides increased security.
-
address@hidden @item address@hidden
address@hidden @itemx address@hidden
address@hidden @opindex -D
address@hidden @opindex -debug
address@hidden Set debug level, not implemented.
-
address@hidden @item -o
address@hidden @itemx --allow-root
address@hidden @opindex -o
address@hidden @opindex --allow-root
address@hidden Allow uid == 0 to login, disabled by default
-
address@hidden @item -p @var{port}
address@hidden @itemx address@hidden
address@hidden @opindex -p
address@hidden @opindex --port
address@hidden Listen on given port (valid only in daemon mode).
address@hidden -l
address@hidden --logging
address@hidden -l
address@hidden --logging
+Each successful and failed ftp session is logged using @code{syslog}
+with a facility of @samp{LOG_FTP}.  If this option is specified twice,
+the retrieve (@code{get}), store (@code{put}), append, delete, make
+directory, remove directory and rename operations and their filename
+arguments are also logged.
 
address@hidden -r
address@hidden --reverse-required
address@hidden -r
address@hidden --reverse-required
-Demand that the client's IP address be resolvable
-as a host name.
address@hidden table
address@hidden --non-rfc2577
address@hidden --non-rfc2577
+Do not follow the suggestion of RFC 2577 to suppress messages that
+could help an attacker to conduct user name enumeration.  This option
+allows the server to return with an error message immediately upon
+receipt of a user name.  Such information includes non-existence
+claims and expiration claims.  The ideal mode would otherwise be to
+fake the relevance of asking for a password, and only thereafter
+report an invalid login.
 
-Should @command{rshd} have been built with PAM support,
-it reads any setting specified for a service named either
address@hidden or @samp{krsh}, the latter name for clients
-seeking Kerberised authentication.
address@hidden -p @var{pidfile}
address@hidden address@hidden
address@hidden -p
address@hidden --pidfile
+Change default location of @var{pidfile}.
 
address@hidden Diagnostics
address@hidden -q
address@hidden --no-version
address@hidden -q
address@hidden --no-version
+Quiet mode.  No information about the version of the @command{ftpd} is
+given to the client.
 
-Except for the last one listed below, all diagnostic messages are
-returned on the initial socket, after which any network connections
-are closed.  An error is indicated by a leading byte with a value of 1
-(0 is returned in step 10 above upon successful completion of all the
-steps prior to the execution of the login shell).
address@hidden -T
address@hidden --max-timeout
address@hidden -T
address@hidden --max-timeout
+A client may also request a different timeout period; the maximum
+period allowed may be set to timeout seconds with the @option{-T}
+option.  The default limit is 2 hours.
 
address@hidden @samp
address@hidden Locuser too long
-The name of the user on the client's machine is longer than 16
-characters.
address@hidden -t @var{timeout}
address@hidden address@hidden
address@hidden -t
address@hidden --timeout
+The inactivity timeout period is set to timeout seconds (the default
+is 15 minutes).
 
address@hidden Ruser too long
-The name of the user on the remote machine is longer than 16
-characters.
address@hidden -u @var{umask}
address@hidden address@hidden
address@hidden -u
address@hidden --umask
+Set default umask, expressed in base 8.
address@hidden table
 
address@hidden Command too long
-The command line passed exceeds the size of the argument list (as
-configured into the system).
address@hidden rexecd invocation
address@hidden @command{rexecd}: Remote execution server.
address@hidden rexecd
 
address@hidden Login incorrect
-No password file entry for the user name existed.
address@hidden is the server for the @code{rexec} routine.  The
+server provides remote execution facilities with authentication based
+on user names and passwords.  It passes error messages and notices to
+the @code{syslog} facility @samp{LOG_DAEMON}.
 
address@hidden Remote directory
-The chdir command to the home directory failed.
address@hidden address@hidden@dots{}]}
 
address@hidden Permission denied
-The authentication procedure described above failed,
-or address resolution was insufficient.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden Can't make pipe.
-The pipe needed for the stderr, wasn't created.
address@hidden @option
address@hidden -l
address@hidden --logging
address@hidden -l
address@hidden --logging
+Raise logging level for this service; use more than once for increased
+verbosity.  The @code{syslog} facility in use is @samp{LOG_DAEMON}.
address@hidden table
 
address@hidden Can't fork; try again.
-A fork by the server failed.
address@hidden rlogind invocation
address@hidden @command{rlogind}: Remote login server.
address@hidden rlogind
 
address@hidden <shellname>: @dots{}
-The user's login shell could not be started.  This message is returned
-on the connection associated with the stderr, and is not preceded by a
-flag byte.
address@hidden table
address@hidden is the server for the @command{rlogin} client
+program.  @xref{rlogin invocation}.  The server provides a remote
+login facility with authentication based on privileged port numbers
+from trusted hosts.
 
-The authentication procedure used here assumes the integrity of each
-client machine and the connecting medium.  This is insecure, but is
-useful in an ``open'' environment.
address@hidden address@hidden@dots{}]}
 
address@hidden rlogind invocation
address@hidden @command{rlogind}: Remote login server
address@hidden rlogind
-
address@hidden is the server for the @command{rlogin} client program
-(@pxref{rlogin invocation}).  The server provides a remote login
-facility with authentication based on privileged port numbers from
-trusted hosts, or using authentication according to a Kerberos
-protocol.
-
address@hidden in daemon mode listens for service requests at the
-port indicated in the @samp{login} service specification.  A common
-alternative is to have the super-server @command{inetd} listen at
-the same port, which then invokes @command{rlogind} as demand arises.
-In Kerberised mode, the port is either @samp{eklogin}, or
address@hidden, depending on preset encryption, or none.
-
-The standard authentication procedure assumes the integrity of each
-client machine and of the connecting medium.  This is insecure, since
-it transmits credentials in clear text, but is useful in an ``open''
-environment.  This weakness is reduced when running the service
-in Kerberised version, at the price of a larger complexity of the
-supporting infrastructure.  Using an encrypting Kerberised service
-even avoids all clear text processing.
-
address@hidden Invoking
-
-The available options are as follows:
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -4
@@ -4402,18 +3723,17 @@ Only IPv6 connections in daemon mode.
 @opindex --verify-hostname
 Ask hostname for verification.
 
address@hidden address@hidden
address@hidden -d address@hidden
 @itemx address@hidden
 @opindex -d
 @opindex --daemon
-Run in background daemon mode, optionally setting the maximal
-number of simultaneously running client sessions.  The default
-limit is 10.
+Run in background daemon mode, optionally setting the maximal number
+of simultaneously running client sessions.  The default limit is 10.
 
address@hidden address@hidden
address@hidden -D address@hidden
 @itemx address@hidden
 @opindex -D
address@hidden -debug
address@hidden --debug
 Set debug level, not implemented.
 
 @item -l
@@ -4433,8 +3753,8 @@ the domain is recovered from the canonical name of the 
host.
 @itemx --no-keepalive
 @opindex -n
 @opindex --no-keepalive
-Do not set SO_KEEPALIVE on sockets.  This decreases the ability
-to close lost connections to once active clients.
+Do not set SO_KEEPALIVE on sockets.  This decreases the ability to
+close lost connections to once active clients.
 
 @item -o
 @itemx --allow-root
@@ -4455,286 +3775,92 @@ Listen on given port.  Applicable only in daemon mode.
 Require reverse resolvability of remote host's numerical IP.
 @end table
 
-For sites requiring improved authentication, Kerberos
-authentication is a viable decision, and possibly even
-with encryption for enhanced integrity.  Three additional
-options are available for an executable @command{rlogind}
-compiled with Kerberos support.
-
address@hidden @option
address@hidden -k
address@hidden --kerberos
address@hidden -k
address@hidden --kerberos
-Activate Kerberos authentication on all incoming requests.
-
address@hidden -S @var{name}
address@hidden address@hidden
address@hidden -S
address@hidden --server-principal
-Set Kerberos server name, overriding canonical hostname.
-
address@hidden -x
address@hidden --encrypt
address@hidden -x
address@hidden --encrypt
-Activate encryption of all data passed via the @command{rlogind} session.
-This may impact response time and CPU utilization, but provides
-increased security.  Only for Kerberised mode of operation.
address@hidden table
-
-Should @command{rlogind} have been built with PAM support,
-it reads any setting specified for a service named either
address@hidden or @samp{krlogin}, the latter name for clients
-using Kerberised authentication.
-
address@hidden Kerberos specific details
-
-The option @option{-k} is mandatory for Kerberised operation mode,
-while addition of the option @option{-x} will also demand encryption
-of every request to this particular server.
-
address@hidden will, in Kerberised operation mode, as default
-instantiate itself using the principal name
address@hidden/canonical_name@@DEFAULT_REALM}, a compound arranged
-from the running host's canonical name, and from the default realm
-configured for the system.  Either of these can be overridden
-using the option @option{--server-principal}, as follows:
-
address@hidden
-rlogind -k -S alias.server.our
-rlogind --kerberos --server-principal=@@NEW.REALM
-rlogind -k -x -S rlogin/backup.ex.org@@OUR.REALM
address@hidden example
-
-When overriding only the realm, with the option @option{-S},
-an initial at-sign is mandatory.
-
address@hidden Protocol details
-
-When a service request is received, in non-Kerberised mode,
-the following protocol is initiated:
-
address@hidden
address@hidden
-The server checks the client's source port.  If the port is not in the
-range 512-1023, the server aborts the connection.
-
address@hidden
-The server next checks the client's source address and requests the
-corresponding host name.  If the hostname cannot be determined, the
-numerical representation of the host address is used.  If the
-hostname is in the same domain as the server (according to the last
-two components of the domain name), or if the option @option{-a} is
-in effect, the address for the hostname is requested, verifying that
-the name and address correspond.  Normal authentication is considered
-as failed, should this address verification fail.
address@hidden enumerate
-
-Once the source port and address have been checked, @command{rlogind}
-proceeds
-with the authentication process as described in @ref{rshd invocation}.
-The server
-then allocates a pseudo terminal, and manipulates file descriptors so
-that the slave half of the pseudo terminal becomes the stdin, stdout,
-and stderr for a login process.  The login process is an instance of
-the @command{login} program, invoked with the option @option{-f} if
-authentication had succeeded.  If automatic authentication had failed,
-the user is prompted to log in as if on a standard terminal line.
-
-The parent of the login process manipulates the master side of the
-pseudo terminal, operating as an intermediary between the login
-process and the client instance of the rlogin program.  In normal
-operation, the packet protocol described in @samp{PTY} is invoked to
-provide flow control using @kbd{C-S}/@kbd{C-Q}, and to propagate interrupt
-signals to the remote program.  The login process transmits the
-client terminal's baud rate, and its terminal type, as found in the
-environment variable @env{TERM}.  The screen or window size of the
-terminal is requested from the client, and any later window size changes
-at the client's side are propagated to the pseudo terminal as well.
-
-Transport-level keepalive messages are enabled unless the
-option @option{-n} was in effect when starting @code{rlogind}.
-The use of keepalive messages allows sessions to be timed out,
-should the client crash, or otherwise become unreachable.
-
address@hidden, , ruserok, libc, The GNU C Library Reference Manual},
-for details.
-
address@hidden Diagnostics
-
-The exchange protocol states that a negotiation reaches a successful
-completion as soon as the server @command{rlogind} transmits back to
-the client a single null byte, marking the completion of all
-information exchange.
-
-Error conditions are instead transmitted back to the client as
-a message containing an initial byte value 1, followed by a C-string
-indicating the cause of failure. All network connections are closed
-at the server side after this message.  Some common messages follow:
-
address@hidden @samp
address@hidden Permission denied.
-The client presented insufficient credentials,
-or the client's address is not sufficiently resolvable
-to pass the checks induced by options @option{-a} or @option{-r}.
-
address@hidden Try again.
-A fork by the server failed.
address@hidden table
-
address@hidden rexecd invocation
address@hidden @command{rexecd}: server for @code{rexec}
address@hidden rexecd
-
address@hidden is the server for the @code{rexec} routine.  The
-server provides remote execution facilities with authentication based
-on user names and passwords.  It passes error messages and notices
-to the @code{syslog} facility @samp{LOG_DAEMON}.
-
address@hidden
-rexecd address@hidden@dots{}
address@hidden example
-
address@hidden listens for service requests at the port indicated in
-the @samp{exec} service specification.  When a service request is
-received the following protocol is initiated:
-
address@hidden
address@hidden
-The server reads characters from the socket up to a NUL (@samp{\0})
-byte.  The resultant string is interpreted as an ASCII number, base
-10.
-
address@hidden
-If the number received in step 1 is non-zero, it is interpreted as the
-port number of a secondary stream to be used for the stderr.  A second
-connection is then created to the specified port on the client's
-machine.
-
address@hidden
-A NUL terminated user name of at most 16 characters is retrieved on
-the initial socket.
-
address@hidden
-A NUL terminated, unencrypted password of at most 16 characters is
-retrieved on the initial socket.
address@hidden
 
address@hidden
-A NUL terminated command to be passed to a shell is retrieved on the
-initial socket.  The length of the command is limited by the upper
-bound on the size of the system's argument list.
-
address@hidden
address@hidden then validates the user as is done at login time and,
-if the authentication was successful, changes to the user's home
-directory, and establishes the user and group protections of the user.
-If any of these steps fail the connection is aborted with a diagnostic
-message returned.
address@hidden rshd invocation
address@hidden @command{rshd}: Remote shell server.
address@hidden rshd
 
address@hidden
-A NUL byte is returned on the initial socket and the command line is
-passed to the normal login shell of the user.  The shell inherits the
-network connections established by rexecd.
address@hidden enumerate
+The @command{rshd} server is the server for the @code{rcmd} routine
+and, consequently, for the @command{rsh} (@pxref{rsh invocation})
+program.  The server provides remote execution facilities with
+authentication based on privileged port numbers from trusted hosts.
 
address@hidden Invoking
address@hidden address@hidden@dots{}]}
 
-The only option is as follows:
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
address@hidden -a
address@hidden --verify-hostname
address@hidden -a
address@hidden --verify-hostname
+Ask hostname for verification.
+
 @item -l
address@hidden --logging
address@hidden --no-rhosts
 @opindex -l
address@hidden --logging
-Raise logging level for this service; use more than once for
-increased verbosity.  The @code{syslog} facility in use is
address@hidden
-
address@hidden table
-
-Should @command{rexecd} have been built with PAM support,
-it reads any setting specified for a service named @samp{rexec}.
-
address@hidden Diagnostics
-
-Except for the last one listed below, all diagnostic messages are
-returned on the initial socket, after which any network connections
-are closed.  An error is indicated by a leading byte with a value of 1
-(0 is returned in step 7 above upon successful completion of all the
-steps prior to the command execution).
-
address@hidden @samp
address@hidden username too long
-The name is longer than 16 characters.
-
address@hidden password too long
-The password is longer than 16 characters.
-
address@hidden command too long
-The command line passed exceeds the size of the argument list (as
-configured into the system).
-
address@hidden Login incorrect.
-No password file entry for the user name existed.
-
address@hidden Password incorrect.
-The wrong password was supplied.
address@hidden --no-rhosts
+Ignore @file{.rhosts} file.
 
address@hidden No remote directory.
-The chdir command to the home directory failed.
address@hidden -L
address@hidden --log-sessions
address@hidden -L
address@hidden --log-sessions
+Log successful logins.
 
address@hidden Try again.
-A fork by the server failed.
address@hidden -n
address@hidden --no-keepalive
address@hidden -n
address@hidden --no-keepalive
+Do not set SO_KEEPALIVE.
 
address@hidden <shellname>: @dots{}
-The user's login shell could not be started.  This message is returned
-on the connection associated with the stderr, and is not ...
address@hidden FIXME: Fill this out.
address@hidden -r
address@hidden --reverse-required
address@hidden -r
address@hidden --reverse-required
+Demand that the client's IP address be resolvable as a host name.
 @end table
 
address@hidden, that indicating @samp{Login incorrect} as opposed to
address@hidden incorrect} is a security breach which allows people to
-probe a system for users with null passwords.
-
address@hidden
 
 @node talkd invocation
address@hidden @command{talkd}: a server for communication between users
address@hidden talkd
address@hidden @command{talkd}: Talk server.
address@hidden talkd
 
 @command{talkd} is a server that notifies users that someone else
-wants to initiate a conversation.  It acts as a repository of
-invitations, responding to requests by clients wishing to rendezvous
-for a conversation.
-
-This implementation uses the newer protocol @samp{ntalk/udp},
-and is intended to be invoked by a super-server
address@hidden at that datagram port.
-It is recommended that @command{inetd} launch @command{talkd}
-with ownership @samp{nobody:tty}, or with @samp{tty:tty}.
-However, this works with ACL only if @file{.talkrc} can be assumed
-to be world readable for all users.
-This failing, the process ownership will need to be @samp{root:tty}
-if the ACL-mechanism is to be usable and trustworthy.
-
-Keep in mind that this service is usable with IPv4 only,
-since the exchange protocol was conceived to handle only
-this particular address family.
-This fact is independent of the abilities of @command{inetd}.
-
-Observe also that the server @command{talkd} depends
-on the name returned by @command{hostname}, for establishing
-connections between interested parties.
-A server @command{talkd} running on a multi-homed host
-is not able to respond to invitations for a valid host name
-that differs from the name reported by @command{hostname}.
-
-The present implementation offers ACL-mechanisms for fine
-grained access control.
-
address@hidden Invoking
-
-The following switches and options are available.
+wants to initiate a conversation using the program @command{talk}.
address@hidden invocation}.  It acts as a repository of invitations,
+responding to requests by clients wishing to rendezvous for a
+conversation.
+
address@hidden address@hidden@dots{}]}
+
+This implementation uses the newer protocol @samp{ntalk/udp}, and is
+intended to be invoked by a super-server @command{inetd} at that
+datagram port.  It is recommended that @command{inetd} launch
address@hidden with ownership @samp{nobody:tty}, or with
address@hidden:tty}.  However, this works with ACL only if @file{.talkrc}
+can be assumed to be world readable for all users.  This failing, the
+process ownership will need to be @samp{root:tty} if the ACL-mechanism
+is to be usable and trustworthy.
+
+Keep in mind that this service is usable with IPv4 only, since the
+exchange protocol was conceived to handle only this particular address
+family.  This fact is independent of the abilities of @command{inetd}.
+
+Observe also that the server @command{talkd} depends on the name
+returned by @command{hostname}, for establishing connections between
+interested parties.  A server @command{talkd} running on a multi-homed
+host is not able to respond to invitations for a valid host name that
+differs from the name reported by @command{hostname}.
+
+The present implementation offers ACL-mechanisms for fine grained
+access control.
+
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
 @item -a @var{file}
@@ -4745,8 +3871,8 @@ Read site-wide ACLs from @var{file}.
 
 @item -d
 @itemx --debug
address@hidden -d
 @opindex --debug
address@hidden --d
 Enable debugging.
 
 @item -i @var{seconds}
@@ -4757,11 +3883,11 @@ Set idle timeout length
 
 @item -l
 @itemx --logging
address@hidden -i
address@hidden -l
 @opindex --logging
-Enable a somewhat enhanced logging verbosity, reporting
-attempted and dropped connections, as well as
-some more unexpected events that might arise.
+Enable a somewhat enhanced logging verbosity, reporting attempted and
+dropped connections, as well as some more unexpected events that might
+arise.
 
 @item -r @var{seconds}
 @itemx address@hidden
@@ -4773,9 +3899,9 @@ Set time-to-live length for requests.
 @itemx --strict-policy
 @opindex -S
 @opindex --strict-policy
-Apply strict ACL policy on this system. This means that
-the site-wide ACL must provide explicit @samp{allow}
-rules for admitting traffic at all.
+Apply strict ACL policy on this system.  This means that the site-wide
+ACL must provide explicit @samp{allow} rules for admitting traffic at
+all.
 
 @item -t @var{seconds}
 @itemx address@hidden
@@ -4784,144 +3910,109 @@ rules for admitting traffic at all.
 Set timeout length.
 @end table
 
address@hidden Modus operandi
-
-In normal operation, a client, the caller, initiates a rendezvous by
-sending a @code{CTL_MSG} of type @samp{LOOK_UP} to the server (see
address@hidden/talkd.h}).  This causes the server to search its
-invitation tables to check whether an invitation currently exists for the
-caller (wanting to talk to the callee specified in the message).  If the
-lookup fails, the caller then sends an @samp{ANNOUNCE} message causing
-the server to broadcast an announcement on the callee's login ports
-requesting contact.  When the callee responds, the local server uses
-the recorded invitation to respond with the appropriate rendezvous
-address and the caller and callee client programs establish a stream
-connection through which the conversation takes place.
-
-This implementation offers an additional mechanism, whereby a site-wide
-access control list can be used to limit service access in general.
-For any local user, i.e., present on the server's system, a further user
-owned file @file{.talkrc} is parsed, if at all present, in order to even
-further fine tune access to this particular user.
-
address@hidden Access control in talkd
-
-The server can be run in a mode with additional access control,
address@hidden Access control lists in @command{talkd}
+
address@hidden can be run in a mode with additional access control,
 beyond the legacy capabilities of @command{ntalkd}.  This is activated
-using the option @option{-a}, or equivalently @option{--acl}.
+using the @option{--acl} option.
 
-The format of this access control list is shared with the user specific
-file @file{.talkrc}.  Normally the site-wide setting operates with
-a default value @samp{allow}, but specifying the option @option{-S},
-or @option{--strict-policy}, changes this default action to @samp{deny}.
+The format of the access control list is shared with the user specific
+file @file{.talkrc}.  Normally the site-wide setting operates with a
+default value @samp{allow}, but specifying the option @option{-S}, or
address@hidden, changes this default action to @samp{deny}.
 In addition, the strict policy disables the possibility that an
-allowing action from the user specific ACL be able to override
-a denial resulting from the system-wide ACL setting.
+allowing action from the user specific ACL be able to override a
+denial resulting from the system-wide ACL setting.
 
 As is usual, indentation, empty lines, and lines whose first printable
-character is the hash character, are all ignored.
-The general line format is
+character is the hash character, are all ignored.  The general line
+format is:
 
 @example
-action user-exp [net-exp @dots{}]
address@hidden @var{user-exp} address@hidden@dots{}]
 @end example
 
 @noindent
-Each active line must contain at least two fields:
-an @code{action} and a @code{user-exp}.
-
-The first field, @code{action}, must be either of @samp{allow} and @samp{deny}.
-Any other value will lead to the line being ignored,
-but reported in the system log.
-Of course, the two values represent admitting and rejecting
-interpretations for the resulting rule.
-
-The second field, @code{user-exp}, is a POSIX regular expression
-crafted to match user names.
-Remember that the regular expression would need anchors in order
-to test not only substrings.
-
-It is important to note that in a site-wide ACL, the file selected
-by the switch @option{-a}, the expression @code{user-exp} is matched
+Each active line must contain at least two fields: an @var{action} and
+a @var{user-exp}.
+
+The first field, @var{action}, must be either of @samp{allow} and
address@hidden  Any other value will lead to the line being ignored, but
+reported in the system log.  Of course, the two values represent
+admitting and rejecting interpretations for the resulting rule.
+
+The second field, @var{user-exp}, is a POSIX regular expression
+crafted to match user names.  Remember that the regular expression
+would need anchors in order to test not only substrings.
+
+It is important to note that in a site-wide ACL, the file selected by
+the switch @option{-a}, the expression @var{user-exp} is matched
 against the requested local user name, that of the callee.
 
-While checking the callee's private ACL-file @file{.talkrc},
-the matching of @code{user-exp} is done against the remote
-caller's name.  Any other interpretation is plainly futile.
+While checking the callee's private ACL-file @file{.talkrc}, the
+matching of @var{user-exp} is done against the remote caller's name.
+Any other interpretation is plainly futile.
 
 Each line may be augmented by a net list, containing one or more
-expressions @code{net-exp}. Each of these is either the simple
-word @samp{any}, a numeric IPv4 address, or a full IPv4 address with
-an appended netmask.  The effect is to restrict the applicability
-of the rule to the specified address range, or to set an explicit
-wildcard match @samp{any}.
-The absence of a net list is equivalent to specifying
-a single @samp{any}.  The netmask can be specified as a CIDR mask
-length, or as an explicit address mask.
-
-The actual evaluation is made separately for the site-wide ACL,
-and for the requested local user ACL, contained in the callee's
-private file @file{.talkrc}.  This latter file must be a regular
-file and must be owned by the very same user, have his primary
-group ownership, and not be group or world writeable.  Should
-any of these prerequisites be violated, the user's ACL is replaced
-by a single deny-all rule.
-
-All rules in each set are evaluated, in the sense that whenever
-an expression @code{net-exp} matches the incoming IPv4 address,
-then the regular expression @code{user-exp} is tested for a match.
-That being the case, the corresponding action is recorded.  The last
-match in each set determines the outcome in its category.
-
-In the most common case, a system wide @samp{deny} is overridden
-if the local user has specified at least one valid and applicable rule,
-admitting access.
-In the contrary case, where no admitting user rule could be established
-at all, then a resulting @samp{deny}, from a system wide ACL,
-will be used as the final action.
+expressions @var{net-exp}.  Each of these is either the simple word
address@hidden, a numeric IPv4 address, or a full IPv4 address with an
+appended netmask.  The effect is to restrict the applicability of the
+rule to the specified address range, or to set an explicit wildcard
+match @samp{any}.  The absence of a net list is equivalent to
+specifying a single @samp{any}.  The netmask can be specified as a
+CIDR mask length, or as an explicit address mask.
+
+The actual evaluation is made separately for the site-wide ACL, and
+for the requested local user ACL, contained in the callee's private
+file @file{.talkrc}.  This latter file must be a regular file and must
+be owned by the very same user, have his primary group ownership, and
+not be group or world writeable.  Should any of these prerequisites be
+violated, the user's ACL is replaced by a single deny-all rule.
+
+All rules in each set are evaluated, in the sense that whenever an
+expression @var{net-exp} matches the incoming IPv4 address, then the
+regular expression @var{user-exp} is tested for a match.  That being
+the case, the corresponding action is recorded.  The last match in
+each set determines the outcome in its category.
+
+In the most common case, a system wide @samp{deny} is overridden if
+the local user has specified at least one valid and applicable rule,
+admitting access.  In the contrary case, where no admitting user rule
+could be established at all, then a resulting @samp{deny}, from a
+system wide ACL, will be used as the final action.
 
 In strict policy mode, a site-wide @samp{deny} is always final,
-ignoring any user's desire.
-The administrator must explicitly arrange some admitting rule,
-with an action @samp{allow}, and some suitable net list.
-Still, the individual user can arrange his private file
-for an even narrower selection of friends.
-
+ignoring any user's desire.  The administrator must explicitly arrange
+some admitting rule, with an action @samp{allow}, and some suitable
+net list.  Still, the individual user can arrange his private file for
+an even narrower selection of friends.
 
 @node telnetd invocation
address@hidden @command{telnetd}: Telnet server
address@hidden telnetd
address@hidden @command{telnetd}: Telnet server.
address@hidden telnetd
 
address@hidden
-telnetd address@hidden@dots{}
address@hidden example
address@hidden address@hidden@dots{}]}
 
address@hidden @option
address@hidden -a @var{authmode}
address@hidden address@hidden
address@hidden -a
address@hidden --authmode
-Specify what mode to use for authentication.  Allowed values are:
address@hidden, @samp{other}, @samp{user}, @samp{valid}, and @samp{off}.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden address@hidden
address@hidden address@hidden
address@hidden @option
address@hidden -D address@hidden
address@hidden address@hidden
 @opindex -D
 @opindex --debug
 Set the debugging level.  The argument is a comma separated list of
 these categories: @samp{options}, @samp{report}, @samp{netdata},
address@hidden, @samp{auth}, and @samp{encr}.
-All these may be used in the form @samp{name[=level]}.
-Omission of @samp{level} implies the maximal
-possible debugging level for that particular category.
address@hidden, @samp{auth}, and @samp{encr}.  All these may be used
+in the form @samp{name[=level]}.  Omission of @samp{level} implies the
+maximal possible debugging level for that particular category.
 
-There is one additional category @samp{tcp}, which does not take
-an additional level indicator, but is instead equivalent to
-setting the socket option @samp{SO_DEBUG} for debugging the
-complete traffic.
+There is one additional category @samp{tcp}, which does not take an
+additional level indicator, but is instead equivalent to setting the
+socket option @samp{SO_DEBUG} for debugging the complete traffic.
 
-The output is written to the file @file{/tmp/telnet.debug},
-and any new data is incrementally added as time passes.
+The output is written to the file @file{/tmp/telnet.debug}, and any
+new data is incrementally added as time passes.
 
 @item -E @var{string}
 @itemx address@hidden
@@ -4935,12 +4026,12 @@ Set program to be executed instead of 
@command{/bin/login}.
 @opindex --no-hostinfo
 Do not print host information before login has been completed.
 
address@hidden address@hidden
address@hidden address@hidden
address@hidden -l address@hidden
address@hidden address@hidden
 @opindex -l
 @opindex --linemode
-Set line mode.  An empty argument will force line read mode at all times.
-The only recognised value is otherwise @samp{nokludge}.
+Set line mode.  An empty argument will force line read mode at all
+times.  The only recognised value is otherwise @samp{nokludge}.
 
 @item -n
 @itemx --no-keepalive
@@ -4948,78 +4039,90 @@ The only recognised value is otherwise @samp{nokludge}.
 @opindex --no-keepalive
 Disable TCP keep-alives.
 
address@hidden -S @var{principal}
address@hidden address@hidden
address@hidden -S
address@hidden --server-principal
-Set principal name for the server, to be used in Kerberos
-authentication.  The value @var{principal} can be set
-to provide full specification like @samp{srv.local@@REALM}
-and @samp{tnt/localhost@@REALM}, where the first uses the
-standard prefix `host/'. Or @var{principal} can override
-default settings in part only, like @samp{srv.local},
address@hidden/srv.local}, or @samp{@@REALM}.
-
 @item -U
 @itemx --reverse-lookup
 @opindex -U
 @opindex --reverse-lookup
 Refuse connections from addresses that cannot be mapped back into a
-symbolic name.
-A client is accepted only if the IP address can be resolved as
-a host name, and the same name is resolvable to addresses among
-which the clients's address is included.
-
address@hidden -X @var{authtype}
address@hidden address@hidden
address@hidden -X
address@hidden --disable-auth-type
-Disable the use of the given authentication type.
-Use this option multiple times if more than one type
-is to be disabled.  Standard choices are @samp{null},
address@hidden, and @samp{kerberos_v5}.
+symbolic name.  A client is accepted only if the IP address can be
+resolved as a host name, and the same name is resolvable to addresses
+among which the clients's address is included.
 @end table
 
address@hidden uucpd invocation
address@hidden @command{uucpd}: Unix to Unix Copy relay daemon.
address@hidden uucpd
address@hidden
 
address@hidden is a relay daemon responsible for accepting
-TCP transported connections for @command{uucico}.  It is started
-by @command{inetd}, conducts any authentication, and then hands
-acceptable requests over to @command{uucico}.
address@hidden tftpd invocation
address@hidden @command{tftpd}: TFTP server.
address@hidden tftpd
 
address@hidden
-uucpd address@hidden
address@hidden example
address@hidden is a server that provides a minimalistic means for
+transferring files.
 
address@hidden Options
address@hidden address@hidden@dots{}] @address@hidden
 
-There is a single, specific option available:
+The program accepts the following options.  Also see @ref{Common
+options}.
 
 @table @option
address@hidden -u @var{location}
address@hidden address@hidden
address@hidden -l
address@hidden --logging
address@hidden -l
address@hidden --logging
+Enable logging.
+
address@hidden -n
address@hidden --nonexistent
address@hidden -n
address@hidden --nonexistent
+Supress negative acknowledgement of requests for nonexistent relative
+filenames.
+
address@hidden -g @var{group}
address@hidden address@hidden
address@hidden -g
address@hidden --group
+Specify group membership of the process owner.  This is used only
+along with the option @option{-s}, and replaces the group membership
+that comes from the process owner himself.
+
address@hidden -s @var{dir}
address@hidden address@hidden
address@hidden -s
address@hidden --secure-dir
+Let the serving process change its root directory to @var{dir} before
+attending to any requests.  This directory is not observable by any
+client, but improves server isolation, since servable contents must be
+located below this chrooted directory @var{dir}.
+
address@hidden -u @var{user}
address@hidden address@hidden
 @opindex -u
address@hidden --uucico
-Replace the hard coded location of @command{uucico} with the
-value specified as @var{location}.
address@hidden --user
+Specify the process owner for serving requests.  Only relevant along
+with the option @option{-s}.  The default name is @samp{nobody}.
 @end table
 
address@hidden Authentication steps.
address@hidden uucpd invocation
address@hidden @command{uucpd}: Unix to Unix Copy server
address@hidden uucpd
+
address@hidden is a relay daemon responsible for accepting TCP
+transported connections for @command{uucico}.
 
-Invocation is expected to be conducted by a protocol described
-exchange of user name and password; unfortunately in clear text.
-If those agree with existing local entries, then @command{uucpd}
-verifies that the stated user also has user shell location
-identical to the full file system location of @command{uucico}.
-Should that not be the case, the request is declined.
address@hidden address@hidden@dots{}]}
 
-For this latter check, the option @option{--uucico} is useful
-when setting the configuration for @command{inetd}. It is
-recommended to wrap the invocation line of @command{uucpd}
-within a call to @command{tcpd} in the standard fashion.
+The program accepts the following options.  Also see @ref{Common
+options}.
 
address@hidden @option
address@hidden -u @var{location}
address@hidden -u
address@hidden address@hidden
address@hidden --uucico
+Replace the hard coded location of @command{uucico} with the value
+specified by @var{location}.
address@hidden table
+
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 @include fdl-1.3.texi

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c1b1ded61e4a1334dd76f9a7a1e651dcc350cd0d


commit c1b1ded61e4a1334dd76f9a7a1e651dcc350cd0d
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Aug 18 12:40:13 2014 +0200

    * configure.ac: Sort clients alphabetically.

diff --git a/ChangeLog b/ChangeLog
index d293e10..1c7f3a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-18  Alfred M. Szmidt  <address@hidden>
+
+       * configure.ac: Sort clients alphabetically.
+
 2014-07-30  Alfred M. Szmidt  <address@hidden>
 
        * telnetd/utility.c (nextitem, netclear, printoption, printsub)
diff --git a/configure.ac b/configure.ac
index e1e4b08..b035079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,22 +106,22 @@ IU_ENABLE_SERVER(telnetd)
 IU_ENABLE_SERVER(tftpd)
 IU_ENABLE_SERVER(uucpd)
 
-IU_ENABLE_CLIENT(ftp)
 IU_ENABLE_CLIENT(dnsdomainname)
+IU_ENABLE_CLIENT(ftp)
 IU_ENABLE_CLIENT(hostname)
+IU_ENABLE_CLIENT(ifconfig)
+IU_ENABLE_CLIENT(logger)
 IU_ENABLE_CLIENT(ping)
 IU_ENABLE_CLIENT(ping6)
 IU_ENABLE_CLIENT(rcp)
 IU_ENABLE_CLIENT(rexec)
 IU_ENABLE_CLIENT(rlogin)
 IU_ENABLE_CLIENT(rsh)
-IU_ENABLE_CLIENT(logger)
 IU_ENABLE_CLIENT(talk)
 IU_ENABLE_CLIENT(telnet)
 IU_ENABLE_CLIENT(tftp)
-IU_ENABLE_CLIENT(whois)
-IU_ENABLE_CLIENT(ifconfig)
 IU_ENABLE_CLIENT(traceroute)
+IU_ENABLE_CLIENT(whois)
 
 AM_SILENT_RULES([yes])
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU Inetutils 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]