diff options
| -rw-r--r-- | docs/docbook/manpages/nmbd.8.sgml | 21 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbd.8.sgml | 19 | ||||
| -rw-r--r-- | docs/htmldocs/nmbd.8.html | 23 | ||||
| -rw-r--r-- | docs/htmldocs/smbd.8.html | 47 | ||||
| -rw-r--r-- | docs/manpages/nmbd.8 | 21 | ||||
| -rw-r--r-- | docs/manpages/smbd.8 | 20 |
6 files changed, 78 insertions, 73 deletions
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml index 2d873a1e40e..edfa9b4fca4 100644 --- a/docs/docbook/manpages/nmbd.8.sgml +++ b/docs/docbook/manpages/nmbd.8.sgml @@ -24,7 +24,7 @@ <arg choice="opt">-V</arg> <arg choice="opt">-d <debug level></arg> <arg choice="opt">-H <lmhosts file></arg> - <arg choice="opt">-l <log file></arg> + <arg choice="opt">-l <log directory></arg> <arg choice="opt">-n <primary netbios name></arg> <arg choice="opt">-p <port number></arg> <arg choice="opt">-s <configuration file></arg> @@ -162,17 +162,14 @@ </varlistentry> <varlistentry> - <term>-l <log file></term> - <listitem><para>The -l parameter specifies a path - and base filename into which operational data from - the running <command>nmbd</command> 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.</para> - - <para>The default log file path is compiled into Samba as - part of the build process. Common defaults are <filename> + <term>-l <log directory></term> + <listitem><para>The -l parameter specifies a directory + into which the "log.nmbd" log file will be created + for operational data from the running + <command>nmbd</command> server.</para> + + <para>The default log directory is compiled into Samba + as part of the build process. Common defaults are <filename> /usr/local/samba/var/log.nmb</filename>, <filename> /usr/samba/var/log.nmb</filename> or <filename>/var/log/log.nmb</filename>.</para></listitem> diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml index 05958b83dec..cdb3d51fa87 100644 --- a/docs/docbook/manpages/smbd.8.sgml +++ b/docs/docbook/manpages/smbd.8.sgml @@ -22,7 +22,7 @@ <arg choice="opt">-h</arg> <arg choice="opt">-V</arg> <arg choice="opt">-d <debug level></arg> - <arg choice="opt">-l <log file></arg> + <arg choice="opt">-l <log directory></arg> <arg choice="opt">-p <port number></arg> <arg choice="opt">-O <socket option></arg> <arg choice="opt">-s <configuration file></arg> @@ -148,16 +148,21 @@ </varlistentry> <varlistentry> - <term>-l <log file></term> - <listitem><para>If specified, <replaceable>log file</replaceable> - specifies a log filename into which informational and debug - messages from the running server will be logged. The log + <term>-l <log directory></term> + <listitem><para>If specified, + <replaceable>log directory</replaceable> + specifies a log directory into which the "log.smbd" log + file will be created for informational and debug + messages from the running server. The log file generated is never removed by the server although its size may be controlled by the <ulink url="smb.conf.5.html#maxlogsize">max log size</ulink> option in the <ulink url="smb.conf.5.html"><filename> - smb.conf(5)</filename></ulink> file. The default log - file name is specified at compile time.</para></listitem> + smb.conf(5)</filename></ulink> file. + </para> + + <para>The default log directory is specified at + compile time.</para></listitem> </varlistentry> <varlistentry> diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html index 31afa11cf89..ad8c7c61ab7 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 <debug level>] [-H <lmhosts file>] [-l <log file>] [-n <primary netbios name>] [-p <port number>] [-s <configuration file>]</P +> [-D] [-a] [-o] [-P] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-n <primary netbios name>] [-p <port number>] [-s <configuration file>]</P ></DIV ><DIV CLASS="REFSECT1" @@ -275,22 +275,19 @@ CLASS="FILENAME" > file.</P ></DD ><DT ->-l <log file></DT +>-l <log directory></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 diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html index be82ef6d4ec..e093a05f646 100644 --- a/docs/htmldocs/smbd.8.html +++ b/docs/htmldocs/smbd.8.html @@ -36,7 +36,7 @@ NAME="AEN8" ><B CLASS="COMMAND" >smbd</B -> [-D] [-a] [-o] [-P] [-h] [-V] [-d <debug level>] [-l <log file>] [-p <port number>] [-O <socket option>] [-s <configuration file>]</P +> [-D] [-a] [-o] [-P] [-h] [-V] [-d <debug level>] [-l <log directory>] [-p <port number>] [-O <socket option>] [-s <configuration file>]</P ></DIV ><DIV CLASS="REFSECT1" @@ -228,17 +228,19 @@ CLASS="FILENAME" > file.</P ></DD ><DT ->-l <log file></DT +>-l <log directory></DT ><DD ><P ->If specified, <TT +>If specified, + <TT CLASS="REPLACEABLE" ><I ->log file</I +>log directory</I ></TT > - specifies a log filename into which informational and debug - messages from the running server will be logged. The log + specifies a log directory into which the "log.smbd" log + file will be created for informational and debug + messages from the running server. The log file generated is never removed by the server although its size may be controlled by the <A HREF="smb.conf.5.html#maxlogsize" @@ -252,8 +254,11 @@ TARGET="_top" CLASS="FILENAME" > smb.conf(5)</TT ></A -> file. The default log - file name is specified at compile time.</P +> file. + </P +><P +>The default log directory is specified at + compile time.</P ></DD ><DT >-O <socket options></DT @@ -331,7 +336,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN109" +NAME="AEN110" ></A ><H2 >FILES</H2 @@ -429,7 +434,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN142" +NAME="AEN143" ></A ><H2 >LIMITATIONS</H2 @@ -448,7 +453,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN146" +NAME="AEN147" ></A ><H2 >ENVIRONMENTVARIABLES</H2 @@ -479,7 +484,7 @@ CLASS="CONSTANT" ><DIV CLASS="REFSECT1" ><A -NAME="AEN155" +NAME="AEN156" ></A ><H2 >INSTALLATION</H2 @@ -601,7 +606,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN188" +NAME="AEN189" ></A ><H2 >RUNNING THE SERVER AS A DAEMON</H2 @@ -656,7 +661,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN201" +NAME="AEN202" ></A ><H2 >RUNNING THE SERVER ON REQUEST</H2 @@ -792,7 +797,7 @@ CLASS="COMPUTEROUTPUT" ><DIV CLASS="REFSECT1" ><A -NAME="AEN233" +NAME="AEN234" ></A ><H2 >PAM INTERACTION</H2 @@ -837,7 +842,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN244" +NAME="AEN245" ></A ><H2 >TESTING THE INSTALLATION</H2 @@ -895,7 +900,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN258" +NAME="AEN259" ></A ><H2 >VERSION</H2 @@ -906,7 +911,7 @@ NAME="AEN258" ><DIV CLASS="REFSECT1" ><A -NAME="AEN261" +NAME="AEN262" ></A ><H2 >DIAGNOSTICS</H2 @@ -929,7 +934,7 @@ NAME="AEN261" ><DIV CLASS="REFSECT1" ><A -NAME="AEN266" +NAME="AEN267" ></A ><H2 >SIGNALS</H2 @@ -994,7 +999,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN283" +NAME="AEN284" ></A ><H2 >SEE ALSO</H2 @@ -1060,7 +1065,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN300" +NAME="AEN301" ></A ><H2 >AUTHOR</H2 diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index d657ef7c4b3..82e5190dc8c 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -3,12 +3,12 @@ .\" <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" "26 September 2001" "" "" +.TH "NMBD" "8" "17 October 2001" "" "" .SH NAME nmbd \- NetBIOS name server to provide NetBIOS over IP naming services to clients .SH SYNOPSIS .sp -\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log file>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ] +\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ] .SH "DESCRIPTION" .PP This program is part of the Samba suite. @@ -115,17 +115,14 @@ Note that specifying this parameter here will override the log level parameter in the \fI smb.conf\fRfile. .TP -\fB-l <log file>\fR -The -l parameter specifies a path -and base filename into which operational data from -the running \fBnmbd\fR 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. +\fB-l <log directory>\fR +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 file path 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 +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. .TP \fB-n <primary NetBIOS name>\fR diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index bfcac80157d..f686272ed70 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -3,12 +3,12 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBD" "8" "31 July 2001" "" "" +.TH "SMBD" "8" "17 October 2001" "" "" .SH NAME smbd \- server to provide SMB/CIFS services to clients .SH SYNOPSIS .sp -\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log file>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ] +\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ] .SH "DESCRIPTION" .PP This program is part of the Samba suite. @@ -105,14 +105,18 @@ Note that specifying this parameter here will override the log levelfile. .TP -\fB-l <log file>\fR -If specified, \fIlog file\fR -specifies a log filename into which informational and debug -messages from the running server will be logged. The log +\fB-l <log directory>\fR +If specified, +\fIlog directory\fR +specifies a log directory into which the "log.smbd" log +file will be created for informational and debug +messages from the running server. The log file generated is never removed by the server although its size may be controlled by the max log size -option in the \fI smb.conf(5)\fRfile. The default log -file name is specified at compile time. +option in the \fI smb.conf(5)\fRfile. + +The default log directory is specified at +compile time. .TP \fB-O <socket options>\fR See the socket options |