[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  c6ae462 doc: fix a typo in the smb.conf manpage, explanation of idmap config
      from  23663b9 vfs_gpfs: Re-enable share modes

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


- Log -----------------------------------------------------------------
commit c6ae462a020648c851fe6f6724ae9cf32c9d0ab8
Author: Michael Adam <obnox at samba.org>
Date:   Thu Nov 5 16:43:34 2015 +0100

    doc: fix a typo in the smb.conf manpage, explanation of idmap config
    
    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): Fri Nov  6 06:26:34 CET 2015 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 434d379..1cf5d4a 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -65,7 +65,7 @@
 		mixture of the tdb and rid backend. It creates ranges for
 		each domain encountered and then uses the rid algorithm for each
 		of these automatically configured domains individually.
-		The ad backend usees unix IDs stored in Active Directory via
+		The ad backend uses unix IDs stored in Active Directory via
 		the standard schema extensions. The nss backend reverses
 		the standard winbindd setup and gets the unixids via names
 		from nsswitch which can be useful in an ldap setup.


-- 
Samba Shared Repository