[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  8b266d1 s3-docs: overrided -> overridden
      from  353d743 s3/ldap: remove outdated netscape ds 5 schema file

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 8b266d110d77b2204a29c00f7f57e62fe801cbfc
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue May 8 11:05:37 2012 +0200

    s3-docs: overrided -> overridden
    
    Fix typo. Part of a fix for bug #7938. Based on a patch provided by John
    Bradshaw <john at johnbradshaw.org>.
    (cherry picked from commit 6b4890246ddbd606484e7247bea86c238cc0a057)

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

Summary of changes:
 docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index ea68594..a97ffbf 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -1380,7 +1380,7 @@ mystic:/home/hannibal > rm filename
 	Samba has to deal with the complicated matter of handling the challenge of the Windows
 	ACL that implements <emphasis>inheritance</emphasis>, a concept not anticipated by POSIX
 	ACLs as implemented in UNIX file systems. Samba provides support for <emphasis>masks</emphasis>
-	that permit normal ugo and ACLs functionality to be overrided. This further complicates
+	that permit normal ugo and ACLs functionality to be overridden. This further complicates
 	the way in which Windows ACLs must be implemented.
 	</para>
 


-- 
Samba Shared Repository