"disable charset" -> "display charset". oops

(This used to be commit 67543ea43d6c76f10f6757ae35a29044ce0020c5)

1 files changed, 112 insertions, 112 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 71281143a4..990ba027ab 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" "22 augustus 2002" "" ""
+.TH "SMB.CONF" "5" "07 September 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -13,7 +13,7 @@ file for the Samba suite. \fIsmb.conf\fR contains
 runtime configuration information for the Samba programs. The
 \fIsmb.conf\fR file is designed to be configured and 
 administered by the \fBswat(8)\fR
-program. The complete description of the file format and 
+ program. The complete description of the file format and 
 possible parameters held within are here for reference purposes.
 .SH "FILE FORMAT"
 .PP
@@ -376,7 +376,7 @@ machine. Only some are recognized, and those may not be
 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
-should allow it to be fixed.
+ <URL:mailto:samba@samba.org> should allow it to be fixed.
 .TP
 \fB%I\fR
 The IP address of the client machine.
@@ -598,7 +598,7 @@ each parameter for details.  Note that some are synonyms.
 \fIdisable spoolss\fR
 .TP 0.2i
 \(bu
-\fIdisable charset\fR
+\fIdisplay charset\fR
 .TP 0.2i
 \(bu
 \fIdns proxy\fR
@@ -1433,7 +1433,7 @@ each parameter for details. Note that some are synonyms.
 \fBabort shutdown script (G)\fR
 \fBThis parameter only exists in the HEAD cvs branch\fR
 This a full path name to a script called by
-\fBsmbd(8)\fRthat
+\fBsmbd(8)\fR that
 should stop a shutdown procedure issued by the \fIshutdown script\fR.
 
 This command will be run as user.
@@ -1457,7 +1457,7 @@ will perform the necessary operations for adding the printer
 to the print system and to add the appropriate service definition 
 to the  \fIsmb.conf\fR file in order that it can be 
 shared by \fBsmbd(8)\fR
-.
+
 
 The \fIaddprinter command\fR is
 automatically invoked with the following parameter (in 
@@ -1548,7 +1548,7 @@ Example: \fBadd share command = /usr/local/bin/addshare\fR
 .TP
 \fBadd machine script (G)\fR
 This is the full pathname to a script that will 
-be run by smbd(8)when a machine is added
+be run by smbd(8) when a machine is added
 to it's domain using the administrator username and password method. 
 
 This option is only required when using sam back-ends tied to the
@@ -1574,16 +1574,16 @@ Example: \fBads server = 192.168.1.2\fR
 \fBadd user script (G)\fR
 This is the full pathname to a script that will 
 be run \fBAS ROOT\fR by smbd(8)
-under special circumstances described below.
+ under special circumstances described below.
 
 Normally, a Samba server requires that UNIX users are 
 created for all users accessing files on this server. For sites 
 that use Windows NT account databases as their primary user database 
 creating these users and keeping the user list in sync with the 
-Windows NT PDC is an onerous task. This option allows smbdto create the required UNIX users 
+Windows NT PDC is an onerous task. This option allows smbd to create the required UNIX users 
 \fBON DEMAND\fR when a user accesses the Samba server.
 
-In order to use this option, smbd
+In order to use this option, smbd 
 must \fBNOT\fR be set to \fIsecurity = share\fR
 and \fIadd user script\fR
 must be set to a full pathname for a script that will create a UNIX 
@@ -1591,7 +1591,7 @@ user given one argument of \fI%u\fR, which expands into
 the UNIX user name to create.
 
 When the Windows user attempts to access the Samba server, 
-at login (session setup in the SMB protocol) time,   smbdcontacts the \fIpassword server\fR and 
+at login (session setup in the SMB protocol) time,   smbd contacts the \fIpassword server\fR and 
 attempts to authenticate the given user with the given password. If the 
 authentication succeeds then \fBsmbd\fR 
 attempts to find a UNIX user in the UNIX password database to map the 
@@ -1617,7 +1617,7 @@ Example: \fBadd user script = /usr/local/samba/bin/add_user
 .TP
 \fBadd group script (G)\fR
 This is the full pathname to a script that will 
-be run \fBAS ROOT\fR by smbd(8)when a new group is requested. It will expand any \fI%g\fR to the group name passed.  This script is only useful for installations using the Windows NT domain administration tools.
+be run \fBAS ROOT\fR by smbd(8) when a new group is requested. It will expand any \fI%g\fR to the group name passed.  This script is only useful for installations using the Windows NT domain administration tools.
 .TP
 \fBadmin users (S)\fR
 This is a list of users who will be granted 
@@ -1635,7 +1635,7 @@ Example: \fBadmin users = jason\fR
 \fBadd user to group script (G)\fR
 Full path to the script that will be called when 
 a user is added to a group using the Windows NT domain administration 
-tools. It will be run by smbd(8)
+tools. It will be run by smbd(8) 
 \fBAS ROOT\fR. Any \fI%g\fR will be 
 replaced with the group name and any \fI%u\fR will 
 be replaced with the user name.
@@ -1670,7 +1670,7 @@ Example: \fBalgorithmic rid base = 100000\fR
 This option only takes effect when the \fIsecurity\fR option is set to 
 server or domain.  
 If it is set to no, then attempts to connect to a resource from 
-a domain or workgroup other than the one which smbdis running 
+a domain or workgroup other than the one which smbd is running 
 in will fail, even if that domain is trusted by the remote server 
 doing the authentication.
 
@@ -1687,7 +1687,7 @@ Default: \fBallow trusted domains = yes\fR
 .TP
 \fBannounce as (G)\fR
 This specifies what type of server 
-\fBnmbd\fR
+\fBnmbd\fR 
 will announce itself as, to a network neighborhood browse 
 list. By default this is set to Windows NT. The valid options 
 are : "NT Server" (which can also be written as "NT"), 
@@ -1738,8 +1738,8 @@ Default: \fBavailable = yes\fR
 \fBbind interfaces only (G)\fR
 This global parameter allows the Samba admin 
 to limit what interfaces on a machine will serve SMB requests. If 
-affects file service smbd(8)and 
-name service nmbd(8)in slightly 
+affects file service smbd(8) and 
+name service nmbd(8) in slightly 
 different ways.
 
 For name service it causes \fBnmbd\fR to bind 
@@ -1768,8 +1768,8 @@ interfaces as it will not cope with non-permanent interfaces.
 
 If \fIbind interfaces only\fR is set then 
 unless the network address \fB127.0.0.1\fR is added 
-to the \fIinterfaces\fR parameter list \fBsmbpasswd(8)\fR
-and \fBswat(8)\fRmay 
+to the \fIinterfaces\fR parameter list \fBsmbpasswd(8)\fR 
+and \fBswat(8)\fR may 
 not work as expected due to the reasons covered below.
 
 To change a users SMB password, the \fBsmbpasswd\fR
@@ -1780,7 +1780,7 @@ network address \fB127.0.0.1\fR is added to the
 \fIinterfaces\fR parameter list then \fB  smbpasswd\fR will fail to connect in it's default mode. 
 \fBsmbpasswd\fR can be forced to use the primary IP interface 
 of the local host by using its   \fI-r remote machine\fR
-parameter, with \fIremote machine\fR set 
+ parameter, with \fIremote machine\fR set 
 to the IP name of the primary interface of the local host.
 
 The \fBswat\fR status page tries to connect with
@@ -1793,7 +1793,7 @@ and \fBnmbd\fR.
 Default: \fBbind interfaces only = no\fR
 .TP
 \fBblocking locks (S)\fR
-This parameter controls the behavior of smbd(8)when given a request by a client 
+This parameter controls the behavior of smbd(8) when given a request by a client 
 to obtain a byte range lock on a region of an open file, and the 
 request has a time limit associated with it.
 
@@ -1811,7 +1811,7 @@ Default: \fBblocking locks = yes\fR
 .TP
 \fBblock size (S)\fR
 This parameter controls the behavior of 
-smbd(8)when reporting disk free 
+smbd(8) when reporting disk free 
 sizes. By default, this reports a disk block size of 1024 bytes.
 
 Changing this parameter may have some effect on the
@@ -1832,7 +1832,7 @@ Example: \fBblock size = 65536\fR
 See the \fI  browseable\fR.
 .TP
 \fBbrowse list (G)\fR
-This controls whether   \fBsmbd(8)\fRwill serve a browse list to 
+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 
 this.
@@ -1858,7 +1858,7 @@ sensitive.
 This SMB allows a client to tell a server to 
 "watch" a particular directory for any changes and only reply to
 the SMB request when a change has occurred. Such constant scanning of
-a directory is expensive under UNIX, hence an   \fBsmbd(8)\fRdaemon only performs such a scan 
+a directory is expensive under UNIX, hence an   \fBsmbd(8)\fR daemon only performs such a scan 
 on each requested directory once every \fIchange notify 
 timeout\fR seconds.
 
@@ -2051,7 +2051,7 @@ Default: \fBdebug hires timestamp = no\fR
 .TP
 \fBdebug pid (G)\fR
 When using only one log file for more then one 
-forked smbd-process there may be hard to follow which process 
+forked smbdprocess there may be hard to follow which process 
 outputs which message. This boolean parameter is adds the process-id 
 to the timestamp message headers in the logfile when turned on.
 
@@ -2114,7 +2114,7 @@ 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.
+see the MSDN documentation <URL:http://msdn.microsoft.com/>.
 
 Default: \fBdefault devmode = no\fR
 .TP
@@ -2153,7 +2153,7 @@ Example:
 .TP
 \fBdelete group script (G)\fR
 This is the full pathname to a script that will 
-be run \fBAS ROOT\fR by smbd(8)when a group is requested to be deleted. It will expand any \fI%g\fR to the group name passed.  This script is only useful for installations using the Windows NT domain administration tools.
+be run \fBAS ROOT\fR by smbd(8) when a group is requested to be deleted. It will expand any \fI%g\fR to the group name passed.  This script is only useful for installations using the Windows NT domain administration tools.
 .TP
 \fBdeleteprinter command (G)\fR
 With the introduction of MS-RPC based printer
@@ -2248,7 +2248,7 @@ Example: \fBdelete user script = /usr/local/samba/bin/del_user
 \fBdelete user from group script (G)\fR
 Full path to the script that will be called when 
 a user is removed from a group using the Windows NT domain administration 
-tools. It will be run by smbd(8)
+tools. It will be run by smbd(8) 
 \fBAS ROOT\fR. Any \fI%g\fR will be 
 replaced with the group name and any \fI%u\fR will 
 be replaced with the user name.
@@ -2455,7 +2455,7 @@ Default: \fBdisplay charset = ASCII\fR
 Example: \fBdisplay charset = UTF8\fR
 .TP
 \fBdns proxy (G)\fR
-Specifies that nmbd(8)
+Specifies that nmbd(8) 
 when acting as a WINS server and finding that a NetBIOS name has not 
 been registered, should treat the NetBIOS name word-for-word as a DNS 
 name and do a lookup with the DNS server for that name on behalf of 
@@ -2518,13 +2518,13 @@ directory shipped with the source code.
 Default: \fBdomain logons = no\fR
 .TP
 \fBdomain master (G)\fR
-Tell \fB  nmbd(8)\fRto enable WAN-wide browse list
+Tell \fB  nmbd(8)\fR to enable WAN-wide browse list
 collation. Setting this option causes \fBnmbd\fR to
 claim a special domain specific NetBIOS name that identifies 
 it as a domain master browser for its given   \fIworkgroup\fR. Local master browsers 
 in the same \fIworkgroup\fR on broadcast-isolated 
 subnets will give this \fBnmbd\fR their local browse lists, 
-and then ask \fBsmbd(8)\fR
+and then ask \fBsmbd(8)\fR 
 for a complete copy of the browse list for the whole wide area 
 network.  Browser clients will then contact their local master browser, 
 and will receive the domain-wide browse list, instead of just the list 
@@ -2572,7 +2572,7 @@ charset Samba should talk to DOS clients.
 The default depends on which charsets you have instaled. 
 Samba tries to use charset 850 but falls back to ASCII in 
 case it is not available. Run testparm(1)
-to check the default on your system.
+ to check the default on your system.
 .TP
 \fBdos filemode (S)\fR
 The default behavior in Samba is to provide 
@@ -2594,7 +2594,7 @@ granularity on time resolution is two seconds. Setting this parameter
 for a share causes Samba to round the reported time down to the 
 nearest two second boundary when a query call that requires one second 
 resolution is made to \fBsmbd(8)\fR
-.
+
 
 This option is mainly used as a compatibility option for Visual 
 C++ when used against Samba shares. If oplocks are enabled on a 
@@ -2615,7 +2615,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 smbdwill change the file 
+on behalf of is not the file owner. Setting this option to   true allows DOS semantics and smbd will change the file 
 timestamp as DOS requires.
 
 Default: \fBdos filetimes = no\fR
@@ -2629,9 +2629,9 @@ Samba see the file ENCRYPTION.txt in the Samba documentation
 directory \fIdocs/\fR shipped with the source code.
 
 In order for encrypted passwords to work correctly
-\fBsmbd(8)\fRmust either 
+\fBsmbd(8)\fR must either 
 have access to a local \fIsmbpasswd(5)
-\fRprogram for information on how to set up 
+\fR program for information on how to set up 
 and maintain this file), or set the security = [server|domain|ads] parameter which 
 causes \fBsmbd\fR to authenticate against another 
 server.
@@ -2720,7 +2720,7 @@ that it is the only one accessing the file and it will aggressively
 cache file data. With some oplock types the client may even cache 
 file open/close operations. This can give enormous performance benefits.
 
-When you set \fBfake oplocks = yes\fR, \fBsmbd(8)\fRwill
+When you set \fBfake oplocks = yes\fR, \fBsmbd(8)\fR will
 always grant oplock requests no matter how many clients are using 
 the file.
 
@@ -2739,7 +2739,7 @@ Default: \fBfake oplocks = no\fR
 .TP
 \fBfollow symlinks (S)\fR
 This parameter allows the Samba administrator 
-to stop \fBsmbd(8)\fR
+to stop \fBsmbd(8)\fR 
 from following symbolic links in a particular share. Setting this 
 parameter to no prevents any file or directory 
 that is a symbolic link from being followed (the user will get an 
@@ -2921,7 +2921,7 @@ Example: \fBforce user = auser\fR
 This parameter allows the administrator to 
 configure the string that specifies the type of filesystem a share 
 is using that is reported by \fBsmbd(8)
-\fRwhen a client queries the filesystem type
+\fR when a client queries the filesystem type
 for a share. The default type is NTFS for 
 compatibility with Windows NT but this can be changed to other 
 strings such as Samba or FAT
@@ -3022,7 +3022,7 @@ Example: \fBhide files =
 
 The above example is based on files that the Macintosh 
 SMB client (DAVE) available from  
-Thursbycreates for internal use, and also still hides 
+Thursby <URL:http://www.thursby.com> creates for internal use, and also still hides 
 all files beginning with a dot.
 .TP
 \fBhide local users(G)\fR
@@ -3046,7 +3046,7 @@ Default: \fBhide unwriteable = no\fR
 .TP
 \fBhomedir map (G)\fR
 If\fInis homedir
-\fR is true, and \fBsmbd(8)\fRis also acting 
+\fR is true, 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 
@@ -3078,7 +3078,7 @@ to browse Dfs trees hosted on the server.
 
 See also the \fI  msdfs root\fR share  level  parameter.  For
 more  information  on  setting  up a Dfs tree on Samba,
-refer to msdfs_setup.html.
+refer to msdfs_setup.html
 
 Default: \fBhost msdfs = no\fR
 .TP
@@ -3141,7 +3141,7 @@ deny access from one particular host
 Note that access still requires suitable user-level passwords.
 
 See \fBtestparm(1)\fR
-for a way of testing your host access to see if it does 
+ for a way of testing your host access to see if it does 
 what you expect.
 
 Default: \fBnone (i.e., all hosts permitted access)
@@ -3345,7 +3345,7 @@ allows the use of them to be turned on or off.
 Kernel oplocks support allows Samba \fIoplocks
 \fR to be broken whenever a local UNIX process or NFS operation 
 accesses a file that \fBsmbd(8)\fR
-has oplocked. This allows complete data consistency between 
+ has oplocked. This allows complete data consistency between 
 SMB/CIFS, NFS and local file access (and is a \fBvery\fR 
 cool feature :-).
 
@@ -3360,7 +3360,7 @@ and \fIlevel2 oplocks
 Default: \fBkernel oplocks = yes\fR
 .TP
 \fBlanman auth (G)\fR
-This parameter determines whether or not smbdwill
+This parameter determines whether or not smbd will
 attempt to authenticate users using the LANMAN password hash.
 If disabled, only clients which support NT password hashes (e.g. Windows 
 NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS 
@@ -3385,7 +3385,7 @@ Name (DN) name used by Samba to contact the ldap server when retreiving
 user account information. The \fIldap
 admin dn\fR is used in conjunction with the admin dn password
 stored in the \fIprivate/secrets.tdb\fR file.  See the
-\fBsmbpasswd(8)\fRman
+\fBsmbpasswd(8)\fR man
 page for more information on how to accmplish this.
 
 Default : \fBnone\fR
@@ -3396,7 +3396,7 @@ The default is to match the login name with the uid
 attribute for all entries matching the sambaAccount  
 objectclass.  Note that this filter should only return one entry.
 
-Default : \fBldap filter = (%u)(objectclass=sambaAccount))\fR
+Default : \fBldap filter = (&(uid=%u)(objectclass=sambaAccount))\fR
 .TP
 \fBldap ssl (G)\fR
 This option is used to define whether or not Samba should
@@ -3467,7 +3467,7 @@ parameters.
 Default: \fBlevel2 oplocks = yes\fR
 .TP
 \fBlm announce (G)\fR
-This parameter determines if   \fBnmbd(8)\fRwill produce Lanman announce 
+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
@@ -3512,7 +3512,7 @@ more details.
 Default: \fBload printers = yes\fR
 .TP
 \fBlocal master (G)\fR
-This option allows \fB  nmbd(8)\fRto try and become a local master browser 
+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 and will also lose in all browsing elections. By
 default this value is set to true. Setting this value to true doesn't
@@ -3898,14 +3898,14 @@ Example 2: \fBlprm command = /usr/bin/cancel %p-%j
 \fBmachine password timeout (G)\fR
 If a Samba server is a member of a Windows 
 NT Domain (see the security = domain) 
-parameter) then periodically a running   smbd(8)process will try and change the MACHINE ACCOUNT 
+parameter) then periodically a running   smbd(8) process will try and change the MACHINE ACCOUNT 
 PASSWORD stored in the TDB called \fIprivate/secrets.tdb
 \fR.  This parameter specifies how often this password 
 will be changed, in seconds. The default is one week (expressed in 
 seconds), the same as a Windows NT Domain member server.
 
 See also \fBsmbpasswd(8)
-\fR, and the   security = domain) parameter.
+\fR and the   security = domain) parameter.
 
 Default: \fBmachine password timeout = 604800\fR
 .TP
