[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  7105bd3 docs:smb.conf: fix typo in 'smb encrypt' text.
      from  e736a16 docs: Documents length limitations for NetBIOS name

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7105bd370a559a24c7f0deb67e63139ca236500a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 15 16:23:12 2015 +0200

    docs:smb.conf: fix typo in 'smb encrypt' text.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed Jul 15 22:40:54 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index ae0682b..b44ed9a 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -142,7 +142,7 @@
 		</itemizedlist>
 
 		<para>
-		These features can be crontrolled with settings of
+		These features can be controlled with settings of
 		<emphasis>smb encrypt</emphasis> as follows:
 		</para>
 


-- 
Samba Shared Repository