merge from 2.2 and regenerate

docs/docbook/manpages/smb.conf.5.sgml

@@ -749,6 +749,7 @@
 		<listitem><para><link linkend="TIMESERVER"><parameter>time server</parameter></link></para></listitem>
 		<listitem><para><link linkend="TIMESTAMPLOGS"><parameter>timestamp logs</parameter></link></para></listitem>
 		<listitem><para><link linkend="TOTALPRINTJOBS"><parameter>total print jobs</parameter></link></para></listitem>
+		<listitem><para><link linkend="UNIXEXTENSIONS"><parameter>unix extensions</parameter></link></para></listitem>
 		<listitem><para><link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link></para></listitem>
 		<listitem><para><link linkend="UPDATEENCRYPTED"><parameter>update encrypted</parameter></link></para></listitem>
 		<listitem><para><link linkend="USEMMAP"><parameter>use mmap</parameter></link></para></listitem>
@@ -795,6 +796,7 @@
 		<listitem><para><link linkend="CREATEMASK"><parameter>create mask</parameter></link></para></listitem>
 		<listitem><para><link linkend="CREATEMODE"><parameter>create mode</parameter></link></para></listitem>
 		<listitem><para><link linkend="DEFAULTCASE"><parameter>default case</parameter></link></para></listitem>
+		<listitem><para><link linkend="DEFAULTDEVMODE"><parameter>default devmode</parameter></link></para></listitem>
 		<listitem><para><link linkend="DELETEREADONLY"><parameter>delete readonly</parameter></link></para></listitem>
 		<listitem><para><link linkend="DELETEVETOFILES"><parameter>delete veto files</parameter></link></para></listitem>
 		<listitem><para><link linkend="DENYHOSTS"><parameter>deny hosts</parameter></link></para></listitem>
@@ -1869,6 +1871,44 @@
 
 
 
+		<varlistentry>
+		<term><anchor id="DEFAULTDEVMODE">default devmode (S)</term>
+		<listitem><para>This parameter is only applicable to <link
+		linkend="PRINTOK">printable</link> services.  When smbd is serving
+		Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
+		server has a Device Mode which defines things such as paper size and
+		orientation and duplex settings.  The device mode can only correctly be
+		generated by the printer driver itself (which can only be executed on a
+		Win32 platform).  Because smbd is unable to execute the driver code
+		to generate the device mode, the default behavior is to set this field
+		to NULL.
+		</para>
+
+		<para>Most problems with serving printer drivers to Windows NT/2k/XP clients
+		can be traced to a problem with the generated device mode.  Certain drivers
+		will do things such as crashing the client's Explorer.exe with a NULL devmode.
+		However, other printer drivers can cause the client's spooler service
+		(spoolsv.exe) to die if the devmode was not created by the driver itself
+		(i.e. smbd generates a default devmode).
+		</para>
+
+		<para>This parameter should be used with care and tested with the printer
+		driver in question.  It is better to leave the device mode to NULL
+		and let the Windows client set the correct values.  Because drivers do not
+		do this all the time, setting <command>default devmode = yes</command>
+		will instruct smbd to generate a default one.
+		</para>
+
+		<para>For more information on Windows NT/2k printing and Device Modes,
+		see the <ulink url="http://msdn.microsoft.com/">MSDN documentation</ulink>.
+		</para>
+
+		<para>Default: <command>default devmode = no</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
 		<varlistentry>
 		<term><anchor id="DEFAULTSERVICE">default service (G)</term>
 		<listitem><para>This parameter specifies the name of a service
@@ -7543,6 +7583,22 @@
 
 
 
+		<varlistentry>
+		<term><anchor id="UNIXEXTENSIONS">unix extensions(G)</term>
+		<listitem><para>This boolean parameter controls whether Samba 
+		implments the CIFS UNIX extensions, as defined by HP. These
+		extensions enable CIFS to server UNIX clients to UNIX servers
+		better, and allow such things as symbolic links, hard links etc.
+		These extensions require a similarly enabled client, and are of
+		no current use to Windows clients.</para>
+
+		<para>Default: <command>unix extensions = no</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+
 		<varlistentry>
 		<term><anchor id="UNIXPASSWORDSYNC">unix password sync (G)</term>
 		<listitem><para>This boolean parameter controls whether Samba 

