2006-01-20 Robert Love <rml@novell.com>

	* Makefile.am, configure.in: Add new man subdirectory.
	* man, man/NetworkManager.1.in, man/NetworkManagerDispatcher.1.in,
	  man/Makefile.am: Add man pages for NetworkManager and its
	  crime-solving bumbling buddy, NetworkManagerDispatcher.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1367 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index 719062f..5dd2521 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-20  Robert Love  <rml@novell.com>
+
+       * Makefile.am, configure.in: Add new man subdirectory.
+       * man, man/NetworkManager.1.in, man/NetworkManagerDispatcher.1.in,
+         man/Makefile.am: Add man pages for NetworkManager and its
+         crime-solving bumbling buddy, NetworkManagerDispatcher.
+
 2006-01-20  Robert Love  <rml@novell.com>
 
        * src/NetworkManagerDbus.c: Fail if NM's DBUS service is already taken,

diff --git a/Makefile.am b/Makefile.am
index 21a2f39..0878290 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,18 @@
-SUBDIRS = utils libnm-util src dispatcher-daemon gnome initscript test po include
+SUBDIRS =                              \
+          utils                                \
+          libnm-util                   \
+          src                          \
+          dispatcher-daemon    \
+          gnome                                \
+          initscript                   \
+          test                         \
+          po                           \
+          man                          \
+          include
 
 EXTRA_DIST =                           \
        CONTRIBUTING                    \
-       NetworkManager.pc.in            \
+       NetworkManager.pc.in    \
        intltool-extract.in             \
        intltool-merge.in               \
        intltool-update.in

diff --git a/configure.in b/configure.in
index 05c21c8..d83dfef 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -313,6 +313,9 @@ initscript/Slackware/Makefile
 initscript/SUSE/Makefile
 initscript/SUSE/networkmanager
 initscript/SUSE/networkmanager-dispatcher
+man/Makefile
+man/NetworkManager.1
+man/NetworkManagerDispatcher.1
 po/Makefile.in
 NetworkManager.pc
 ])

diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644 (file)
index 0000000..143882f
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,8 @@
+man_MANS =                             \
+       NetworkManager.1                \
+       NetworkManagerDispatcher.1
+
+EXTRA_DIST =                           \
+       $(mans_MANS)                    \
+       NetworkManager.1.in             \
+       NetworkManagerDispatcher.1.in

diff --git a/man/NetworkManager.1.in b/man/NetworkManager.1.in
new file mode 100644 (file)
index 0000000..1583236
--- /dev/null
+++ b/man/NetworkManager.1.in
@@ -0,0 +1,25 @@
+.\" NetworkManager(1) manual page
+.\"
+.\" Copyright (C) 2005 Robert Love
+.\"
+.TH NETWORKMANAGER "1"
+NetworkManager \- network management daemon
+.SH SYNOPSIS
+.B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices]
+.SH DESCRIPTION
+The \fINetworkManager\fP daemon attempts to keep an active network connection
+available at all times.  The point of NetworkManager is to make networking
+configuration and setup as painless and automatic as possible.  If using DHCP,
+NetworkManager is intended to replace default routes, obtain IP addresses from
+a DHCP server, and change nameservers whenever it sees fit, with the aim of
+making networking Just Work.
+.SH OPTIONS
+The following options are supported:
+.TP
+.I "--no-daemon"
+Do not daemonize.  This is useful for debugging.
+.TP
+.I "--enable-test-devices"
+Enable support for virtual test devices.  These are useful for debugging.
+.SH SEE ALSO
+.BR NetworkManagerDispatcher (1)

diff --git a/man/NetworkManagerDispatcher.1.in b/man/NetworkManagerDispatcher.1.in
new file mode 100644 (file)
index 0000000..1dbeaf9
--- /dev/null
+++ b/man/NetworkManagerDispatcher.1.in
@@ -0,0 +1,27 @@
+.\" NetworkManager(1) manual page
+.\"
+.\" Copyright (C) 2005 Robert Love
+.\"
+.TH NETWORKMANAGERDISPATCHER "1"
+NetworkManagerDispatcher \- daemon that runs commands in response to off/online
+.SH SYNOPSIS
+.B NetworkManagerDispatcher [\-\-no-daemon]
+.SH DESCRIPTION
+The \fINetworkManagerDispatcher\fP daemon runs commands in the
+.I @sysconfdir@/NetworkManager/dispatcher.d
+directory in response to interfaces coming up and down.  The scripts are run
+alphabetically.  The first parameter is the network interface name.  The second
+parameter is
+.I up
+if the interface is now up and
+.I down
+if the interface is now down.
+.SH OPTIONS
+The following options are supported:
+.TP
+.I "--no-daemon"
+Do not daemonize.  This is useful for debugging.
+.SH FILES
+@sysconfdir@/NetworkManager/dispatcher.d
+.SH SEE ALSO
+.BR NetworkManager (1)