summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2012-05-08 11:05:37 +0200
committerKarolin Seeger <kseeger@samba.org>2012-06-30 13:43:10 +0200
commit6df440dd113d492d5f18221c06c6a3193d056bfb (patch)
treefadfab498a4ee1ff1d402da3ecf5ccaa582c9080 /docs-xml
parentb050000ccf22cc54cbc7c097a2b7014364e08640 (diff)
downloadsamba-6df440dd113d492d5f18221c06c6a3193d056bfb.tar.gz
s3-docs: overrided -> overridden
Fix typo. Part of a fix for bug #7938. Based on a patch provided by John Bradshaw <john@johnbradshaw.org>. (cherry picked from commit 6b4890246ddbd606484e7247bea86c238cc0a057) (cherry picked from commit 8b266d110d77b2204a29c00f7f57e62fe801cbfc)
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index ea68594e241..a97ffbf4e37 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>