docs/docbook/projdoc/UNIX_INSTALL.sgml

@@ -139,9 +139,9 @@
 	Samba.  In many cases you must be root.</para>
 
 	<para>The main advantage of starting <command>smbd</command>
-	and <command>nmbd</command> as a daemon is that they will 
+	and <command>nmbd</command> using the recommended daemon method
-	respond slightly more quickly to an initial connection
+	is that they will respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</para>
+	request.</para>
 
 	<sect2>
 		<title>Step 5a: Starting from inetd.conf</title>

docs/docbook/projdoc/winbind.sgml

@@ -624,7 +624,7 @@ CEO+TsInternetUser
 </programlisting></para>
 
 <para>
-Obviously, I have named my domain 'CEO' and my <parameter>winbindd
+Obviously, I have named my domain 'CEO' and my <parameter>winbind
 separator</parameter> is '+'.
 </para>
 

docs/htmldocs/UNIX_INSTALL.html

@@ -288,9 +288,9 @@ CLASS="COMMAND"
 	and <B
 CLASS="COMMAND"
 >nmbd</B
-> as a daemon is that they will 
+> using the recommended daemon method
-	respond slightly more quickly to an initial connection
+	is that they will respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</P
+	request.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2

docs/htmldocs/smb.conf.5.html

@@ -2769,6 +2769,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#UNIXEXTENSIONS"
+><TT
+CLASS="PARAMETER"
+><I
+>unix extensions</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#UNIXPASSWORDSYNC"
 ><TT
 CLASS="PARAMETER"
@@ -3035,7 +3047,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN982"
+NAME="AEN986"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3204,6 +3216,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#DEFAULTDEVMODE"
+><TT
+CLASS="PARAMETER"
+><I
+>default devmode</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#DELETEREADONLY"
 ><TT
 CLASS="PARAMETER"
@@ -4466,7 +4490,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1458"
+NAME="AEN1466"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -6655,6 +6679,57 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="DEFAULTDEVMODE"
+></A
+>default devmode (S)</DT
+><DD
+><P
+>This parameter is only applicable to <A
+HREF="#PRINTOK"
+>printable</A
+> services.  When smbd is serving
+		Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
+		server has a Device Mode which defines things such as paper size and
+		orientation and duplex settings.  The device mode can only correctly be
+		generated by the printer driver itself (which can only be executed on a
+		Win32 platform).  Because smbd is unable to execute the driver code
+		to generate the device mode, the default behavior is to set this field
+		to NULL.
+		</P
+><P
+>Most problems with serving printer drivers to Windows NT/2k/XP clients
+		can be traced to a problem with the generated device mode.  Certain drivers
+		will do things such as crashing the client's Explorer.exe with a NULL devmode.
+		However, other printer drivers can cause the client's spooler service
+		(spoolsv.exe) to die if the devmode was not created by the driver itself
+		(i.e. smbd generates a default devmode).
+		</P
+><P
+>This parameter should be used with care and tested with the printer
+		driver in question.  It is better to leave the device mode to NULL
+		and let the Windows client set the correct values.  Because drivers do not
+		do this all the time, setting <B
+CLASS="COMMAND"
+>default devmode = yes</B
+>
+		will instruct smbd to generate a default one.
+		</P
+><P
+>For more information on Windows NT/2k printing and Device Modes,
+		see the <A
+HREF="http://msdn.microsoft.com/"
+TARGET="_top"
+>MSDN documentation</A
+>.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>default devmode = no</B
+></P
+></DD
+><DT
+><A
 NAME="DEFAULTSERVICE"
 ></A
 >default service (G)</DT
