mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 10 insertions, 9 deletions

diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index 8db2749bfa..2d873a1e40 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -15,7 +15,7 @@
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>smbd</command>
+		<command>nmbd</command>
 		<arg choice="opt">-D</arg>
 		<arg choice="opt">-a</arg>
 		<arg choice="opt">-o</arg>
@@ -287,17 +287,18 @@
 	a SIGTERM (-15) signal and wait for it to die on its own.</para>
 
 	<para><command>nmbd</command> will accept SIGHUP, which will cause 
-	it to dump out it's namelists into the file <filename>namelist.debug
+	it to dump out its namelists into the file <filename>namelist.debug
 	</filename> in the <filename>/usr/local/samba/var/locks</filename> 
 	directory (or the <filename>var/locks</filename> directory configured 
 	under wherever Samba was configured to install itself). This will also 
-	cause <command>nmbd</command> to dump out it's server database in
-	the <filename>log.nmb</filename> file. In addition, the debug log level 
-	of nmbd may be raised by sending it a SIGUSR1 (<command>kill -USR1
-	&lt;nmbd-pid&gt;</command>) and lowered by sending it a
-	SIGUSR2 (<command>kill -USR2 &lt;nmbd-pid&gt;</command>). This is to 
-	allow transient problems to be diagnosed, whilst still running at a 
-	normally low log level.</para>
+	cause <command>nmbd</command> to dump out its server database in
+	the <filename>log.nmb</filename> file.</para>
+	
+	<para>The debug log level of nmbd may be raised or lowered using
+	<ulink url="smbcontrol.1.html"><command>smbcontrol(1)</command>
+	</ulink> (SIGUSR[1|2] signals are no longer used in Samba 2.2). This is
+	to allow transient problems to be diagnosed, whilst still running
+	at a normally low log level.</para>
 </refsect1>