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-05-08 12:03:24 +0200
commitd8acdd020a4dc28bef20f156c89a0262c9f82df5 (patch)
tree1808b1e5280820580a8927cc87b3a4c9970d341a /docs-xml
parent2ae02efabd5151c849ea079851607e7f45cf7a6f (diff)
downloadsamba-d8acdd020a4dc28bef20f156c89a0262c9f82df5.tar.gz
samba-d8acdd020a4dc28bef20f156c89a0262c9f82df5.tar.bz2
samba-d8acdd020a4dc28bef20f156c89a0262c9f82df5.zip
s3-docs: overrided -> overridden
Fix typo. Part of a fix for bug #7938. Based on a patch provided by John Bradshaw <john@johnbradshaw.org>.
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml2
-rw-r--r--docs-xml/manpages-3/ldbadd.1.xml2
-rw-r--r--docs-xml/manpages-3/ldbdel.1.xml2
-rw-r--r--docs-xml/manpages-3/ldbmodify.1.xml2
-rw-r--r--docs-xml/manpages-3/ldbrename.1.xml2
-rw-r--r--docs-xml/manpages-3/ldbsearch.1.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index 0a50698115..6096975772 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>
diff --git a/docs-xml/manpages-3/ldbadd.1.xml b/docs-xml/manpages-3/ldbadd.1.xml
index 9d682b1c3f..b0c25e74c7 100644
--- a/docs-xml/manpages-3/ldbadd.1.xml
+++ b/docs-xml/manpages-3/ldbadd.1.xml
@@ -68,7 +68,7 @@
<variablelist>
<varlistentry><term>LDB_URL</term>
- <listitem><para>LDB URL to connect to (can be overrided by using the
+ <listitem><para>LDB URL to connect to (can be overridden by using the
-H command-line option.)</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/manpages-3/ldbdel.1.xml b/docs-xml/manpages-3/ldbdel.1.xml
index 00b855175e..c7e33a839f 100644
--- a/docs-xml/manpages-3/ldbdel.1.xml
+++ b/docs-xml/manpages-3/ldbdel.1.xml
@@ -66,7 +66,7 @@
<variablelist>
<varlistentry><term>LDB_URL</term>
- <listitem><para>LDB URL to connect to (can be overrided by using the
+ <listitem><para>LDB URL to connect to (can be overridden by using the
-H command-line option.)</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/manpages-3/ldbmodify.1.xml b/docs-xml/manpages-3/ldbmodify.1.xml
index 65caa80c4b..0c91f75599 100644
--- a/docs-xml/manpages-3/ldbmodify.1.xml
+++ b/docs-xml/manpages-3/ldbmodify.1.xml
@@ -56,7 +56,7 @@
<variablelist>
<varlistentry><term>LDB_URL</term>
- <listitem><para>LDB URL to connect to (can be overrided by using the
+ <listitem><para>LDB URL to connect to (can be overridden by using the
-H command-line option.)</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml
index 6a134f4268..394cff74ef 100644
--- a/docs-xml/manpages-3/ldbrename.1.xml
+++ b/docs-xml/manpages-3/ldbrename.1.xml
@@ -70,7 +70,7 @@
<variablelist>
<varlistentry><term>LDB_URL</term>
- <listitem><para>LDB URL to connect to (can be overrided by using the
+ <listitem><para>LDB URL to connect to (can be overridden by using the
-H command-line option.)</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages-3/ldbsearch.1.xml
index a6eedee258..826c524885 100644
--- a/docs-xml/manpages-3/ldbsearch.1.xml
+++ b/docs-xml/manpages-3/ldbsearch.1.xml
@@ -82,7 +82,7 @@
<variablelist>
<varlistentry><term>LDB_URL</term>
- <listitem><para>LDB URL to connect to (can be overrided by using the
+ <listitem><para>LDB URL to connect to (can be overridden by using the
-H command-line option.)</para></listitem>
</varlistentry>
</variablelist>