sync with SAMBA_2_2

3 files changed, 8 insertions, 7 deletions

diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 0f641ff15e5..9fe350570ff 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -782,8 +782,9 @@ NAME="AEN235"
 	steps fail, then the connection request is rejected.  However, if one of the 
 	steps succeeds, then the following steps are not checked.</P
 ><P
->If the service is marked "guest only = yes" then
-	steps 1 to 5 are skipped.</P
+>If the service is marked "guest only = yes" and the
+	server is running with share-level security ("security = share")
+	then steps 1 to 5 are skipped.</P
 ><P
 ></P
 ><OL
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 96448bc6b1a..4c770f9eb21 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -673,12 +673,12 @@ CLASS="COMMAND"
 >-W WORKGROUP</DT
 ><DD
 ><P
->Override the default workgroup specified in the 
-		workgroup parameter of the <TT
+>Override the default workgroup (domain) specified
+		in the workgroup parameter of the <TT
 CLASS="FILENAME"
 >smb.conf</TT
-> file 
-		for this connection. This may be needed to connect to some 
+>
+		file for this connection. This may be needed to connect to some
 		servers. </P
 ></DD
 ><DT
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index b7263ebf83d..9d620f1397f 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -35,7 +35,7 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->smbumount</B
+>smbmount</B
 >  {service} {mount-point} [-o options]</P
 ></DIV
 ><DIV