[SCM] GNU Inetutils branch, master, updated. inetutils-1_6-129-gc63e215

[Simon Josefsson]

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  c63e215d7375570ded150d9a979cd4c2472f04c7 (commit)
      from  d3701de385d12090f2ca17749a58a201932468ef (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=c63e215d7375570ded150d9a979cd4c2472f04c7


commit c63e215d7375570ded150d9a979cd4c2472f04c7
Author: Simon Josefsson <address@hidden>
Date:   Mon Dec 7 12:48:29 2009 +0100

    Improve man pages.

diff --git a/ChangeLog b/ChangeLog
index 95cb20c..8a5da11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 2009-12-07  Simon Josefsson  <address@hidden>
 
+       * NEWS: Mention that man pages are generated using help2man.
+       * configure.ac: Check for LN_S.
+       * man/Makefile.am: Rewrite using skeleton rules.  Add man pages
+       for many tools.
+       * man/ftpd.x: New file.
+       * man/ftp.x: Likewise.
+       * man/hostname.x: Likewise.
+       * man/ifconfig.x: Likewise.
+       * man/inetd.x: Likewise.
+       * man/logger.x: Likewise.
+       * man/ping.x: Likewise.
+       * man/rcp.x: Likewise.
+       * man/rexecd.x: Likewise.
+       * man/rexec.x: Likewise.
+       * man/rlogind.x: Likewise.
+       * man/rlogin.x: Likewise.
+       * man/rsh.x: Likewise.
+       * man/syslogd.x: Likewise.
+       * man/talkd.x: Likewise.
+       * man/talk.x: Likewise.
+       * man/tftpd.x: Likewise.
+       * man/tftp.x: Likewise.
+       * man/traceroute.x: Likewise.
+       * man/uucpd.x: Likewise.
+       * man/whois.x: Likewise.
+
+2009-12-07  Simon Josefsson  <address@hidden>
+
        * doc/inetutils.texi (hostname invocation): Add section.
 
 2009-12-07  Simon Josefsson  <address@hidden>
diff --git a/NEWS b/NEWS
index 82bf234..20e9d6b 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,9 @@ PID of the `logger' process.
 * rexec
 
 New program.
+
+* Man pages for all tools are generated using help2man.
+
 
 December 27, 2008
 Version 1.6:
diff --git a/configure.ac b/configure.ac
index d2df5a3..1d09f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AC_PROG_YACC
+AC_PROG_LN_S
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 
 gl_INIT
diff --git a/man/Makefile.am b/man/Makefile.am
index 61235ed..23b689d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,24 +16,77 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-dist_man1_MANS = telnet.1 telnetd.1 rshd.1
+dist_man1_MANS = hostname.1 ifconfig.1 inetd.1 ftp.1 ftpd.1 logger.1   \
+       ping.1 rcp.1 rexec.1 rexecd.1 rlogin.1 rlogind.1 rsh.1 rshd.1   \
+       syslogd.1 talk.1 talkd.1 telnet.1 telnetd.1 traceroute.1        \
+       uucpd.1 whois.1
+
+# FIXME: ping6 ifconfig
 
 man_aux = $(dist_man1_MANS:.1=.x)
 EXTRA_DIST = $(man_aux)
 
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
+ftp.1: ftp.x $(top_srcdir)/ftp/main.c $(top_srcdir)/configure.ac
+
+ftpd.1: ftpd.x $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
+
+hostname.1: hostname.x $(top_srcdir)/hostname/hostname.c 
$(top_srcdir)/configure.ac
+
+ifconfig.1: ifconfig.x $(top_srcdir)/ifconfig/options.c 
$(top_srcdir)/configure.ac
+
+inetd.1: inetd.x $(top_srcdir)/inetd/inetd.c $(top_srcdir)/configure.ac
+
+logger.1: logger.x $(top_srcdir)/logger/logger.c $(top_srcdir)/configure.ac
+
+ping.1: ping.x $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
+
+rcp.1: rcp.x $(top_srcdir)/rcp/rcp.c $(top_srcdir)/configure.ac
+
+rexec.1: rexec.x $(top_srcdir)/rexec/rexec.c $(top_srcdir)/configure.ac
+
+rexecd.1: rexecd.x $(top_srcdir)/rexecd/rexecd.c $(top_srcdir)/configure.ac
+
+rlogin.1: rlogin.x $(top_srcdir)/rlogin/rlogin.c $(top_srcdir)/configure.ac
+
+rlogind.1: rlogind.x $(top_srcdir)/rlogind/rlogind.c $(top_srcdir)/configure.ac
+
+rsh.1: rsh.x $(top_srcdir)/rsh/rsh.c $(top_srcdir)/configure.ac
+
+rshd.1: rshd.x $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
+
+syslogd.1: syslogd.x $(top_srcdir)/syslogd/syslogd.c $(top_srcdir)/configure.ac
+
+talk.1: talk.x $(top_srcdir)/talk/talk.c $(top_srcdir)/configure.ac
+
+talkd.1: talkd.x $(top_srcdir)/talkd/talkd.c $(top_srcdir)/configure.ac
+
 telnet.1: telnet.x $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
-       $(HELP2MAN) \
-               --include=telnet.x \
-               --output=$@ $(top_builddir)/telnet/telnet$(EXEEXT)
 
 telnetd.1: telnetd.x $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/configure.ac
-       $(HELP2MAN) \
-               --include=telnetd.x \
-               --output=$@ $(top_builddir)/telnetd/telnetd$(EXEEXT)
 
-rshd.1: rshd.x $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
-       $(HELP2MAN) \
-               --include=rshd.x \
-               --output=$@ $(top_builddir)/rshd/rshd$(EXEEXT)
+tftp.1: tftp.x $(top_srcdir)/tftp/main.c $(top_srcdir)/configure.ac
+
+tftpd.1: tftpd.x $(top_srcdir)/tftpd/tftpd.c $(top_srcdir)/configure.ac
+
+traceroute.1: traceroute.x $(top_srcdir)/traceroute/traceroute.c 
$(top_srcdir)/configure.ac
+
+uucpd.1: uucpd.x $(top_srcdir)/uucpd/uucpd.c $(top_srcdir)/configure.ac
+
+whois.1: whois.x $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
+
+.x.1:
+       rm -f $@ address@hidden                                         \
+       && {                                                    \
+               rm -rf tmp;                                     \
+               mkdir tmp;                                      \
+               (cd tmp && $(LN_S) ../../$*/$* $*);             \
+                   $(HELP2MAN)                                 \
+                    --source='$(PACKAGE_STRING)'               \
+                    --include=$(srcdir)/$*.x                   \
+                    --output=tmp/$@ tmp/$*;                    \
+       }                                                       \
+       && cp tmp/$@ address@hidden                                     \
+       && rm -rf tmp                                           \
+       && mv address@hidden $@
diff --git a/man/ftp.x b/man/ftp.x
new file mode 100644
index 0000000..1631cb1
--- /dev/null
+++ b/man/ftp.x
@@ -0,0 +1,4 @@
+[NAME]
+ftp \- File Transfer Protocol client.
+[SEE ALSO]
+ftpd(1)
diff --git a/man/ftpd.x b/man/ftpd.x
new file mode 100644
index 0000000..70218ac
--- /dev/null
+++ b/man/ftpd.x
@@ -0,0 +1,4 @@
+[NAME]
+ftpd \- File Transfer Protocol server.
+[SEE ALSO]
+ftp(1)
diff --git a/man/hostname.x b/man/hostname.x
new file mode 100644
index 0000000..4b9123c
--- /dev/null
+++ b/man/hostname.x
@@ -0,0 +1,2 @@
+[NAME]
+hostname \- show or set system host name
diff --git a/man/ifconfig.x b/man/ifconfig.x
new file mode 100644
index 0000000..883647d
--- /dev/null
+++ b/man/ifconfig.x
@@ -0,0 +1,2 @@
+[NAME]
+ifconfig \- configure network interfaces
diff --git a/man/inetd.x b/man/inetd.x
new file mode 100644
index 0000000..462ab85
--- /dev/null
+++ b/man/inetd.x
@@ -0,0 +1,2 @@
+[NAME]
+inetd \- Interner super-server
diff --git a/man/logger.x b/man/logger.x
new file mode 100644
index 0000000..ecba948
--- /dev/null
+++ b/man/logger.x
@@ -0,0 +1,4 @@
+[NAME]
+logger \- Send messages to the system log
+[SEE ALSO]
+syslogd(1)
diff --git a/man/ping.x b/man/ping.x
new file mode 100644
index 0000000..0f3ff26
--- /dev/null
+++ b/man/ping.x
@@ -0,0 +1,2 @@
+[NAME]
+ping \- Packets to network hosts
diff --git a/man/rcp.x b/man/rcp.x
new file mode 100644
index 0000000..f925d7c
--- /dev/null
+++ b/man/rcp.x
@@ -0,0 +1,2 @@
+[NAME]
+rcp \- Remote copy
diff --git a/man/rexec.x b/man/rexec.x
new file mode 100644
index 0000000..143c430
--- /dev/null
+++ b/man/rexec.x
@@ -0,0 +1,4 @@
+[NAME]
+rexec \- Remote execution client
+[SEE ALSO]
+rexecd(1)
diff --git a/man/rexecd.x b/man/rexecd.x
new file mode 100644
index 0000000..9ffa5ae
--- /dev/null
+++ b/man/rexecd.x
@@ -0,0 +1,4 @@
+[NAME]
+rexecd \- Remote execution server
+[SEE ALSO]
+rexec(1)
diff --git a/man/rlogin.x b/man/rlogin.x
new file mode 100644
index 0000000..d04d180
--- /dev/null
+++ b/man/rlogin.x
@@ -0,0 +1,4 @@
+[NAME]
+rlogin \- Remote login
+[SEE ALSO]
+rlogind(1)
diff --git a/man/rlogind.x b/man/rlogind.x
new file mode 100644
index 0000000..44cc9cb
--- /dev/null
+++ b/man/rlogind.x
@@ -0,0 +1,4 @@
+[NAME]
+rlogind \- Remote login server
+[SEE ALSO]
+rlogin(1)
diff --git a/man/rsh.x b/man/rsh.x
new file mode 100644
index 0000000..c1a74bd
--- /dev/null
+++ b/man/rsh.x
@@ -0,0 +1,4 @@
+[NAME]
+rsh \- Remote shell client
+[SEE ALSO]
+rshd(1)
diff --git a/man/syslogd.x b/man/syslogd.x
new file mode 100644
index 0000000..597e0f6
--- /dev/null
+++ b/man/syslogd.x
@@ -0,0 +1,4 @@
+[NAME]
+syslogd \- Syslog server
+[SEE ALSO]
+logger(1)
diff --git a/man/talk.x b/man/talk.x
new file mode 100644
index 0000000..8edd3c6
--- /dev/null
+++ b/man/talk.x
@@ -0,0 +1,4 @@
+[NAME]
+talk \- Talk client
+[SEE ALSO]
+talkd(1)
diff --git a/man/talkd.x b/man/talkd.x
new file mode 100644
index 0000000..4b55fd8
--- /dev/null
+++ b/man/talkd.x
@@ -0,0 +1,4 @@
+[NAME]
+talkd \- Talk server
+[SEE ALSO]
+talk(1)
diff --git a/man/tftp.x b/man/tftp.x
new file mode 100644
index 0000000..0ce968b
--- /dev/null
+++ b/man/tftp.x
@@ -0,0 +1,2 @@
+[NAME]
+tftp \- TFTP client
diff --git a/man/tftpd.x b/man/tftpd.x
new file mode 100644
index 0000000..a110ab9
--- /dev/null
+++ b/man/tftpd.x
@@ -0,0 +1,2 @@
+[NAME]
+tftpd \- TFTP server
diff --git a/man/traceroute.x b/man/traceroute.x
new file mode 100644
index 0000000..f0cef54
--- /dev/null
+++ b/man/traceroute.x
@@ -0,0 +1,2 @@
+[NAME]
+traceroute \- Trace the route to a host
diff --git a/man/uucpd.x b/man/uucpd.x
new file mode 100644
index 0000000..d7da7c5
--- /dev/null
+++ b/man/uucpd.x
@@ -0,0 +1,2 @@
+[NAME]
+uucpd \- Unix to Unix Copy
diff --git a/man/whois.x b/man/whois.x
new file mode 100644
index 0000000..a7b0fb8
--- /dev/null
+++ b/man/whois.x
@@ -0,0 +1,2 @@
+[NAME]
+whois \- Whois user interface

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

Summary of changes:
 ChangeLog        |   28 ++++++++++++++++++++
 NEWS             |    3 ++
 configure.ac     |    1 +
 man/Makefile.am  |   75 ++++++++++++++++++++++++++++++++++++++++++++++--------
 man/ftp.x        |    4 +++
 man/ftpd.x       |    4 +++
 man/hostname.x   |    2 +
 man/ifconfig.x   |    2 +
 man/inetd.x      |    2 +
 man/logger.x     |    4 +++
 man/ping.x       |    2 +
 man/rcp.x        |    2 +
 man/rexec.x      |    4 +++
 man/rexecd.x     |    4 +++
 man/rlogin.x     |    4 +++
 man/rlogind.x    |    4 +++
 man/rsh.x        |    4 +++
 man/syslogd.x    |    4 +++
 man/talk.x       |    4 +++
 man/talkd.x      |    4 +++
 man/tftp.x       |    2 +
 man/tftpd.x      |    2 +
 man/traceroute.x |    2 +
 man/uucpd.x      |    2 +
 man/whois.x      |    2 +
 25 files changed, 160 insertions(+), 11 deletions(-)
 create mode 100644 man/ftp.x
 create mode 100644 man/ftpd.x
 create mode 100644 man/hostname.x
 create mode 100644 man/ifconfig.x
 create mode 100644 man/inetd.x
 create mode 100644 man/logger.x
 create mode 100644 man/ping.x
 create mode 100644 man/rcp.x
 create mode 100644 man/rexec.x
 create mode 100644 man/rexecd.x
 create mode 100644 man/rlogin.x
 create mode 100644 man/rlogind.x
 create mode 100644 man/rsh.x
 create mode 100644 man/syslogd.x
 create mode 100644 man/talk.x
 create mode 100644 man/talkd.x
 create mode 100644 man/tftp.x
 create mode 100644 man/tftpd.x
 create mode 100644 man/traceroute.x
 create mode 100644 man/uucpd.x
 create mode 100644 man/whois.x


hooks/post-receive
-- 
GNU Inetutils