[SCM] Samba Shared Repository - branch v4-2-test updated

[Karolin Seeger]

The branch, v4-2-test has been updated
       via  6f95e55 manpage: corrected small typo error
      from  1998b07 ctdb: strip trailing spaces from nodes file.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 6f95e55eb6742054f6a4d5622cfe0302cd5d2623
Author: YvanM <yvan.masson at openmailbox.org>
Date:   Sun Nov 1 11:53:45 2015 +0100

    manpage: corrected small typo error
    
    Corrected mistakes, probably comming from a too fast
    "copy and paste", in the smb.conf manpage.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11584
    
    Signed-off-by: YvanM <yvan.masson at openmailbox.org>
    Reviewed-by: Björn Jacke <bj at sernet.de>
    Reviewed-by: Karolin Seeger <kseeger at samba.org>
    
    Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(master): Mon Nov  2 14:43:15 CET 2015 on sn-devel-104
    
    (cherry picked from commit d66863b1fff862aa2ae21a06116bc2a2b2f7a6ce)
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Wed Nov  4 12:24:20 CET 2015 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index 279a57b..fbc4c7d 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -30,7 +30,7 @@
 	</para>
 
 	<para>
-	This is parameter has been was deprecated in Samba 3.0.23, but re-activated in
+	This parameter was deprecated in Samba 3.0.23, but re-activated in
 	Samba 3.0.31 and above, as it now only controls permission changes if the user
 	is in the owning primary group. It is now no longer equivalent to the
 	<parameter moreinfo="none">dos filemode</parameter> option.


-- 
Samba Shared Repository