[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-149-g4cde9ff

[Mats Erik Andersson]

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, master has been updated
       via  4cde9ffd1608bae7f5c749606efbd5e847dab2a5 (commit)
      from  50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

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


commit 4cde9ffd1608bae7f5c749606efbd5e847dab2a5
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Nov 11 12:49:31 2011 +0100

    inetutils.texi: Corrections to telnetd description.

diff --git a/ChangeLog b/ChangeLog
index 3facf51..1e2e91c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-11  Mats Erik Andersson <address@hidden>
+
+       * doc/inetutils.texi (Introduction): White space.
+       (Common options): Mention `--usage'.  Replace brackets.
+       (Exit status): Spacing around `---'.
+       (telnetd invocation): Several corrections.
+       * telnetd/telnetd.c (argp_options): Remove duplicate space.
+
 2011-11-09  Mats Erik Andersson <address@hidden>
 
        * src/syslogd.c (create_unix_socket): Avoid buffer
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 751fd57..f71a5b4 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -162,7 +162,7 @@ generated.
 Many features were integrated from NetBSD, OpenBSD, FreeBSD and
 GNU/Linux, the merges were done by a group of dedicated hackers (in no
 particular order): Jeff Bailey, Marcus Brinkmann, Michael Vogt,
-Bernhard Rosenkraenzer, Kaveh R.  Ghazi, NIIBE Yutaka, Nathan
+Bernhard Rosenkraenzer, Kaveh R. Ghazi, NIIBE Yutaka, Nathan
 Neulinger, Jeff Smith, Dan Stromberg, David O'Shea, Frederic Goudal,
 Gerald Combs, Joachim Gabler, Marco D'Itri, Sergey Poznyakoff, and
 many more.
@@ -172,8 +172,8 @@ many more.
 
 Certain options are available in all these programs.  Rather than
 writing identical descriptions for each of the programs, they are
-described here.  (In fact, every @sc{gnu} program accepts (or should
-accept) these options.)
+described here.  (In fact, every @sc{gnu} program accepts, or should
+accept, these options.)
 
 Many of these programs take arbitrary strings as arguments.  In those
 cases, @option{--help} and @option{--version} are taken as these
@@ -183,9 +183,15 @@ options only if there is one and exactly one command line 
argument.
 @item --help
 @opindex --help
 @cindex help, online
-Print a usage message listing all available options, then exit
+Print a usage message, listing all available options, then exit
 successfully.
 
address@hidden --usage
address@hidden --usage
address@hidden usage, online
+Print a condensed usage message, displaying all available options
+formatted like a command line call, then exit successfully.
+
 @item --version
 @opindex --version
 @cindex version number, finding
@@ -213,8 +219,8 @@ indicates failure.
 Nearly every command invocation yields an integral @dfn{exit status}
 that can be used to change how other commands work.  For the vast
 majority of commands, an exit status of zero indicates success.
-Failure is indicated by a nonzero value---typically @samp{1}, though
-it may differ on unusual platforms as POSIX requires only that it be
+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.
 
 @node hostname invocation
@@ -3426,20 +3432,21 @@ the additional level indicator, but is instead 
equivalent to
 setting the socket option @samp{SO_DEBUG} for debugging the
 complete traffic.
 
-The outcome is the file @file{/var/telnet.debug}, to which
+The outcome is the file @file{/tmp/telnet.debug}, to which
 data is incrementally added as time passes.
 
address@hidden    -E
address@hidden -E STRING
 @itemx --exec-login=STRING
 Set program to be executed instead of @command{/bin/login}.
 
address@hidden    -h
address@hidden -h
 @itemx --no-hostinfo
 Do not print host information before login has been completed.
 
address@hidden -l
address@hidden --linemode=[MODE]
-Set line mode.
address@hidden -l[MODE]
address@hidden --linemode=[MODE]
+Set line mode.  An empty argument will force line mode at all times.
+The only recognised value is otherwise @samp{nokludge}.
 
 @item -n
 @itemx --no-keepalive
@@ -3450,9 +3457,12 @@ Disable TCP keep-alives.
 Refuse connections from addresses that cannot be mapped back into a
 symbolic name.
 
address@hidden -X
address@hidden -X AUTHTYPE
 @itemx --disable-auth-type=AUTHTYPE
-Disable the use of given authentication option.
+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}.
 @end table
 
 @node uucpd invocation
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 9442f39..7bfeb4f 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -104,7 +104,7 @@ static struct argp_option argp_options[] = {
   { "no-keepalive", 'n', NULL, 0,
     "disable TCP keep-alives" },
   { "reverse-lookup", 'U', NULL, 0,
-    "refuse  connections from addresses that "
+    "refuse connections from addresses that "
     "cannot be mapped back into a symbolic name" },
 #ifdef  AUTHENTICATION
   { "disable-auth-type", 'X', "TYPE", 0,

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

Summary of changes:
 ChangeLog          |    8 ++++++++
 doc/inetutils.texi |   38 ++++++++++++++++++++++++--------------
 telnetd/telnetd.c  |    2 +-
 3 files changed, 33 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils