sync from HEAD

(This used to be commit 2eb7f0acd761a11bb0f24010347247074c5ed49a)

4 files changed, 227 insertions, 378 deletions

diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
deleted file mode 100644
index 143f24dc43..0000000000
--- a/docs/manpages/make_smbcodepage.1
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man 
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-.\" Please send any bug reports, improvements, comments, patches, 
-.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "MAKE_SMBCODEPAGE" "1" "01 October 2002" "" ""
-.SH NAME
-make_smbcodepage \- construct a codepage file for Samba
-.SH SYNOPSIS
-
-\fBmake_smbcodepage\fR \fBc|d\fR \fBcodepage\fR \fBinputfile\fR \fBoutputfile\fR
-
-.SH "DESCRIPTION"
-.PP
-This tool is part of the  Samba suite.
-.PP
-\fBmake_smbcodepage\fR compiles or de-compiles 
-codepage files for use with the internationalization features 
-of Samba 2.2
-.SH "OPTIONS"
-.TP
-\fBc|d\fR
-This tells \fBmake_smbcodepage\fR 
-if it is compiling (\fIc\fR) a text format code 
-page file to binary, or (\fId\fR) de-compiling 
-a binary codepage file to text. 
-.TP
-\fBcodepage\fR
-This is the codepage we are processing (a 
-number, e.g. 850). 
-.TP
-\fBinputfile\fR
-This is the input file to process. In 
-the \fIc\fR case, this will be a text 
-codepage definition file such as the ones found in the Samba  
-\fIsource/codepages\fR directory. In
-the \fId\fR case, this will be the 
-binary format codepage definition file normally found in 
-the \fIlib/codepages\fR directory in the 
-Samba install directory path.
-.TP
-\fBoutputfile\fR
-This is the output file to produce.
-.SH "SAMBA CODEPAGE FILES"
-.PP
-A text Samba codepage definition file is a description 
-that tells  Samba how to map from upper to lower case for 
-characters greater than ascii 127 in the specified DOS code page. 
-Note that for certain DOS codepages (437 for example) mapping 
-from lower to upper case may be non-symmetrical. For example, in
-code page 437 lower case a acute maps to a plain upper case A 
-when going from lower to upper case, but plain upper case A maps 
-to plain lower case a when lower casing a character. 
-.PP
-A binary Samba codepage definition file is a binary 
-representation of the same information, including a value that
-specifies what codepage this file is describing. 
-.PP
-As Samba does not yet use UNICODE (current for Samba version 2.2) 
-you must specify the client code page that your DOS and Windows 
-clients are using if you wish to have case insensitivity done 
-correctly for your particular language. The default codepage Samba 
-uses is 850 (Western European). Text codepage definition sample files
-are provided in the Samba distribution for codepages 437 (USA), 737 (Greek),
-850 (Western European) 852 (MS-DOS Latin 2), 861 (Icelandic), 866 (Cyrillic),
-932 (Kanji SJIS), 936 (Simplified Chinese), 949 (Hangul) and 950 (Traditional
-Chinese). Users are encouraged to write text codepage definition files for
-their own code pages and donate them to samba@samba.org. All codepage files
-in the Samba \fIsource/codepages\fR directory are 
-compiled and installed when a \fB'make install'\fR 
-command is issued there. 
-.PP
-The client codepage used by the \fBsmbd\fR server 
-is configured using the \fBclient code page\fR parameter 
-in the \fBsmb.conf\fR file. 
-.SH "FILES"
-.PP
-\fBcodepage_def.<codepage>\fR
-.PP
-These are the input (text) codepage files provided in the 
-Samba \fIsource/codepages\fR directory.
-.PP
-A text codepage definition file consists of multiple lines 
-containing four fields. These fields are:
-.TP 0.2i
-\(bu
-\fBlower\fR: which is the 
-(hex) lower case character mapped on this line.
-.TP 0.2i
-\(bu
-\fBupper\fR: which is the (hex) 
-upper case character that the lower case character will map to.
-.TP 0.2i
-\(bu
-\fBmap upper to lower\fR which 
-is a boolean value (put either True or False here) which tells 
-Samba if it is to map the given upper case character to the 
-given lower case character when lower casing a filename.
-.TP 0.2i
-\(bu
-\fBmap lower to upper\fR which 
-is a boolean value (put either True or False here) which tells 
-Samba if it is to map the given lower case character to the 
-given upper case character when upper casing a filename.
-.PP
-\fBcodepage.<codepage>\fR - These are the 
-output (binary) codepage files produced  and placed in the Samba 
-destination \fIlib/codepage\fR directory. 
-.SH "INSTALLATION"
-.PP
-The location of the server and its support files is a 
-matter for individual system administrators. The following are 
-thus suggestions only. 
-.PP
-It is recommended that the \fBmake_smbcodepage
-\fR program be installed under the \fI/usr/local/samba
-\fR hierarchy, in a directory readable by all, writeable 
-only by root. The program itself should be executable by all.  The 
-program should NOT be setuid or setgid! 
-.SH "VERSION"
-.PP
-This man page is correct for version 2.2 of 
-the Samba suite.
-.SH "SEE ALSO"
-.PP
-\fBsmbd(8)\fR 
-smb.conf(5)
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities 
-were created by Andrew Tridgell. Samba is now developed
-by the Samba Team as an Open Source project similar 
-to the way the Linux kernel is developed.
-.PP
-The original Samba man pages were written by Karl Auer. 
-The man page sources were converted to YODL format (another 
-excellent piece of Open Source software, available at
-ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
-release by Jeremy Allison.  The conversion to DocBook for 
-Samba 2.2 was done by Gerald Carter
diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1
deleted file mode 100644
index 0c506349e7..0000000000
--- a/docs/manpages/make_unicodemap.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man 
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-.\" Please send any bug reports, improvements, comments, patches, 
-.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "MAKE_UNICODEMAP" "1" "01 October 2002" "" ""
-.SH NAME
-make_unicodemap \- construct a unicode map file for Samba
-.SH SYNOPSIS
-
-\fBmake_unicodemap\fR \fBcodepage\fR \fBinputfile\fR \fBoutputfile\fR
-
-.SH "DESCRIPTION"
-.PP
-This tool is part of the Samba 
-suite.
-.PP
-\fBmake_unicodemap\fR compiles text unicode map 
-files into binary unicode map files for use with the 
-internationalization features of Samba 2.2.
-.SH "OPTIONS"
-.TP
-\fBcodepage\fR
-This is the codepage or UNIX character 
-set we are processing (a number, e.g. 850).
-.TP
-\fBinputfile\fR
-This is the input file to process. This is a 
-text unicode map file such as the ones found in the Samba
-\fIsource/codepages\fR directory. 
-.TP
-\fBoutputfile\fR
-This is the binary output file to produce. 
-.SH "SAMBA UNICODE MAP FILES"
-.PP
-A text Samba unicode map file is a description that tells Samba 
-how to map characters from a specified DOS code page or UNIX character 
-set to 16 bit unicode.
-.PP
-A binary Samba unicode map file is a binary representation 
-of the same information, including a value that specifies what 
-codepage or UNIX character set this file is describing. 
-.SH "FILES"
-.PP
-\fICP<codepage>.TXT\fR
-.PP
-These are the input (text) unicode map files provided 
-in the Samba \fIsource/codepages\fR 
-directory. 
-.PP
-A text unicode map file consists of multiple lines 
-containing two fields. These fields are :  
-.TP 0.2i
-\(bu
-\fIcharacter\fR - which is 
-the (hex) character mapped on this line.
-.TP 0.2i
-\(bu
-\fIunicode\fR - which 
-is the (hex) 16 bit unicode character that the character
-will map to. 
-.PP
-\fIunicode_map.<codepage>\fR  - These are 
-the output (binary) unicode map files produced and placed in 
-the Samba destination \fIlib/codepage\fR 
-directory.
-.SH "INSTALLATION"
-.PP
-The location of the server and its support files is a matter
-for individual system administrators. The following are thus 
-suggestions only. 
-.PP
-It is recommended that the \fBmake_unicodemap\fR 
-program be installed under the 
-\fI$prefix/samba\fR hierarchy, 
-in a directory readable by all, writeable only by root. The 
-program itself should be executable by all.  The program
-should NOT be setuid or setgid! 
-.SH "VERSION"
-.PP
-This man page is correct for version 2.2 of 
-the Samba suite.
-.SH "SEE ALSO"
-.PP
-\fBsmbd(8)\fR 
-smb.conf(5)
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities 
-were created by Andrew Tridgell. Samba is now developed
-by the Samba Team as an Open Source project similar 
-to the way the Linux kernel is developed.
-.PP
-The original Samba man pages were written by Karl Auer. 
-The man page sources were converted to YODL format (another 
-excellent piece of Open Source software, available at
-ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
-release by Jeremy Allison.  The conversion to DocBook for 
-Samba 2.2 was done by Gerald Carter
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index fd2a450a6b..7a6a5c18c6 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -3,20 +3,138 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NET" "8" "01 October 2002" "" ""
+.TH "NET" "8" "03 October 2002" "" ""
 .SH NAME
 net \- Tool for administration of Samba and remote CIFS servers.
 .SH SYNOPSIS
 
-\fBnet\fR \fB<ads|rap|rpc>\fR
+\fBnet\fR \fB<ads|rap|rpc>\fR [ \fB-h\fR ] [ \fB-w workgroup\fR ] [ \fB-W myworkgroup\fR ] [ \fB-U user\fR ] [ \fB-I ip-address\fR ] [ \fB-p port\fR ] [ \fB-n myname\fR ] [ \fB-s conffile\fR ] [ \fB-S server\fR ] [ \fB-C comment\fR ] [ \fB-M maxusers\fR ] [ \fB-F flags\fR ] [ \fB-j jobid\fR ] [ \fB-l\fR ] [ \fB-r\fR ] [ \fB-f\fR ] [ \fB-t timeout\fR ] [ \fB-P\fR ] [ \fB-D debuglevel\fR ]
 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Samba suite.
+.PP
+The samba net utility is meant to work just like the net utility 
+available for windows and DOS.
 .SH "OPTIONS"
+.TP
+\fB-h\fR
+Display summary of all available options.
+.TP
+\fB-w target-workgroup\fR
+Sets target workgroup or domain. You have to specify either this option or the IP address or the name of a server.
+.TP
+\fB-W workgroup\fR
+Sets client workgroup or domain
+.TP
+\fB-U user\fR
+User name to use
+.TP
+\fB-I ip-address\fR
+IP address of target server to use. You have to specify either this option or a target workgroup or a target server.
+.TP
+\fB-p port\fR
+Port on the target server to connect to.
+.TP
+\fB-n myname\fR
+Sets name of the client.
+.TP
+\fB-s conffile\fR
+Specify alternative configuration file that should be loaded.
+.TP
+\fB-S server\fR
+Name of target server. You should specify either this option or a target workgroup or a target IP address.
+.TP
+\fB-C comment\fR
+FIXME
+.TP
+\fB-M maxusers\fR
+FIXME
+.TP
+\fB-F flags\fR
+FIXME
+.TP
+\fB-j jobid\fR
+FIXME
+.TP
+\fB-l\fR
+FIXME
+.TP
+\fB-r\fR
+FIXME
+.TP
+\fB-f\fR
+FIXME
+.TP
+\fB-t timeout\fR
+FIXME
+.TP
+\fB-P\fR
+Make queries to the external server using the machine account of the local server.
+.TP
+\fB-D debuglevel\fR
+set the debuglevel. Debug level 0 is the lowest
+and 100 being the highest. This should be set to 100 if you are
+planning on submitting a bug report to the Samba team (see
+\fIBUGS.txt\fR).
+.SH "TIME"
 .PP
-.SH "COMMANDS"
+The \fBNET TIME\fR command allows you to view the time on a remote server
+or synchronise the time on the local server with the time on the remote server.
+.TP
+\fB\fR
+Without any options, the \fBNET TIME\fR command 
+displays the time on the remote server.
+.TP
+\fBSYSTEM\fR
+Displays the time on the remote server in a format ready for /bin/date
+.TP
+\fBSET\fR
+Tries to set the date and time of the local server to that on 
+the remote server using /bin/date.
+.TP
+\fBZONE\fR
+Displays the timezone in hours from GMT on the remote computer.
+.SH "RPC"
 .PP
+The \fBNET RPC\fR command allows you to do various 
+NT4 operations.
+.TP
+\fBJOIN -U username[%password] [options]\fR
+Join a domain with specified username and password. Password 
+will be prompted if none is specified.
+.TP
+\fBJOIN [options except -U]\fR
+to join a domain created in server manager
+.TP
+\fBUSER [misc. options] [targets]\fR
+List users
+.TP
+\fBUSER DELETE <name> [misc options]\fR
+delete specified user
+.TP
+\fBUSER INFO <name> [misc options]\fR
+list the domain groups of the specified user
+.TP
+\fBUSER ADD <name> [password] [-F user flags] [misc. options\fR
+Add specified user
+.TP
+\fBGROUP [misc options] [targets]\fR
+List user groups
+.TP
+\fBGROUP DELETE <name> [misc. options] [targets]\fR
+Delete specified group
+.TP
+\fBGROUP ADD <name> [-C comment]\fR
+Create specified group
+.TP
+\fBSHARE [misc. options] [targets]\fR
+enumerates all exported resources (network shares) on target server
+.TP
+\fBSHARE ADD <name=serverpath> [misc. options] [targets]\fR
+Adds a share from a server (makes the export active)
+.TP
+\fBSHARE DELETE <sharenam\fR
 .SH "VERSION"
 .PP
 This man page is incomplete for version 3.0 of the Samba 
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index ed4b8cbda2..dc2adaba47 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "01 October 2002" "" ""
+.TH "SMB.CONF" "5" "03 October 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -95,7 +95,7 @@ The share is accessed via the share name "foo":
 .nf
 	 	[foo]
  		path = /home/bar
- 		writeable = true
+ 		read only = no
 	
 	
 .fi
@@ -110,9 +110,9 @@ elsewhere):
 .nf
 	 	[aprinter]
  		path = /usr/spool/public
- 		writeable = false
- 		printable = true
- 		guest ok = true
+ 		read only = yes
+ 		printable = yes
+ 		guest ok = yes
 	
 	
 .fi
@@ -173,7 +173,7 @@ section:
 
 .nf
 			 	[homes]
- 			writeable = yes
+ 			read only = no
 		
 		
 .fi
@@ -604,12 +604,6 @@ each parameter for details.  Note that some are synonyms.
 \fIdns proxy\fR
 .TP 0.2i
 \(bu
-\fIdomain admin group\fR
-.TP 0.2i
-\(bu
-\fIdomain guest group\fR
-.TP 0.2i
-\(bu
 \fIdomain logons\fR
 .TP 0.2i
 \(bu
@@ -640,6 +634,9 @@ each parameter for details.  Note that some are synonyms.
 \fIhide unwriteable files\fR
 .TP 0.2i
 \(bu
+\fIhide special files\fR
+.TP 0.2i
+\(bu
 \fIhomedir map\fR
 .TP 0.2i
 \(bu
@@ -997,6 +994,9 @@ each parameter for details.  Note that some are synonyms.
 \fIuse rhosts\fR
 .TP 0.2i
 \(bu
+\fIuse sendfile\fR
+.TP 0.2i
+\(bu
 \fIusername level\fR
 .TP 0.2i
 \(bu
@@ -1367,9 +1367,6 @@ each parameter for details. Note that some are synonyms.
 \fIshort preserve case\fR
 .TP 0.2i
 \(bu
-\fIstatus\fR
-.TP 0.2i
-\(bu
 \fIstrict allocate\fR
 .TP 0.2i
 \(bu
@@ -1813,7 +1810,7 @@ cannot be immediately satisfied, Samba 2.2 will internally
 queue the lock request, and periodically attempt to obtain 
 the lock until the timeout period expires.
 
-If this parameter is set to false, then 
+If this parameter is set to no, then 
 Samba 2.2 will behave as previous versions of Samba would and 
 will fail the lock request immediately if the lock range 
 cannot be obtained.
@@ -1845,7 +1842,7 @@ See the \fI  browseable\fR.
 \fBbrowse list (G)\fR
 This controls whether   \fBsmbd(8)\fR will serve a browse list to 
 a client doing a \fBNetServerEnum\fR call. Normally 
-set to true. You should never need to change 
+set to yes. You should never need to change 
 this.
 
 Default: \fBbrowse list = yes\fR
@@ -2272,11 +2269,11 @@ Example: \fBdelete user from group script = /usr/sbin/deluser %u %g\fR
 This option is used when Samba is attempting to 
 delete a directory that contains one or more vetoed directories 
 (see the \fIveto files\fR
-option).  If this option is set to false (the default) then if a vetoed 
+option).  If this option is set to no (the default) then if a vetoed 
 directory contains any non-vetoed files or directories then the 
 directory delete will fail. This is usually what you want.
 
-If this option is set to true, then Samba 
+If this option is set to yes, then Samba 
 will attempt to recursively delete any files and directories within 
 the vetoed directory. This can be useful for integration with file 
 serving systems such as NetAtalk which create meta-files within 
@@ -2484,42 +2481,8 @@ See also the parameter \fI  wins support\fR.
 
 Default: \fBdns proxy = yes\fR
 .TP
-\fBdomain admin group (G)\fR
-This parameter is intended as a temporary solution
-to enable users to be a member of the "Domain Admins" group when 
-a Samba host is acting as a PDC.  A complete solution will be provided
-by a system for mapping Windows NT/2000 groups onto UNIX groups.
-Please note that this parameter has a somewhat confusing name.  It 
-accepts a list of usernames and of group names in standard 
-\fIsmb.conf\fR notation.
-
-See also \fIdomain
-guest group\fR, \fIdomain
-logons\fR
-
-Default: \fBno domain administrators\fR
-
-Example: \fBdomain admin group = root @wheel\fR
-.TP
-\fBdomain guest group (G)\fR
-This parameter is intended as a temporary solution
-to enable users to be a member of the "Domain Guests" group when 
-a Samba host is acting as a PDC.  A complete solution will be provided
-by a system for mapping Windows NT/2000 groups onto UNIX groups.
-Please note that this parameter has a somewhat confusing name.  It 
-accepts a list of usernames and of group names in standard 
-\fIsmb.conf\fR notation.
-
-See also \fIdomain
-admin group\fR, \fIdomain
-logons\fR
-
-Default: \fBno domain guests\fR
-
-Example: \fBdomain guest group = nobody @guest\fR
-.TP
 \fBdomain logons (G)\fR
-If set to true, the Samba server will serve 
+If set to yes, the Samba server will serve 
 Windows 95/98 Domain logons for the   \fIworkgroup\fR it is in. Samba 2.2 also 
 has limited capability to act as a domain controller for Windows 
 NT 4 Domains.  For more details on setting up this feature see 
@@ -2626,7 +2589,7 @@ file they can change the timestamp on it. Under POSIX semantics,
 only the owner of the file or root may change the timestamp. By 
 default, Samba runs with POSIX semantics and refuses to change the 
 timestamp on a file if the user \fBsmbd\fR is acting 
-on behalf of is not the file owner. Setting this option to   true allows DOS semantics and smbd will change the file 
+on behalf of is not the file owner. Setting this option to   yes allows DOS semantics and smbd will change the file 
 timestamp as DOS requires.
 
 Default: \fBdos filetimes = no\fR
@@ -2947,7 +2910,7 @@ This is a tuning option. When this is enabled a
 caching algorithm will be used to reduce the time taken for getwd() 
 calls. This can have a significant impact on performance, especially 
 when the \fIwide links\fR
-parameter is set to false.
+parameter is set to no.
 
 Default: \fBgetwd cache = yes\fR
 .TP
@@ -3055,9 +3018,16 @@ Note that unwriteable directories are shown as usual.
 
 Default: \fBhide unwriteable = no\fR
 .TP
+\fBhide special files (G)\fR
+This parameter prevents clients from seeing
+special files such as sockets, devices and fifo's in directory 
+listings.
+
+Default: \fBhide special files = no\fR
+.TP
 \fBhomedir map (G)\fR
 If\fInis homedir
-\fR is true, and \fBsmbd(8)\fR is also acting 
+\fR is yes, and \fBsmbd(8)\fR is also acting 
 as a Win95/98 \fIlogon server\fR then this parameter 
 specifies the NIS (or YP) map from which the server for the user's 
 home directory should be extracted.  At present, only the Sun 
@@ -3498,7 +3468,7 @@ Currently, if \fIkernel
 oplocks\fR are supported then level2 oplocks are 
 not granted (even if this parameter is set to yes). 
 Note also, the \fIoplocks\fR
-parameter must be set to true on this share in order for 
+parameter must be set to yes on this share in order for 
 this parameter to have any effect.
 
 See also the \fIoplocks\fR
@@ -3511,10 +3481,10 @@ Default: \fBlevel2 oplocks = yes\fR
 This parameter determines if   \fBnmbd(8)\fR will produce Lanman announce 
 broadcasts that are needed by OS/2 clients in order for them to see 
 the Samba server in their browse list. This parameter can have three 
-values, true, false, or
+values, yes, no, or
 auto. The default is auto.  
-If set to false Samba will never produce these 
-broadcasts. If set to true Samba will produce 
+If set to no Samba will never produce these 
+broadcasts. If set to yes Samba will produce 
 Lanman announce broadcasts at a frequency set by the parameter 
 \fIlm interval\fR. If set to auto 
 Samba will not send Lanman announce broadcasts by default but will 
@@ -3554,13 +3524,13 @@ Default: \fBload printers = yes\fR
 .TP
 \fBlocal master (G)\fR
 This option allows \fB  nmbd(8)\fR to try and become a local master browser 
-on a subnet. If set to false then \fB  nmbd\fR will not attempt to become a local master browser 
+on a subnet. If set to no then \fB  nmbd\fR will not attempt to become a local master browser 
 on a subnet and will also lose in all browsing elections. By
-default this value is set to true. Setting this value to true doesn't
+default this value is set to yes. Setting this value to yes doesn't
 mean that Samba will \fBbecome\fR the local master 
 browser on a subnet, just that \fBnmbd\fR will \fB  participate\fR in elections for local master browser.
 
-Setting this value to false will cause \fBnmbd\fR
+Setting this value to no will cause \fBnmbd\fR
 \fBnever\fR to become a local master browser.
 
 Default: \fBlocal master = yes\fR
@@ -4967,7 +4937,7 @@ is a full stop ".",  then no string is sent. Similarly,
 if the expect string is a full stop then no string is expected.
 
 If the \fIpam
-password change\fR parameter is set to true, the chat pairs
+password change\fR parameter is set to yes, the chat pairs
 may be matched in any order, and success is determined by the PAM result, 
 not any particular output. The \\n macro is ignored for PAM conversions.
 
@@ -5015,7 +4985,7 @@ of mixed case chars and digits. This can pose a problem as some clients
 it.
 
 \fBNote\fR that if the \fIunix 
-password sync\fR parameter is set to true
+password sync\fR parameter is set to yes
 then this program is called \fBAS ROOT\fR 
 before the SMB password in the smbpasswd(5)
  file is changed. If this UNIX password change fails, then 
@@ -5026,7 +4996,7 @@ If the \fIunix password sync\fR parameter
 is set this parameter \fBMUST USE ABSOLUTE PATHS\fR 
 for \fBALL\fR programs called, and must be examined 
 for security implications. Note that by default \fIunix 
-password sync\fR is set to false.
+password sync\fR is set to no.
 
 See also \fIunix 
 password sync\fR.
@@ -5265,7 +5235,7 @@ Default: \fBpreexec close = no\fR
 This boolean parameter controls if nmbd(8) is a preferred master browser 
 for its workgroup.
 
-If this is set to true, on startup, \fBnmbd\fR 
+If this is set to yes, on startup, \fBnmbd\fR 
 will force an election, and it will have a slight advantage in 
 winning the election.  It is recommended that this parameter is 
 used in conjunction with \fB\fI  domain master\fB = yes\fR, so that \fB  nmbd\fR can guarantee becoming a domain master.
@@ -5285,7 +5255,7 @@ Default: \fBpreferred master = auto\fR
 \fBprefered master (G)\fR
 Synonym for \fI  preferred master\fR for people who cannot spell :-).
 .TP
-\fBpreload\fR
+\fBpreload (G)\fR
 This is a list of services that you want to be 
 automatically added to the browse lists. This is most useful 
 for homes and printers services that would otherwise not be 
@@ -5404,7 +5374,7 @@ specified for the service.
 
 Note that a printable service will ALWAYS allow writing 
 to the service path (user privileges permitting) via the spooling 
-of print data. The \fIwriteable
+of print data. The \fIread only
 \fR parameter controls only non-printing access to 
 the resource.
 
@@ -5664,7 +5634,7 @@ Default: \fBread bmpx = no\fR
 \fBread list (S)\fR
 This is a list of users that are given read-only 
 access to a service. If the connecting user is in this list then 
-they will not be given write access, no matter what the \fIwriteable\fR
+they will not be given write access, no matter what the \fIread only\fR
 option is set to. The list can include group names using the 
 syntax described in the \fI  invalid users\fR parameter.
 
@@ -5676,7 +5646,17 @@ Default: \fBread list = <empty string>\fR
 Example: \fBread list = mary, @students\fR
 .TP
 \fBread only (S)\fR
-Note that this is an inverted synonym for \fIwriteable\fR.
+An inverted synonym is   \fIwriteable\fR.
+
+If this parameter is yes, then users 
+of a service may not create or modify files in the service's 
+directory.
+
+Note that a printable service (\fBprintable = yes\fR)
+will \fBALWAYS\fR allow writing to the directory 
+(user privileges permitting), but only via spooling operations.
+
+Default: \fBread only = yes\fR
 .TP
 \fBread raw (G)\fR
 This parameter controls whether or not the server 
@@ -5790,10 +5770,10 @@ Default: \fBremote browse sync = <empty string>
 \fR
 .TP
 \fBrestrict anonymous (G)\fR
-This is a boolean parameter.  If it is true, then 
+This is a boolean parameter.  If it is yes, then 
 anonymous access to the server will be restricted, namely in the 
 case where the server is expecting the client to send a username, 
-but it doesn't.  Setting it to true will force these anonymous 
+but it doesn't.  Setting it to yes will force these anonymous 
 connections to be denied, and the client will be required to always 
 supply a username and password when connecting. Use of this parameter 
 is only recommended for homogeneous NT client environments.
@@ -5803,7 +5783,7 @@ on the username (%U, %G, etc) consistent.  NT 4.0
 likes to use anonymous connections when refreshing the share list, 
 and this is a way to work around that.
 
-When restrict anonymous is true, all anonymous connections 
+When restrict anonymous is yes, all anonymous connections 
 are denied no matter what they are for.  This can effect the ability 
 of a machine to access the Samba Primary Domain Controller to revalidate 
 its machine account after someone else has logged on the client 
@@ -6051,7 +6031,7 @@ parameter.
 
 This mode will only work correctly if smbpasswd(8) has been used to add this 
 machine into a Windows NT Domain. It expects the \fIencrypted passwords\fR
-parameter to be set to true. In this 
+parameter to be set to yes. In this 
 mode Samba will try to validate the username/password by passing
 it to a Windows NT Primary or Backup Domain Controller, in exactly 
 the same way that a Windows NT Server would do.
@@ -6419,17 +6399,6 @@ never need to change this parameter.
 
 Default: \fBstat cache size = 50\fR
 .TP
-\fBstatus (G)\fR
-This enables or disables logging of connections 
-to a status file that smbstatus(1)
-can read.
-
-With this disabled \fBsmbstatus\fR won't be able
-to tell you what connections are active. You should never need to
-change this parameter.
-
-Default: \fBstatus = yes\fR
-.TP
 \fBstrict allocate (S)\fR
 This is a boolean that controls the handling of 
 disk space allocation in the server. When this is set to yes 
@@ -6494,10 +6463,10 @@ Default: \fBstrip dot = no\fR
 \fBsync always (S)\fR
 This is a boolean parameter that controls 
 whether writes will always be written to stable storage before 
-the write call returns. If this is false then the server will be 
+the write call returns. If this is no then the server will be 
 guided by the client's request in each write call (clients can 
 set a bit indicating that a particular write should be synchronous). 
-If this is true then every write will be followed by a \fBfsync()
+If this is yes then every write will be followed by a \fBfsync()
 \fR call to ensure the data is written to disk. Note that 
 the \fIstrict sync\fR parameter must be set to
 yes in order for this parameter to have 
@@ -6609,7 +6578,7 @@ Default: \fBunix extensions = no\fR
 This boolean parameter controls whether Samba 
 attempts to synchronize the UNIX password with the SMB password 
 when the encrypted SMB password in the smbpasswd file is changed. 
-If this is set to true the program specified in the \fIpasswd
+If this is set to yes the program specified in the \fIpasswd
 program\fRparameter is called \fBAS ROOT\fR - 
 to allow the new UNIX password to be set without access to the 
 old UNIX password (as the SMB password change code has no 
@@ -6682,7 +6651,7 @@ Default: \fBuse client driver = no\fR
 This global parameter determines if the tdb internals of Samba can
 depend on mmap working correctly on the running system. Samba requires a coherent
 mmap/read-write system memory cache. Currently only HPUX does not have such a
-coherent cache, and so this parameter is set to false by
+coherent cache, and so this parameter is set to no by
 default on HPUX. On all other systems this parameter should be left alone. This
 parameter is provided to help the Samba developers track down problems with
 the tdb internal code.
@@ -6690,7 +6659,7 @@ the tdb internal code.
 Default: \fBuse mmap = yes\fR
 .TP
 \fBuse rhosts (G)\fR
-If this global parameter is true, it specifies 
+If this global parameter is yes, it specifies 
 that the UNIX user's \fI.rhosts\fR file in their home directory 
 will be read to find the names of hosts and users who will be allowed 
 access without specifying a password.
@@ -6813,26 +6782,26 @@ on the left. Processing then continues with the next line.
 If any line begins with a '#' or a ';' then it is 
 ignored
 
-If any line begins with an '!' then the processing 
-will stop after that line if a mapping was done by the line. 
-Otherwise mapping continues with every line being processed. 
-Using '!' is most useful when you have a wildcard mapping line 
+If any line begins with an '!' then the processing
+will stop after that line if a mapping was done by the line.
+Otherwise mapping continues with every line being processed.
+Using '!' is most useful when you have a wildcard mapping line
 later in the file.
 
-For example to map from the name admin 
+For example to map from the name admin
 or administrator to the UNIX name   root you would use:
 
 \fBroot = admin administrator\fR
 
-Or to map anyone in the UNIX group system 
+Or to map anyone in the UNIX group system
 to the UNIX name sys you would use:
 
 \fBsys = @system\fR
 
-You can have as many mappings as you like in a username 
+You can have as many mappings as you like in a username
 map file.
 
-If your system supports the NIS NETGROUP option then 
+If your system supports the NIS NETGROUP option then
 the netgroup database is checked before the \fI/etc/group
 \fR database for matching groups.
 
@@ -6841,12 +6810,12 @@ by using double quotes around the name. For example:
 
 \fBtridge = "Andrew Tridgell"\fR
 
-would map the windows username "Andrew Tridgell" to the 
+would map the windows username "Andrew Tridgell" to the
 unix username "tridge".
 
-The following example would map mary and fred to the 
-unix user sys, and map the rest to guest. Note the use of the 
-\&'!' to tell Samba to stop processing if it gets a match on 
+The following example would map mary and fred to the
+unix user sys, and map the rest to guest. Note the use of the
+\&'!' to tell Samba to stop processing if it gets a match on
 that line.
 
 
@@ -6856,18 +6825,18 @@ that line.
 		
 .fi
 
-Note that the remapping is applied to all occurrences 
-of usernames. Thus if you connect to \\\\server\\fred and   fred is remapped to mary then you 
-will actually be connecting to \\\\server\\mary and will need to 
-supply a password suitable for mary not 
-fred. The only exception to this is the 
-username passed to the \fI  password server\fR (if you have one). The password 
-server will receive whatever username the client supplies without 
+Note that the remapping is applied to all occurrences
+of usernames. Thus if you connect to \\\\server\\fred and   fred is remapped to mary then you
+will actually be connecting to \\\\server\\mary and will need to
+supply a password suitable for mary not
+fred. The only exception to this is the
+username passed to the \fI  password server\fR (if you have one). The password
+server will receive whatever username the client supplies without
 modification.
 
-Also note that no reverse mapping is done. The main effect 
-this has is with printing. Users who have been mapped may have 
-trouble deleting print jobs as PrintManager under WfWg will think 
+Also note that no reverse mapping is done. The main effect
+this has is with printing. Users who have been mapped may have
+trouble deleting print jobs as PrintManager under WfWg will think
 they don't own the print job.
 
 Default: \fBno username map\fR
@@ -6875,9 +6844,20 @@ Default: \fBno username map\fR
 Example: \fBusername map = /usr/local/samba/lib/users.map
 \fR
 .TP
+\fBuse sendfile (S)\fR
+If this parameter is yes, and Samba
+was built with the --with-sendfile-support option, and the underlying operating
+system supports sendfile system call, then some SMB read calls (mainly ReadAndX
+and ReadRaw) will use the more efficient sendfile system call for files that
+are exclusively oplocked. This may make more efficient use of the system CPU's
+and cause Samba to be faster. This is off by default as it's effects are unknown
+as yet.
+
+Default: \fBuse sendfile = no\fR
+.TP
 \fButmp (G)\fR
-This boolean parameter is only available if 
-Samba has been configured and compiled  with the option \fB  --with-utmp\fR. If set to true then Samba will attempt
+This boolean parameter is only available if
+Samba has been configured and compiled  with the option \fB  --with-utmp\fR. If set to yes then Samba will attempt
 to add utmp or utmpx records (depending on the UNIX system) whenever a
 connection is made to a Samba server. Sites may use this to record the
 user connecting to a Samba share.
@@ -7071,7 +7051,7 @@ necessary to suppress the enumeration of users through the
 \fBgetpwent()\fR and
 \fBendpwent()\fR group of system calls.  If
 the \fIwinbind enum users\fR parameter is
-false, calls to the \fBgetpwent\fR system call
+no, calls to the \fBgetpwent\fR system call
 will not return any data. 
 
 \fBWarning:\fR Turning off user
@@ -7090,7 +7070,7 @@ necessary to suppress the enumeration of groups through the
 \fBgetgrent()\fR and
 \fBendgrent()\fR group of system calls.  If
 the \fIwinbind enum groups\fR parameter is
-false, calls to the \fBgetgrent()\fR system
+no, calls to the \fBgetgrent()\fR system
 call will not return any data. 
 
 \fBWarning:\fR Turning off group
@@ -7137,17 +7117,17 @@ Example: \fBwinbind uid = 10000-20000\fR
 .TP
 \fBwinbind use default domain\fR
 .TP
-\fBwinbind use default domain\fR
+\fBwinbind use default domain (G)\fR
 This parameter specifies whether the   winbindd(8)
 daemon should operate on users without domain component in their username.  
 Users without a domain component are treated as is part of the winbindd server's 
 own domain.  While this does not benifit Windows users, it makes SSH, FTP and e-mail 
 function in a way much closer to the way they would in a native unix system.
 
-Default: \fBwinbind use default domain = <falseg> 
+Default: \fBwinbind use default domain = <no> 
 \fR
 
-Example: \fBwinbind use default domain = true\fR
+Example: \fBwinbind use default domain = yes\fR
 .TP
 \fBwins hook (G)\fR
 When Samba is running as a WINS server this 
@@ -7224,9 +7204,9 @@ Example: \fBwins server = 192.9.200.1\fR
 \fBwins support (G)\fR
 This boolean controls if the    
 nmbd(8) process in Samba will act as a WINS server. You should 
-not set this to true unless you have a multi-subnetted network and 
+not set this to yes unless you have a multi-subnetted network and 
 you wish a particular \fBnmbd\fR to be your WINS server. 
-Note that you should \fBNEVER\fR set this to true
+Note that you should \fBNEVER\fR set this to yes
 on more than one machine in your network.
 
 Default: \fBwins support = no\fR
@@ -7273,7 +7253,7 @@ for a 256k cache size per file.
 \fBwrite list (S)\fR
 This is a list of users that are given read-write 
 access to a service. If the connecting user is in this list then 
-they will be given write access, no matter what the \fIwriteable\fR
+they will be given write access, no matter what the \fIread only\fR
 option is set to. The list can include group names using the 
 @group syntax.
 
@@ -7301,7 +7281,7 @@ Default: \fBwins partners = \fR
 Example: \fBwins partners = 192.168.0.1 172.16.1.2\fR
 .TP
 \fBwrite ok (S)\fR
-Synonym for \fI  writeable\fR.
+Inverted synonym for \fI  read only\fR.
 .TP
 \fBwrite raw (G)\fR
 This parameter controls whether or not the server 
@@ -7311,17 +7291,7 @@ You should never need to change this parameter.
 Default: \fBwrite raw = yes\fR
 .TP
 \fBwriteable (S)\fR
-An inverted synonym is   \fIread only\fR.
-
-If this parameter is no, then users 
-of a service may not create or modify files in the service's 
-directory.
-
-Note that a printable service (\fBprintable = yes\fR)
-will \fBALWAYS\fR allow writing to the directory 
-(user privileges permitting), but only via spooling operations.
-
-Default: \fBwriteable = no\fR
+Inverted synonym for \fI  read only\fR.
 .SH "WARNINGS"
 .PP
 Although the configuration file permits service names