merge from 2.2 and regenerate

(This used to be commit 55c53ef08974947cf10a79882b63d6d8e8baad4c)

1 files changed, 52 insertions, 8 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index ace3e54946..19b2add38c 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" "24 January 2002" "" ""
+.TH "SMB.CONF" "5" "26 January 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -122,7 +122,7 @@ elsewhere):
 .PP
 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.
 .SS "THE  HOMES  SECTION"
 .PP
@@ -167,7 +167,7 @@ of fuss.
 .PP
 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.
 .PP
@@ -213,7 +213,7 @@ specified in the local host's printcap file.
 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 
@@ -307,7 +307,7 @@ the [global] section - in which case they will define
 the default behavior for all services.
 .PP
 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.
 .SH "VARIABLE SUBSTITUTIONS"
@@ -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,10 +2198,38 @@ 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 
-be found. Note that the square brackets are \fBNOT\fR 
+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 \fBNOT\fR
 given in the parameter value (see example below).
 
 There is no default value for this parameter. If this 
@@ -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