merge from 2.2

(This used to be commit c5ee06b7c8fc9f1fec679acc7d7f47f333707456)

1 files changed, 10 insertions, 13 deletions

diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index 31afa11cf8..ad8c7c61ab 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >nmbd</B
->  [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log file&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
+>  [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log directory&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -275,22 +275,19 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-l &#60;log file&#62;</DT
+>-l &#60;log directory&#62;</DT
 ><DD
 ><P
->The -l parameter specifies a path 
-		and base filename into which operational data from 
-		the running <B
+>The -l parameter specifies a directory 
+		into which the "log.nmbd" log file will be created
+		for operational data from the running
+		<B
 CLASS="COMMAND"
 >nmbd</B
-> server will
-		be logged.  The actual log file name is generated by 
-		appending the extension ".nmb" to the specified base 
-		name.  For example, if the name specified was "log" 
-		then the file log.nmb would contain the debugging data.</P
-><P
->The default log file path is compiled into Samba as 
-		part of the build process. Common defaults are <TT
+> server.</P
+><P
+>The default log directory is compiled into Samba
+		as part of the build process. Common defaults are <TT
 CLASS="FILENAME"
 >		/usr/local/samba/var/log.nmb</TT
 >, <TT