@@ -17684,6 +17759,25 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="UNIXEXTENSIONS"
+></A
+>unix extensions(G)</DT
+><DD
+><P
+>This boolean parameter controls whether Samba 
+		implments the CIFS UNIX extensions, as defined by HP. These
+		extensions enable CIFS to server UNIX clients to UNIX servers
+		better, and allow such things as symbolic links, hard links etc.
+		These extensions require a similarly enabled client, and are of
+		no current use to Windows clients.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>unix extensions = no</B
+></P
+></DD
+><DT
+><A
 NAME="UNIXPASSWORDSYNC"
 ></A
 >unix password sync (G)</DT
@@ -19315,7 +19409,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6097"
+NAME="AEN6125"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19345,7 +19439,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6103"
+NAME="AEN6131"
 ></A
 ><H2
 >VERSION</H2
@@ -19356,7 +19450,7 @@ NAME="AEN6103"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6106"
+NAME="AEN6134"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19435,7 +19529,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6126"
+NAME="AEN6154"
 ></A
 ><H2
 >AUTHOR</H2

docs/htmldocs/winbind.html

@@ -903,7 +903,7 @@ CEO+TsInternetUser</PRE
 >Obviously, I have named my domain 'CEO' and my <TT
 CLASS="PARAMETER"
 ><I
->winbindd
+>winbind
 separator</I
 ></TT
 > is '+'.</P

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" "24 January 2002" "" ""
+.TH "SMB.CONF" "5" "26 January 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -980,6 +980,9 @@ each parameter for details. Note that some are synonyms.
 \fItotal print jobs\fR
 .TP 0.2i
 \(bu
+\fIunix extensions\fR
+.TP 0.2i
+\(bu
 \fIunix password sync\fR
 .TP 0.2i
 \(bu
@@ -1089,6 +1092,9 @@ each parameter for details. Note that some are synonyms.
 \fIdefault case\fR
 .TP 0.2i
 \(bu
+\fIdefault devmode\fR
+.TP 0.2i
+\(bu
 \fIdelete readonly\fR
 .TP 0.2i
 \(bu
@@ -2192,6 +2198,34 @@ See the section on  NAME MANGLING. Also note the  \fIshort preserve case\fR para
 
 Default: \fBdefault case = lower\fR
 .TP
+\fBdefault devmode (S)\fR
+This parameter is only applicable to printable services. When smbd is serving
+Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
+server has a Device Mode which defines things such as paper size and
+orientation and duplex settings. The device mode can only correctly be
+generated by the printer driver itself (which can only be executed on a
+Win32 platform). Because smbd is unable to execute the driver code
+to generate the device mode, the default behavior is to set this field
+to NULL.
+
+Most problems with serving printer drivers to Windows NT/2k/XP clients
+can be traced to a problem with the generated device mode. Certain drivers
+will do things such as crashing the client's Explorer.exe with a NULL devmode.
+However, other printer drivers can cause the client's spooler service
+(spoolsv.exe) to die if the devmode was not created by the driver itself
+(i.e. smbd generates a default devmode).
+
+This parameter should be used with care and tested with the printer
+driver in question. It is better to leave the device mode to NULL
+and let the Windows client set the correct values. Because drivers do not
+do this all the time, setting \fBdefault devmode = yes\fR
+will instruct smbd to generate a default one.
+
+For more information on Windows NT/2k printing and Device Modes,
+see the MSDN documentation <URL:http://msdn.microsoft.com/>.
+
+Default: \fBdefault devmode = no\fR
+.TP
 \fBdefault service (G)\fR
 This parameter specifies the name of a service
 which will be connected to if the service actually requested cannot
@@ -6653,6 +6687,16 @@ Default: \fBtotal print jobs = 0\fR
 
 Example: \fBtotal print jobs = 5000\fR
 .TP
+\fBunix extensions(G)\fR
+This boolean parameter controls whether Samba 
+implments the CIFS UNIX extensions, as defined by HP. These
+extensions enable CIFS to server UNIX clients to UNIX servers
+better, and allow such things as symbolic links, hard links etc.
+These extensions require a similarly enabled client, and are of
+no current use to Windows clients.
+
+Default: \fBunix extensions = no\fR
+.TP
 \fBunix password sync (G)\fR
 This boolean parameter controls whether Samba 
 attempts to synchronize the UNIX password with the SMB password