I'm still working on this. More to come.

(This used to be commit cb2172541849c96c9156233da9b34e5e08801ae3)

19 files changed, 77 insertions, 53 deletions

diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 70a6090792..2051804504 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -98,7 +98,7 @@ Make queries to the external server using the machine account of the local serve
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 0b63e77ee2..dbf6593d91 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -84,7 +84,7 @@ The default path to this file is compiled into Samba as part of the build proces
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -97,7 +97,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 5cc590ae11..8dc68a366b 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -100,7 +100,7 @@ Do a unicast query to the specified address or host \fIunicast address\fR\&. Thi
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -113,7 +113,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1
index e234ad7fb8..e889634bf0 100644
--- a/docs/manpages/ntlm_auth.1
+++ b/docs/manpages/ntlm_auth.1
@@ -88,7 +88,7 @@ Request NT key
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -101,7 +101,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index 75a655a7e7..13113cd3bb 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -282,7 +282,7 @@ Print a summary of command line options\&.
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -295,7 +295,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index 0684d74197..fe8b6c2e39 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -61,7 +61,7 @@ There is no default for this parameter\&. If not supplied, it will be determined
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -74,7 +74,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 55fdc8be44..0ed82400aa 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -460,6 +460,10 @@ Here is a list of all global parameters\&. See the section of each parameter for
 
 .TP
 \(bu
+\fIafs username map\fR
+
+.TP
+\(bu
 \fIalgorithmic rid base\fR
 
 .TP
@@ -1104,10 +1108,6 @@ Here is a list of all global parameters\&. See the section of each parameter for
 
 .TP
 \(bu
-\fIstrip dot\fR
-
-.TP
-\(bu
 \fIsyslog\fR
 
 .TP
@@ -1267,6 +1267,10 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 
 .TP
 \(bu
+\fIafs share\fR
+
+.TP
+\(bu
 \fIallow hosts\fR
 
 .TP
@@ -1942,6 +1946,31 @@ Example: \fBadmin users = jason\fR
 
 
 .TP
+afs share (S)
+This parameter controls whether special AFS features are enabled for this share\&. If enabled, it assumes that the directory exported via the \fIpath\fR parameter is a local AFS import\&. The special AFS features include the attempt to hand-craft an AFS token if you enabled --with-fake-kaserver in configure\&.
+
+
+Default: \fBafs share = no\fR
+
+
+Example: \fBafs share = yes\fR
+
+
+.TP
+afs username map (G)
+If you are using the fake kaserver AFS feature, you might want to hand-craft the usernames you are creating tokens for\&. For example this is necessary if you have users from several domain in your AFS Protection Database\&. One possible scheme to code users as DOMAIN+User as it is done by winbind with the + as a separator\&.
+
+
+The mapped user name must contain the cell name to log into, so without setting this parameter there will be no token\&.
+
+
+Default: \fBnone\fR
+
+
+Example: \fBafs username map = %u@afs.samba.org\fR
+
+
+.TP
 algorithmic rid base (G)
 This determines how Samba will use its algorithmic mapping from uids/gid to the RIDs needed to construct NT Security Identifiers\&.
 
@@ -2175,6 +2204,9 @@ This parameter determines whether or not \fBsmbclient\fR(8) will attempt to auth
 If enabled, only an NTLMv2 and LMv2 response (both much more secure than earlier versions) will be sent\&. Many servers (including NT4 < SP4, Win9x and Samba 2\&.2) are not compatible with NTLMv2\&.
 
 
+Similarly, if enabled, NTLMv1, \fBclient lanman auth\fR and \fBclient plaintext auth\fR authentication will be disabled\&. This also disables share-level authentication\&.
+
+
 If disabled, an NTLM response (and possibly a LANMAN response) will be sent by the client, depending on the value of \fBclient lanman auth\fR\&.
 
 
@@ -3226,7 +3258,7 @@ Example: \fBhomedir map = amd.homedir\fR
 
 .TP
 host msdfs (G)
-This boolean parameter is only available if Samba has been configured and compiled with the \fB --with-msdfs\fR option\&. If set to \fByes\fR, Samba will act as a Dfs server, and allow Dfs-aware clients to browse Dfs trees hosted on the server\&.
+If set to \fByes\fR, Samba will act as a Dfs server, and allow Dfs-aware clients 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 ???\&.
@@ -3579,7 +3611,7 @@ This parameters specifies the suffix that is used when storing idmap mappings\&.
 Default: \fBnone\fR
 
 
-Example: \fBdc=samba,ou=Idmap\fR
+Example: \fBou=Idmap,dc=samba,dc=org\fR
 
 
 .TP
@@ -4584,7 +4616,7 @@ Example: \fBmsdfs proxy = \\\\otherserver\\someshare\fR
 
 .TP
 msdfs root (S)
-This boolean parameter is only available if Samba is configured and compiled with the \fB --with-msdfs\fR option\&. If set to \fByes\fR, Samba treats the share as a Dfs root and allows clients to browse the distributed file system tree rooted at the share directory\&. 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 ???\&.
+If set to \fByes\fR, Samba treats the share as a Dfs root and allows clients to browse the distributed file system tree rooted at the share directory\&. 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 ???\&.
 
 
 See also \fIhost msdfs\fR
@@ -6149,13 +6181,13 @@ Default: \fBstrict allocate = no\fR
 
 .TP
 strict locking (S)
-This is a boolean that controls the handling of file locking in the server\&. When this is set to \fByes\fR the server will check every read and write access for file locks, and deny access if locks exist\&. This can be slow on some systems\&.
+This is a boolean that controls the handling of file locking in the server\&. When this is set to \fByes\fR, the server will check every read and write access for file locks, and deny access if locks exist\&. This can be slow on some systems\&.
 
 
-When strict locking is \fBno\fR the server does file lock checks only when the client explicitly asks for them\&.
+When strict locking is disabled, the server performs file lock checks only when the client explicitly asks for them\&.
 
 
-Well-behaved clients always ask for lock checks when it is important, so in the vast majority of cases \fBstrict locking = no\fR is preferable\&.
+Well-behaved clients always ask for lock checks when it is important\&. So in the vast majority of cases, \fBstrict locking = no\fR is preferable\&.
 
 
 Default: \fBstrict locking = no\fR
@@ -6173,14 +6205,6 @@ Default: \fBstrict sync = no\fR
 
 
 .TP
-strip dot (G)
-This is a boolean that controls whether to strip trailing dots off UNIX filenames\&. This helps with some CDROMs that have filenames ending in a single dot\&.
-
-
-Default: \fBstrip dot = no\fR
-
-
-.TP
 sync always (S)
 This is a boolean parameter that controls whether writes will always be written to stable storage before the write call returns\&. If this is \fBno\fR 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 \fByes\fR 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 \fByes\fR in order for this parameter to have any affect\&.
 
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index cb9fcfb884..006679962c 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -23,7 +23,7 @@ smbcacls \- Set or get ACLs on an NT file or directory names
 .SH "SYNOPSIS"
 
 .nf
-\fBsmbcacls\fR {//server/share} {filename} [-D acls] [-M acls] [-A acls] [-S acls] [-C name] [-G name] [-n] [-t] [-U username] [-h] [-d]
+\fBsmbcacls\fR {//server/share} {filename} [-D acls] [-M acls] [-a acls] [-S acls] [-C name] [-G name] [-n] [-t] [-U username] [-h] [-d]
         
 .fi
 
@@ -41,7 +41,7 @@ The \fBsmbcacls\fR program manipulates NT Access Control Lists (ACLs) on SMB fil
 The following options are available to the \fBsmbcacls\fR program\&. The format of ACLs is described in the section ACL FORMAT
 
 .TP
--A acls
+-a acls
 Add the ACLs specified to the ACL list\&. Existing access control entries are unchanged\&.
 
 
@@ -98,7 +98,7 @@ Print a summary of command line options\&.
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -111,7 +111,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 8de0c58a6d..e14a2770a7 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -157,7 +157,7 @@ This option changes the transmit/send buffer size when getting or putting a file
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -170,7 +170,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1
index e270fe3b4a..5a3510810a 100644
--- a/docs/manpages/smbcquotas.1
+++ b/docs/manpages/smbcquotas.1
@@ -83,7 +83,7 @@ Print a summary of command line options\&.
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -96,7 +96,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
@@ -195,5 +195,5 @@ This man page is correct for version 3\&.0 of the Samba suite\&.
 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
-\fBsmbcacls\fR was written by Stefan Metzmacher\&.
+\fBsmbcquotas\fR was written by Stefan Metzmacher\&.
 
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 07b563af5c..1c2c75bf4d 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -71,7 +71,7 @@ If this parameter is specified it causes the server to run "interactively", not
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -84,7 +84,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 3b9e507246..47903ed104 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -62,7 +62,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 21b05a2429..44f0bae232 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -49,7 +49,7 @@ gives brief output\&.
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -62,7 +62,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1
index 84c2399c77..a76c679c21 100644
--- a/docs/manpages/smbtree.1
+++ b/docs/manpages/smbtree.1
@@ -53,7 +53,7 @@ Only print a list of all the domains and servers responding on broadcast or know
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -66,7 +66,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 26e5376bf6..99e8de0379 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -54,7 +54,7 @@ This option disables authentication and puts \fBswat\fR in demo mode\&. In that
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -67,7 +67,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 4a6d788f79..4207c2fe9a 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -58,7 +58,7 @@ Print a summary of command line options\&.
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1
index 3400c6b570..20566ee143 100644
--- a/docs/manpages/vfstest.1
+++ b/docs/manpages/vfstest.1
@@ -53,7 +53,7 @@ File name for log/debug files\&. The extension \fB'\&.client'\fR will be appende
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -66,7 +66,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 6c5ca93e19..f740448b58 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -167,7 +167,7 @@ Convert a SID to a UNIX group id\&. If the SID does not correspond to a UNIX gro
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 14621e1356..71e014cd4d 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -84,7 +84,7 @@ If specified, this parameter causes \fBwinbindd\fR to log to standard output rat
 
 .TP
 -V
-Prints the version number for \fBsmbd\fR\&.
+Prints the program version number\&.
 
 
 .TP
@@ -97,7 +97,7 @@ The file specified contains the configuration details required by the server\&.
 \fIdebuglevel\fR is an integer from 0 to 10\&. The default value if this parameter is not specified is zero\&.
 
 
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day to day running - it generates a small amount of information about operations carried out\&.
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day-to-day running - it generates a small amount of information about operations carried out\&.
 
 
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.