diff options
-rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 9 | ||||
-rw-r--r-- | docs/htmldocs/smb.conf.5.html | 22 | ||||
-rw-r--r-- | docs/manpages/smb.conf.5 | 11 |
3 files changed, 25 insertions, 17 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index af1c15d6cce..a7328e7cf63 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -436,8 +436,8 @@ <term>%a</term> <listitem><para>the architecture of the remote machine. Only some are recognized, and those may not be - 100% reliable. It currently recognizes Samba, WfWg, - WinNT and Win95. Anything else will be known as + 100% reliable. It currently recognizes Samba, WfWg, Win95, + WinNT and Win2k. Anything else will be known as "UNKNOWN". If it gets it wrong then sending a level 3 log to <ulink url="mailto:samba@samba.org">samba@samba.org </ulink> should allow it to be fixed.</para></listitem> @@ -5660,8 +5660,9 @@ </parameter> and <parameter>%f</parameter> will be replaced by the appropriate spool file name, and all occurrences of <parameter>%p </parameter> will be replaced by the appropriate printer name. The - spool file name is generated automatically by the server, the printer - name is discussed below.</para> + spool file name is generated automatically by the server. The + <parameter>%J</parameter> macro can be used to access the job + name as transmitted by the client.</para> <para>The print command <emphasis>MUST</emphasis> contain at least one occurrence of <parameter>%s</parameter> or <parameter>%f diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html index 29d0e2553ba..f60cd595cf8 100644 --- a/docs/htmldocs/smb.conf.5.html +++ b/docs/htmldocs/smb.conf.5.html @@ -638,8 +638,8 @@ CLASS="VARIABLELIST" ><P >the architecture of the remote machine. Only some are recognized, and those may not be - 100% reliable. It currently recognizes Samba, WfWg, - WinNT and Win95. Anything else will be known as + 100% reliable. It currently recognizes Samba, WfWg, Win95, + WinNT and Win2k. Anything else will be known as "UNKNOWN". If it gets it wrong then sending a level 3 log to <A HREF="mailto:samba@samba.org" @@ -14066,8 +14066,14 @@ CLASS="PARAMETER" </I ></TT > will be replaced by the appropriate printer name. The - spool file name is generated automatically by the server, the printer - name is discussed below.</P + spool file name is generated automatically by the server. The + <TT +CLASS="PARAMETER" +><I +>%J</I +></TT +> macro can be used to access the job + name as transmitted by the client.</P ><P >The print command <EM >MUST</EM @@ -19181,7 +19187,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6051" +NAME="AEN6052" ></A ><H2 >WARNINGS</H2 @@ -19211,7 +19217,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6057" +NAME="AEN6058" ></A ><H2 >VERSION</H2 @@ -19222,7 +19228,7 @@ NAME="AEN6057" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6060" +NAME="AEN6061" ></A ><H2 >SEE ALSO</H2 @@ -19301,7 +19307,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6080" +NAME="AEN6081" ></A ><H2 >AUTHOR</H2 diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 18eab1ee9df..67034ce6989 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -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 "SMB.CONF" "5" "11 November 2001" "" "" +.TH "SMB.CONF" "5" "21 November 2001" "" "" .SH NAME smb.conf \- The configuration file for the Samba suite .SH "SYNOPSIS" @@ -387,8 +387,8 @@ process. \fB%a\fR the architecture of the remote machine. Only some are recognized, and those may not be -100% reliable. It currently recognizes Samba, WfWg, -WinNT and Win95. Anything else will be known as +100% reliable. It currently recognizes Samba, WfWg, Win95, +WinNT and Win2k. Anything else will be known as "UNKNOWN". If it gets it wrong then sending a level 3 log to samba@samba.org <URL:mailto:samba@samba.org> should allow it to be fixed. @@ -5173,8 +5173,9 @@ verbatim, with two exceptions: All occurrences of \fI%s \fRand \fI%f\fR will be replaced by the appropriate spool file name, and all occurrences of \fI%p \fRwill be replaced by the appropriate printer name. The -spool file name is generated automatically by the server, the printer -name is discussed below. +spool file name is generated automatically by the server. The +\fI%J\fR macro can be used to access the job +name as transmitted by the client. The print command \fBMUST\fR contain at least one occurrence of \fI%s\fR or \fI%f |