updated manpages

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@950 ceb527fc-18e6-0310-9fe2-813c157c29e7

5 files changed, 5 insertions, 101 deletions

diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml
index 61ea2121..a7ab53a8 100644
--- a/debian/NetworkManager.sgml
+++ b/debian/NetworkManager.sgml
@@ -102,7 +102,7 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>nm-applet (1), NetworkManagerDispatcher (1).</para>
+    <para>nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1).</para>
 
     <para>More Information about NetworkManager can be found at
       http://www.gnome.org/projects/NetworkManager/ .</para>
@@ -111,7 +111,7 @@ manpage.1: manpage.sgml
     <title>AUTHOR</title>
 
     <para>This manual page was written by Jan Gerber <email>j@bootlab.org</email> and by
-	 Riccardo Setti <email>giskard@autistici.org</email> for
+	 Riccardo Setti <email>giskard@debian.org</email> for
       the <productname>Debian/Ubuntu</productname> system.
     </para>
 
diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml
deleted file mode 100644
index d42b2903..00000000
--- a/debian/NetworkManagerDispatcher.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY date        "<date>30 August, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY package     "NetworkManagerDispatcher">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      <email>j@bootlab.org</email>;
-    </address>
-    <author>
-      <firstname>Jan</firstname>
-      <surname>Gerber</surname>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Jan Gerber</holder>
-    </copyright>
-    &date;
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>NetworkManagerDispatcher</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>&package;</refname>
-
-    <refpurpose>Network management framework</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&package;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&package;</command> calls scripts in 
-/etc/NetworkManager/dispatcher.d each time the network is broght up or down by NetworkManager. Arguments to these scripts are network device and up or down. so it will call something like /etc/NetworkManager/dispatcher.d/example eth0 up
-</para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>NetworkManager (1), nm-applet (1).</para>
-
-    <para>More Information about NetworkManager can be found at
-     http://www.gnome.org/projects/NetworkManager/ .</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by Jan Gerber <email>j@bootlab.org</email> and by Riccardo Setti 
-	 <email>giskard@autistici.org</email> for the <productname>Debian/Ubuntu</productname> system.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 0f9b1179..2fc8ba3f 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/sbin/NetworkManager 
 debian/tmp/usr/sbin/NetworkManagerDispatcher
+debian/tmp/usr/lib/network-manager
 debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages
index 9ac2586b..907a2a3e 100644
--- a/debian/network-manager.manpages
+++ b/debian/network-manager.manpages
@@ -1,2 +1,3 @@
-debian/NetworkManagerDispatcher.1
+man/NetworkManagerDispatcher.1
+man/nm-tools.1
 debian/NetworkManager.1
diff --git a/debian/rules b/debian/rules
index ebbeb317..91f3f158 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ clean::
 
 
 build/network-manager::
-	/usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1
 	/usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1
 	/usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1
 	/usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1