merging some changes from SAMBA_2_2

(This used to be commit e8ede079b5af4187573f1b8ed0d94b6f03cbbd22)

1 files changed, 35 insertions, 36 deletions

diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 18168220e4..875de31f42 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NMBD" "8" "28 January 2002" "" ""
+.TH "NMBD" "8" "08 May 2002" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
@@ -126,11 +126,11 @@ parameter in the \fI smb.conf\fRfile.
 The -l parameter specifies a directory 
 into which the "log.nmbd" log file will be created
 for operational data from the running
-\fBnmbd\fR server.
-
-The default log directory is compiled into Samba
+\fBnmbd\fR server. The default log directory is compiled into Samba
 as part of the build process. Common defaults are \fI /usr/local/samba/var/log.nmb\fR, \fI /usr/samba/var/log.nmb\fR or
-\fI/var/log/log.nmb\fR.
+\fI/var/log/log.nmb\fR. \fBBeware:\fR
+If the directory specified does not exist, \fBnmbd\fR
+will log to the default debug log location defined at compile time.
 .TP
 \fB-n <primary NetBIOS name>\fR
 This option allows you to override
@@ -142,58 +142,57 @@ line setting will take precedence over settings in
 .TP
 \fB-p <UDP port number>\fR
 UDP port number is a positive integer value.
-This option changes the default UDP port number (normally 137) 
-that \fBnmbd\fR responds to name queries on. Don't 
-use this option unless you are an expert, in which case you 
+This option changes the default UDP port number (normally 137)
+that \fBnmbd\fR responds to name queries on. Don't
+use this option unless you are an expert, in which case you
 won't need help!
 .TP
 \fB-s <configuration file>\fR
-The default configuration file name 
+The default configuration file name
 is set at build time, typically as \fI /usr/local/samba/lib/smb.conf\fR, but
 this may be changed when Samba is autoconfigured.
 
-The file specified contains the configuration details 
-required by the server. See  
-\fIsmb.conf(5)\fRfor more information.
+The file specified contains the configuration details
+required by the server. See  \fIsmb.conf(5)\fRfor more information.
 .SH "FILES"
 .TP
 \fB\fI/etc/inetd.conf\fB\fR
-If the server is to be run by the 
-\fBinetd\fR meta-daemon, this file 
-must contain suitable startup information for the 
+If the server is to be run by the
+\fBinetd\fR meta-daemon, this file
+must contain suitable startup information for the
 meta-daemon. See the UNIX_INSTALL.htmldocument
 for details.
 .TP
 \fB\fI/etc/rc\fB\fR
-or whatever initialization script your 
+or whatever initialization script your
 system uses).
 
-If running the server as a daemon at startup, 
-this file will need to contain an appropriate startup 
+If running the server as a daemon at startup,
+this file will need to contain an appropriate startup
 sequence for the server. See the UNIX_INSTALL.htmldocument
 for details.
 .TP
 \fB\fI/etc/services\fB\fR
-If running the server via the 
-meta-daemon \fBinetd\fR, this file 
-must contain a mapping of service name (e.g., netbios-ssn) 
-to service port (e.g., 139) and protocol type (e.g., tcp). 
+If running the server via the
+meta-daemon \fBinetd\fR, this file
+must contain a mapping of service name (e.g., netbios-ssn)
+to service port (e.g., 139) and protocol type (e.g., tcp).
 See the UNIX_INSTALL.html
 document for details.
 .TP
 \fB\fI/usr/local/samba/lib/smb.conf\fB\fR
-This is the default location of the 
+This is the default location of the
 \fIsmb.conf\fR
-server configuration file. Other common places that systems 
-install this file are \fI/usr/samba/lib/smb.conf\fR 
+server configuration file. Other common places that systems
+install this file are \fI/usr/samba/lib/smb.conf\fR
 and \fI/etc/smb.conf\fR.
 
-When run as a WINS server (see the 
+When run as a WINS server (see the
 wins support
 parameter in the \fIsmb.conf(5)\fR man page),
 \fBnmbd\fR
-will store the WINS database in the file \fIwins.dat\fR 
-in the \fIvar/locks\fR directory configured under 
+will store the WINS database in the file \fIwins.dat\fR
+in the \fIvar/locks\fR directory configured under
 wherever Samba was configured to install itself.
 
 If \fBnmbd\fR is acting as a \fB browse master\fR (see the local master
@@ -204,17 +203,17 @@ will store the browsing database in the file \fIbrowse.dat
 configured under wherever Samba was configured to install itself.
 .SH "SIGNALS"
 .PP
-To shut down an \fBnmbd\fR process it is recommended 
-that SIGKILL (-9) \fBNOT\fR be used, except as a last 
-resort, as this may leave the name database in an inconsistent state. 
-The correct way to terminate \fBnmbd\fR is to send it 
+To shut down an \fBnmbd\fR process it is recommended
+that SIGKILL (-9) \fBNOT\fR be used, except as a last
+resort, as this may leave the name database in an inconsistent state.
+The correct way to terminate \fBnmbd\fR is to send it
 a SIGTERM (-15) signal and wait for it to die on its own.
 .PP
-\fBnmbd\fR will accept SIGHUP, which will cause 
+\fBnmbd\fR will accept SIGHUP, which will cause
 it to dump out its namelists into the file \fInamelist.debug
-\fRin the \fI/usr/local/samba/var/locks\fR 
-directory (or the \fIvar/locks\fR directory configured 
-under wherever Samba was configured to install itself). This will also 
+\fRin the \fI/usr/local/samba/var/locks\fR
+directory (or the \fIvar/locks\fR directory configured
+under wherever Samba was configured to install itself). This will also
 cause \fBnmbd\fR to dump out its server database in
 the \fIlog.nmb\fR file.
 .PP