merge from 2.2 and regenerate docs

(This used to be commit f7d900873c3553dde88d42d903b74dc49c9a6c71)

2 files changed, 16 insertions, 11 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index a7328e7cf6..9e719e1f2a 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -2493,7 +2493,7 @@
 		causes <command>smbd</command> to authenticate against another 
 		server.</para>
 		
-		<para>Default: <command>encrypt passwords = no</command></para></listitem>
+		<para>Default: <command>encrypt passwords = yes</command></para></listitem>
 		</varlistentry>
 
 
@@ -3451,10 +3451,13 @@
 		<para>
 		This option is used to control the tcp port number used to contact
 		the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
-		The default is to use the stand LDAP port 389.
+		The default is to use the stand LDAPS port 636.
 		</para>
 		
-		<para>Default : <command>ldap port = 389</command></para>
+		<para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
+		</para>
+		
+		<para>Default : <command>ldap port = 636</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -3502,15 +3505,15 @@
 		
 		<para>
 		The <parameter>ldap ssl</parameter> can be set to one of three values:
-		(a) <command>on</command> - Always use SSL when contacting the 
-		<parameter>ldap	server</parameter>, (b) <command>off</command> -
-		Never use SSL when querying the directory, or (c) <command>start 
-		tls</command> - Use the LDAPv3 StartTLS extended operation 
+		(a) <constant>on</constant> - Always use SSL when contacting the 
+		<parameter>ldap	server</parameter>, (b) <constant>off</constant> -
+		Never use SSL when querying the directory, or (c) <constant>start_tls</constant> 
+		- Use the LDAPv3 StartTLS extended operation 
 		(RFC2830) for communicating with the directory server.
 		</para>
 		
 		
-		<para>Default : <command>ldap ssl = off</command></para>
+		<para>Default : <command>ldap ssl = on</command></para>
 		</listitem>
 		</varlistentry>
 
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 6cc7be654a..4f36de1576 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -357,7 +357,7 @@
 		to read the password. </para>
 		
 		<para>A third option is to use a credentials file which 
-		contains the plaintext of the username and password.  This 
+		contains the plaintext of the domain name, username and password.  This 
 		option is mainly provided for scripts where the admin doesn't 
 		wish to pass the credentials on the command line or via environment 
 		variables. If this method is used, make certain that the permissions 
@@ -375,17 +375,19 @@
 		
 		<varlistentry>
 		<term>-A filename</term><listitem><para>This option allows 
-		you to specify a file from which to read the username and 
+		you to specify a file from which to read the username, domain name, and 
 		password used in the connection.  The format of the file is 
 		</para>
 		
 		<para><programlisting>
 username = &lt;value&gt; 
 password = &lt;value&gt;
+domain = &lt;value&gt;
 		</programlisting></para>
 	
 
-		<para>Make certain that the permissions on the file restrict 
+		<para>If the domain parameter is missing the current workgroup name
+		is used instead. Make certain that the permissions on the file restrict 
 		access from unwanted users. </para></listitem>
 		</varlistentry>