merge from 2.2 and regenerate

(This used to be commit 55c53ef08974947cf10a79882b63d6d8e8baad4c)

3 files changed, 75 insertions, 19 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 7bef96c155..f804fa3950 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -139,7 +139,7 @@
 		
 		<para>parameters in this section apply to the server 
 		as a whole, or are defaults for sections which do not 
-		specifically define certain items. See the notes 
+		specifically define certain items. See the notes
 		under PARAMETERS for more information.</para>
 	</refsect2>
 	
@@ -183,7 +183,7 @@
 
 		<para>A similar process occurs if the requested section 
 		name is "homes", except that the share name is not 
-		changed to that of the requesting user. This method of using 
+		changed to that of the requesting user. This method of using
 		the [homes] section works well if different users share 
 		a client PC.</para>
 		
@@ -227,7 +227,7 @@
 		<para>When a connection request is made, the existing sections 
 		are scanned. If a match is found, it is used. If no match is found, 
 		but a [homes] section exists, it is used as described
-		above. Otherwise, the requested section name is treated as a 
+		above. Otherwise, the requested section name is treated as a
 		printer name and the appropriate printcap file is scanned to see 
 		if the requested section name is a valid printer share name. If 
 		a match is found, a new printer share is created by cloning 
@@ -315,7 +315,7 @@
 	the default behavior for all services.</para>
 
 	<para>parameters are arranged here in alphabetical order - this may 
-	not create best bedfellows, but at least you can find them! Where 
+	not create best bedfellows, but at least you can find them! Where
 	there are synonyms, the preferred synonym is described, others refer 
 	to the preferred synonym.</para>
 </refsect1>
@@ -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>
@@ -1870,10 +1872,48 @@
 
 
 		<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 
-		which will be connected to if the service actually requested cannot 
-		be found. Note that the square brackets are <emphasis>NOT</emphasis> 
+		<listitem><para>This parameter specifies the name of a service
+		which will be connected to if the service actually requested cannot
+		be found. Note that the square brackets are <emphasis>NOT</emphasis>
 		given in the parameter value (see example below).</para>
 
 		<para>There is no default value for this parameter. If this 
@@ -3474,7 +3514,7 @@
 		the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
 		The default is to use the stand LDAPS port 636.
 		</para>
-		
+
 		<para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
 		</para>
 		
@@ -7544,6 +7584,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 
 		attempts to synchronize the UNIX password with the SMB password 
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.sgml
index ee91f6e07a..90d4843577 100644
--- a/docs/docbook/projdoc/UNIX_INSTALL.sgml
+++ b/docs/docbook/projdoc/UNIX_INSTALL.sgml
@@ -126,22 +126,22 @@
 
 <sect1>
 	<title>Step 5: Starting the smbd and nmbd</title>
-	
-	<para>You must choose to start smbd and nmbd either 
-	as daemons or from <command>inetd</command>. Don't try 
+
+	<para>You must choose to start smbd and nmbd either
+	as daemons or from <command>inetd</command>. Don't try
 	to do both!  Either you can put them in <filename>
-	inetd.conf</filename> and have them started on demand 
+	inetd.conf</filename> and have them started on demand
 	by <command>inetd</command>, or you can start them as
 	daemons either from the command line or in <filename>
-	/etc/rc.local</filename>. See the man pages for details 
-	on the command line options. Take particular care to read 
-	the bit about what user you need to be in order to start 
+	/etc/rc.local</filename>. See the man pages for details
+	on the command line options. Take particular care to read
+	the bit about what user you need to be in order to start
 	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 
-	respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</para>
+	and <command>nmbd</command> using the recommended daemon method
+	is that they will respond slightly more quickly to an initial connection
+	request.</para>
 
 	<sect2>
 		<title>Step 5a: Starting from inetd.conf</title>
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index 8ea419d758..eaa14bf0c2 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/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>