@@ -4053,7 +4053,7 @@ Example: \fBmangling method = hash2\fR
 .TP
 \fBmangled stack (G)\fR
 This parameter controls the number of mangled names 
-that should be cached in the Samba server   smbd(8).
+that should be cached in the Samba server   smbd(8)
 
 This stack is a list of recently mangled base names 
 (extensions are only maintained if they are longer than 3 characters 
@@ -4121,7 +4121,7 @@ This parameter is only useful in   security modes other than \fIsecurity = share
 and domain.
 
 This parameter can take three different values, which tell
-smbd(8)what to do with user 
+smbd(8) what to do with user 
 login requests that don't match a valid UNIX user in some way.
 
 The three settings are :
@@ -4225,7 +4225,7 @@ Default: \fBmax mux = 50\fR
 .TP
 \fBmax open files (G)\fR
 This parameter limits the maximum number of 
-open files that one smbd(8)file 
+open files that one smbd(8) file 
 serving process may have open for a client at any one time. The 
 default for this parameter is set very high (10,000) as Samba uses 
 only one bit per unopened file.
@@ -4239,7 +4239,7 @@ Default: \fBmax open files = 10000\fR
 \fBmax print jobs (S)\fR
 This parameter limits the maximum number of 
 jobs allowable in a Samba printer queue at any given moment.
-If this number is exceeded, \fB  smbd(8)\fRwill remote "Out of Space" to the client.
+If this number is exceeded, \fB  smbd(8)\fR will remote "Out of Space" to the client.
 See all \fItotal
 print jobs\fR.
 
@@ -4292,7 +4292,7 @@ processes concurrently running on a system and is intended
 as a stopgap to prevent degrading service to clients in the event
 that the server has insufficient resources to handle more than this
 number of connections.  Remember that under normal operating
-conditions, each user will have an smbdassociated with him or her
+conditions, each user will have an smbd associated with him or her
 to handle connections to all shares from a given host.
 
 Default: \fBmax smbd processes = 0\fR   ## no limit
@@ -4310,7 +4310,7 @@ Default: \fBmax ttl = 259200\fR
 .TP
 \fBmax wins ttl (G)\fR
 This option tells nmbd(8)
-when acting as a WINS server (  \fIwins support = yes\fR) what the maximum
+ when acting as a WINS server (  \fIwins support = yes\fR) what the maximum
 \&'time to live' of NetBIOS names that \fBnmbd\fR 
 will grant will be (in seconds). You should never need to change this
 parameter.  The default is 6 days (518400 seconds).
@@ -4457,7 +4457,7 @@ Dfs links are specified  in  the share directory by symbolic
 links of the form \fImsdfs:serverA\\shareA,serverB\\shareB
 \fR and so on.  For more information on setting up a Dfs tree 
 on Samba,  refer to msdfs_setup.html
-.
+
 
 See also \fIhost msdfs
 \fR
@@ -4486,7 +4486,7 @@ cause names to be resolved as follows :
 \(bu
 lmhosts : Lookup an IP 
 address in the Samba lmhosts file. If the line in lmhosts has 
-no name type attached to the NetBIOS name (see the lmhosts(5)for details) then
+no name type attached to the NetBIOS name (see the lmhosts(5) for details) then
 any name type matches for lookup.
 .TP 0.2i
 \(bu
@@ -4523,7 +4523,7 @@ first, followed by a broadcast attempt, followed by a normal
 system hostname lookup.
 .TP
 \fBnetbios aliases (G)\fR
-This is a list of NetBIOS names that nmbd(8)will advertise as additional 
+This is a list of NetBIOS names that nmbd(8) will advertise as additional 
 names by which the Samba server is known. This allows one machine 
 to appear in browse lists under multiple names. If a machine is 
 acting as a browse server or logon server none 
@@ -4605,7 +4605,7 @@ Example: \fBnon unix account range = 10000-20000\fR
 .TP
 \fBnt acl support (S)\fR
 This boolean parameter controls whether 
-smbd(8)will attempt to map 
+smbd(8) will attempt to map 
 UNIX permissions into Windows NT access control lists.
 This parameter was formally a global parameter in releases
 prior to 2.2.2.
@@ -4614,7 +4614,7 @@ Default: \fBnt acl support = yes\fR
 .TP
 \fBnt pipe support (G)\fR
 This boolean parameter controls whether 
-smbd(8)will allow Windows NT 
+smbd(8) will allow Windows NT 
 clients to connect to the NT SMB specific IPC$ 
 pipes. This is a developer debugging option and can be left
 alone.
@@ -4622,7 +4622,7 @@ alone.
 Default: \fBnt pipe support = yes\fR
 .TP
 \fBnt status support (G)\fR
-This boolean parameter controls whether smbd(8)will negotiate NT specific status
+This boolean parameter controls whether smbd(8) will negotiate NT specific status
 support with Windows NT/2k/XP clients. This is a developer
 debugging option and should be left alone.
 If this option is set to no then Samba offers
@@ -4637,7 +4637,7 @@ Default: \fBnt status support = yes\fR
 Allow or disallow client access to accounts 
 that have null passwords. 
 
-See also smbpasswd (5).
+See also smbpasswd (5)
 
 Default: \fBnull passwords = no\fR
 .TP
@@ -4694,11 +4694,11 @@ Default: \fBoplock break wait time = 0\fR
 .TP
 \fBoplock contention limit (S)\fR
 This is a \fBvery\fR advanced 
-smbd(8)tuning option to 
+smbd(8) tuning option to 
 improve the efficiency of the granting of oplocks under multiple 
 client contention for the same file.
 
-In brief it specifies a number, which causes smbdnot to 
+In brief it specifies a number, which causes smbd not to 
 grant an oplock even when requested if the approximate number of 
 clients contending for an oplock on the same file goes over this 
 limit. This causes \fBsmbd\fR to behave in a similar 
@@ -4733,7 +4733,7 @@ oplocks\fR and \fI  level2 oplocks\fR parameters.
 Default: \fBoplocks = yes\fR
 .TP
 \fBntlm auth (G)\fR
-This parameter determines whether or not smbdwill
+This parameter determines whether or not smbd will
 attempt to authenticate users using the NTLM password hash.
 If disabled, only the lanman password hashes will be used. 
 
@@ -4744,7 +4744,7 @@ Default : \fBntlm auth = yes\fR
 \fBos level (G)\fR
 This integer value controls what level Samba 
 advertises itself as for browse elections. The value of this 
-parameter determines whether nmbd(8)
+parameter determines whether nmbd(8) 
 has a chance of becoming a local master browser for the \fI  WORKGROUP\fR in the local broadcast area.
 
 \fBNote :\fRBy default, Samba will win 
@@ -4773,9 +4773,9 @@ LaserJet 5L\fR.
 
 The need for the file is due to the printer driver namespace 
 problem described in the Samba 
-Printing HOWTO.  For more details on OS/2 clients, please 
+Printing HOWTO  For more details on OS/2 clients, please 
 refer to the OS2-Client-HOWTO
-containing in the Samba documentation.
+ containing in the Samba documentation.
 
 Default: \fBos2 driver map = <empty string>
 \fR
@@ -4794,7 +4794,7 @@ Default: \fBpam password change = no\fR
 .TP
 \fBpanic action (G)\fR
 This is a Samba developer option that allows a 
-system command to be called when either   smbd(8)
+system command to be called when either   smbd(8) 
 crashes. This is usually used to draw attention to the fact that 
 a problem occurred.
 
@@ -4808,7 +4808,7 @@ users with a bad passowrd. When this option is enabled, samba will not
 use a broken NT 4.x server as password server, but instead complain
 to the logs and exit.
 
-Default: \fBparanoid server security = no\fR
+Default: \fBparanoid server security = yes\fR
 .TP
 \fBpassdb backend (G)\fR
 This option allows the administrator to chose which backends to retrieve and store passwords with. This allows (for example) both 
@@ -4893,9 +4893,9 @@ Example: \fBpassdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_
 .TP
 \fBpasswd chat (G)\fR
 This string controls the \fB"chat"\fR 
-conversation that takes places between smbdand the local password changing
+conversation that takes places between smbd and the local password changing
 program to change the user's password. The string describes a 
-sequence of response-receive pairs that   smbd(8)uses to determine what to send to the 
+sequence of response-receive pairs that   smbd(8) uses to determine what to send to the 
 \fIpasswd program\fR
 and what to expect back. If the expected output is not 
 received then the password is not changed.
@@ -4944,7 +4944,7 @@ changed*"\fR
 This boolean specifies if the passwd chat script 
 parameter is run in \fBdebug\fR mode. In this mode the 
 strings passed to and received from the passwd chat are printed 
-in the smbd(8)log with a 
+in the smbd(8) log with a 
 \fIdebug level\fR 
 of 100. This is a dangerous option as it will allow plaintext passwords 
 to be seen in the \fBsmbd\fR log. It is available to help 
@@ -4977,7 +4977,7 @@ it.
 password sync\fR parameter is set to true
 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 
+ file is changed. If this UNIX password change fails, then 
 \fBsmbd\fR will fail to change the SMB password also 
 (this is by design).
 
@@ -5221,7 +5221,7 @@ return code from \fIpreexec
 Default: \fBpreexec close = no\fR
 .TP
 \fBpreferred master (G)\fR
-This boolean parameter controls if nmbd(8)is a preferred master browser 
+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 
@@ -5432,7 +5432,7 @@ Example: \fBprinter admin = admin, @staff\fR
 parameter and will be removed in the next major release
 following version 2.2.  Please see the instructions in
 the Samba 2.2. Printing
-HOWTOfor more information
+HOWTO for more information
 on the new method of loading printer drivers onto a Samba server.
 
 This option allows you to control the string 
@@ -5458,7 +5458,7 @@ Example: \fBprinter driver = HP LaserJet 4L\fR
 parameter and will be removed in the next major release
 following version 2.2.  Please see the instructions in
 the Samba 2.2. Printing
-HOWTOfor more information
+HOWTO for more information
 on the new method of loading printer drivers onto a Samba server.
 
 This parameter tells Samba where the printer driver 
@@ -5486,7 +5486,7 @@ Example: \fBprinter driver file =
 parameter and will be removed in the next major release
 following version 2.2.  Please see the instructions in
 the Samba 2.2. Printing
-HOWTOfor more information
+HOWTO for more information
 on the new method of loading printer drivers onto a Samba server.
 
 This parameter tells clients of a particular printer 
@@ -5541,7 +5541,7 @@ QNX, SOFTQ,
 and CUPS.
 
 To see what the defaults are for the other print 
-commands when using the various options use the testparm(1)program.
+commands when using the various options use the testparm(1) program.
 
 This option can be set on a per printer basis
 
@@ -5613,7 +5613,7 @@ Example: \fBqueuepause command = enable %p
 \fR
 .TP
 \fBread bmpx (G)\fR
-This boolean parameter controls whether smbd(8)will support the "Read 
+This boolean parameter controls whether smbd(8) will support the "Read 
 Block Multiplex" SMB. This is now rarely used and defaults to 
 no. You should never need to set this 
 parameter.
@@ -5688,7 +5688,7 @@ Default: \fBrealm = \fR
 Example: \fBrealm = mysambabox.mycompany.com\fR
 .TP
 \fBremote announce (G)\fR
-This option allows you to setup nmbd(8)to periodically announce itself 
+This option allows you to setup nmbd(8) to periodically announce itself 
 to arbitrary IP addresses with an arbitrary workgroup name.
 
 This is useful if you want your Samba server to appear 
@@ -5718,7 +5718,7 @@ Default: \fBremote announce = <empty string>
 \fR
 .TP
 \fBremote browse sync (G)\fR
-This option allows you to setup nmbd(8)to periodically request 
+This option allows you to setup nmbd(8) to periodically request 
 synchronization of browse lists with the master browser of a Samba 
 server that is on a remote segment. This option will allow you to 
 gain browse lists for multiple workgroups across routed networks. This 
@@ -5843,7 +5843,7 @@ Samba and is one of the most important settings in the \fI  smb.conf\fR file.
 
 The option sets the "security mode bit" in replies to 
 protocol negotiations with smbd(8)
-to turn share level security on or off. Clients decide 
+ to turn share level security on or off. Clients decide 
 based on this bit whether (and how) to transfer user and password 
 information to the server.
 
@@ -6008,7 +6008,7 @@ parameter.
 \fBSECURITY = DOMAIN
 \fR
 
-This mode will only work correctly if smbpasswd(8)has been used to add this 
+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 
 mode Samba will try to validate the username/password by passing
@@ -6176,7 +6176,7 @@ Default :\fBshow add printer wizard = yes\fR
 \fBshutdown script (G)\fR
 \fBThis parameter only exists in the HEAD cvs branch\fR
 This a full path name to a script called by
-\fBsmbd(8)\fRthat
+\fBsmbd(8)\fR that
 should start a shutdown procedure.
 
 This command will be run as the user connected to the
@@ -6267,7 +6267,7 @@ You may find that on some systems Samba will say
 "Unknown socket option" when you supply an option. This means you 
 either incorrectly  typed it or you need to add an include file 
 to includes.h for your OS.  If the latter is the case please 
-send the patch to   samba@samba.org.
+send the patch to   samba@samba.org <URL:mailto:samba@samba.org>.
 
 Any of the supported socket options may be combined 
 in any way you like, as long as your OS allows it.
@@ -6365,7 +6365,7 @@ This variable controls controls whether samba will try to use Simple and Protect
 Default:  \fBuse spnego = yes\fR
 .TP
 \fBstat cache (G)\fR
-This parameter determines if smbd(8)will use a cache in order to 
+This parameter determines if smbd(8) will use a cache in order to 
 speed up case insensitive name mappings. You should never need 
 to change this parameter.
 
@@ -6431,7 +6431,7 @@ the process to be suspended until the kernel has ensured that
 all outstanding data in kernel disk buffers has been safely stored 
 onto stable storage. This is very slow and should only be done 
 rarely. Setting this parameter to no (the 
-default) means that smbdignores the Windows applications requests for
+default) means that smbd ignores the Windows applications requests for
 a sync call. There is only a possibility of losing data if the
 operating system itself that Samba is running on crashes, so there is
 little danger in this default setting. In addition, this fixes many
@@ -6490,7 +6490,7 @@ Default: \fBsyslog only = no\fR
 .TP
 \fBtemplate homedir (G)\fR
 When filling out the user information for a Windows NT 
-user, the winbindd(8)daemon 
+user, the winbindd(8) daemon 
 uses this parameter to fill in the home directory for that user.  
 If the string \fI%D\fR is present it is substituted 
 with the user's Windows NT domain name.  If the string \fI%U
@@ -6501,7 +6501,7 @@ Default: \fBtemplate homedir = /home/%D/%U\fR
 .TP
 \fBtemplate shell (G)\fR
 When filling out the user information for a Windows NT 
-user, the winbindd(8)daemon 
+user, the winbindd(8) daemon 
 uses this parameter to fill in the login shell for that user.
 
 Default: \fBtemplate shell = /bin/false\fR
@@ -6518,7 +6518,7 @@ Example: \fBtime offset = 60\fR
 .TP
 \fBtime server (G)\fR
 This parameter determines if     
-nmbd(8)advertises itself as a time server to Windows 
+nmbd(8) advertises itself as a time server to Windows 
 clients.
 
 Default: \fBtime server = no\fR
@@ -6530,7 +6530,7 @@ Synonym for \fI  debug timestamp\fR.
 This parameter accepts an integer value which defines
 a limit on the maximum number of print jobs that will be accepted 
 system wide at any given time.  If a print job is submitted
-by a client which will exceed this number, then smbdwill return an 
+by a client which will exceed this number, then smbd will return an 
 error indicating that no space is available on the server.  The 
 default value of 0 means that no such limit exists.  This parameter
 can be used to prevent a server from exceeding its capacity and is
@@ -7016,7 +7016,7 @@ Default: \fBwide links = yes\fR
 .TP
 \fBwinbind cache time (G)\fR
 This parameter specifies the number of seconds the
-winbindd(8)daemon will cache 
+winbindd(8) daemon will cache 
 user and group information before querying a Windows NT server 
 again.
 
@@ -7024,7 +7024,7 @@ Default: \fBwinbind cache type = 15\fR
 .TP
 \fBwinbind enum users (G)\fR
 On large installations using
-winbindd(8)it may be
+winbindd(8) it may be
 necessary to suppress the enumeration of users through the
 \fB setpwent()\fR,
 \fBgetpwent()\fR and
@@ -7043,7 +7043,7 @@ Default: \fBwinbind enum users = yes \fR
 .TP
 \fBwinbind enum groups (G)\fR
 On large installations using
-winbindd(8)it may be
+winbindd(8) it may be
 necessary to suppress the enumeration of groups through the
 \fB setgrent()\fR,
 \fBgetgrent()\fR and
@@ -7059,7 +7059,7 @@ Default: \fBwinbind enum groups = yes \fR
 .TP
 \fBwinbind gid (G)\fR
 The winbind gid parameter specifies the range of group 
-ids that are allocated by the   winbindd(8)daemon.  This range of group ids should have no 
+ids that are allocated by the   winbindd(8) daemon.  This range of group ids should have no 
 existing local or NIS groups within it as strange conflicts can 
 occur otherwise.
 
@@ -7085,7 +7085,7 @@ Example: \fBwinbind separator = +\fR
 .TP
 \fBwinbind uid (G)\fR
 The winbind gid parameter specifies the range of group 
-ids that are allocated by the   winbindd(8)daemon.  This range of ids should have no 
+ids that are allocated by the   winbindd(8) daemon.  This range of ids should have no 
 existing local or NIS users within it as strange conflicts can 
 occur otherwise.
 
@@ -7155,7 +7155,7 @@ program \fBnsupdate\fR is provided in the examples
 directory of the Samba source code. 
 .TP
 \fBwins proxy (G)\fR
-This is a boolean that controls if nmbd(8)will respond to broadcast name 
+This is a boolean that controls if nmbd(8) will respond to broadcast name 
 queries on behalf of  other hosts. You may need to set this 
 to yes for some older clients.
 
@@ -7163,7 +7163,7 @@ Default: \fBwins proxy = no\fR
 .TP
 \fBwins server (G)\fR
 This specifies the IP address (or DNS name: IP 
-address for preference) of the WINS server that   nmbd(8)should register with. If you have a WINS server on 
+address for preference) of the WINS server that   nmbd(8) should register with. If you have a WINS server on 
 your network then you should set this to the WINS server's IP.
 
 You should point this at your WINS server if you have a
@@ -7182,7 +7182,7 @@ Example: \fBwins server = 192.9.200.1\fR
 .TP
 \fBwins support (G)\fR
 This boolean controls if the    
-nmbd(8)process in Samba will act as a WINS server. You should 
+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 
 you wish a particular \fBnmbd\fR to be your WINS server. 
 Note that you should \fBNEVER\fR set this to true
@@ -7290,7 +7290,7 @@ problem - but be aware of the possibility.
 .PP
 On a similar note, many clients - especially DOS clients - 
 limit service names to eight characters. smbd(8)
-has no such limitation, but attempts to connect from such 
+ has no such limitation, but attempts to connect from such 
 clients will fail if they truncate the service names.  For this reason 
 you should probably keep your service names down to eight characters 
 in length.
@@ -7306,14 +7306,14 @@ This man page is correct for version 2.2 of
 the Samba suite.
 .SH "SEE ALSO"
 .PP
-samba(7),
-\fBsmbpasswd(8)\fR,
-\fBswat(8)\fR,
-\fBsmbd(8)\fR, 
-\fBnmbd(8)\fR, 
-\fBsmbclient(1)\fR, 
-\fBnmblookup(1)\fR,
-\fBtestparm(1)\fR, 
+samba(7)
+\fBsmbpasswd(8)\fR
+\fBswat(8)\fR
+\fBsmbd(8)\fR 
+\fBnmbd(8)\fR 
+\fBsmbclient(1)\fR 
+\fBnmblookup(1)\fR
+\fBtestparm(1)\fR 
 \fBtestprns(1)\fR
 .SH "AUTHOR"
 .PP
@@ -7325,6 +7325,6 @@ to the way the Linux kernel is developed.
 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/) and updated for the Samba 2.0 
+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