1 files changed, 32 insertions, 16 deletions
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index eeba1c5632f..26d2eaec1de 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -1470,7 +1470,8 @@ 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 
 \fBON DEMAND\fR when a user accesses the Samba server.
 
-In order to use this option, smbdmust be set to \fIsecurity=server\fR or \fI security=domain\fR and \fIadd user script\fR
+In order to use this option, smbd
+must be set to \fIsecurity=server\fR or \fI security=domain\fR and \fIadd user script\fR
 must be set to a full pathname for a script that will create a UNIX 
 user given one argument of \fI%u\fR, which expands into 
 the UNIX user name to create.
@@ -1536,7 +1537,8 @@ Default: \fBallow trusted domains = yes\fR
 .TP
 \fBannounce as (G)\fR
 This specifies what type of server 
-\fBnmbd\fRwill announce itself as, to a network neighborhood browse 
+\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"), 
 "NT Workstation", "Win95" or "WfW" meaning Windows NT Server, 
@@ -1595,7 +1597,8 @@ send packets that arrive through any interfaces not listed in the
 does defeat this simple check, however so it must not be used
 seriously as a security feature for \fBnmbd\fR.
 
-For file service it causes smbd(8)to bind only to the interface list given in the  interfaces parameter. This restricts the networks that 
+For file service it causes smbd(8)
+to bind only to the interface list given in the  interfaces parameter. This restricts the networks that 
 \fBsmbd\fR will serve to packets coming in those 
 interfaces. Note that you should not use this parameter for machines 
 that are serving PPP or other intermittent or non-broadcast network 
@@ -1603,7 +1606,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)\fRand \fBswat(8)\fRmay 
+to the \fIinterfaces\fR parameter list \fBsmbpasswd(8)\fR
+and \fBswat(8)\fRmay 
 not work as expected due to the reasons covered below.
 
 To change a users SMB password, the \fBsmbpasswd\fR
@@ -1757,7 +1761,8 @@ the code page. The default for USA MS-DOS, Windows 95, and
 Windows NT releases is code page 437. The default for western 
 European releases of the above operating systems is code page 850.
 
-This parameter tells smbd(8)which of the \fIcodepage.XXX
+This parameter tells smbd(8)
+which of the \fIcodepage.XXX
 \fRfiles to dynamically load on startup. These files,
 described more fully in the manual page  \fBmake_smbcodepage(1)\fR, tell \fB smbd\fR how to map lower to upper case characters to provide 
 the case insensitivity of filenames that Windows clients expect.
@@ -2374,7 +2379,8 @@ directory mask>\fR
 Example: \fBdirectory security mask = 0777\fR
 .TP
 \fBdns proxy (G)\fR
-Specifies that nmbd(8)when acting as a WINS server and finding that a NetBIOS name has not 
+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 
 the name-querying client.
@@ -2448,7 +2454,8 @@ 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)\fRfor a complete copy of the browse list for the whole wide area 
+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 
 for their broadcast-isolated subnet.
@@ -2653,7 +2660,8 @@ Default: \fBfake oplocks = no\fR
 .TP
 \fBfollow symlinks (S)\fR
 This parameter allows the Samba administrator 
-to stop \fBsmbd(8)\fRfrom following symbolic links in a particular share. Setting this 
+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 
 error). This option is very useful to stop users from adding a 
@@ -4064,7 +4072,8 @@ Example: \fBmax protocol = LANMAN1\fR
 .TP
 \fBmax smbd processes (G)\fR
 This parameter limits the maximum number of 
-\fBsmbd(8)\fRprocesses concurrently running on a system and is intended
+\fBsmbd(8)\fR
+processes concurrently running on a system and is intended
 as a stop gap 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
@@ -4076,7 +4085,8 @@ Default: \fBmax smbd processes = 0\fR ## no limit
 Example: \fBmax smbd processes = 1000\fR
 .TP
 \fBmax ttl (G)\fR
-This option tells nmbd(8)what the default 'time to live' of NetBIOS names should be (in seconds) 
+This option tells nmbd(8)
+what the default 'time to live' of NetBIOS names should be (in seconds) 
 when \fBnmbd\fR is requesting a name using either a
 broadcast packet or from a WINS server. You should never need to
 change this parameter. The default is 3 days.
@@ -4223,7 +4233,8 @@ Example : \fBmin protocol = NT1\fR # disable DOS
 clients
 .TP
 \fBmin wins ttl (G)\fR
-This option tells nmbd(8)when acting as a WINS server (\fI wins support = yes\fR) what the minimum 'time to live' 
+This option tells nmbd(8)
+when acting as a WINS server (\fI wins support = yes\fR) what the minimum '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 hours (21600 seconds).
@@ -4491,7 +4502,8 @@ Default: \fBoplocks = 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)has a chance of becoming a local master browser for the \fI WORKGROUP\fR in the local broadcast area.
+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 
 a local master browsing election over all Microsoft operating 
@@ -4536,7 +4548,8 @@ 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)crashes. This is usually used to draw attention to the fact that 
+system command to be called when either  smbd(8)
+crashes. This is usually used to draw attention to the fact that 
 a problem occurred.
 
 Default: \fBpanic action = <empty string>\fR
@@ -4793,7 +4806,8 @@ Default: \fBnone\fR
 Example: \fBpath = /home/fred\fR
 .TP
 \fBposix locking (S)\fR
-The \fBsmbd(8)\fRdaemon maintains an database of file locks obtained by SMB clients.
+The \fBsmbd(8)\fR
+daemon maintains an database of file locks obtained by SMB clients.
 The default behavior is to map this internal database to POSIX
 locks. This means that file locks obtained by SMB clients are 
 consistent with those seen by POSIX compliant applications accessing 
@@ -6195,7 +6209,8 @@ 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.
+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
@@ -7015,7 +7030,8 @@ samba(7),
 \fBsmbclient(1)\fR, 
 \fBnmblookup(1)\fR,
 \fBtestparm(1)\fR, 
-\fBtestprns(1)\fR.SH "AUTHOR"
+\fBtestprns(1)\fR
+.SH "AUTHOR"
 .PP
 The original Samba software and related utilities 
 were created by Andrew Tridgell. Samba is now developed