Correct "overriden" typos.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index 373af5c6eae8f637eac231daf9051353a4c7a7a6..d623613769174d5a920feb225572ce2750023f02 100644 (file)
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -610,7 +610,7 @@ _PUBLIC_ NTSTATUS gensec_set_target_hostname(struct gensec_security *gensec_secu
 
 _PUBLIC_ const char *gensec_get_target_hostname(struct gensec_security *gensec_security)
 {
-       /* We allow the target hostname to be overriden for testing purposes */
+       /* We allow the target hostname to be overridden for testing purposes */
        if (gensec_security->settings->target_hostname) {
                return gensec_security->settings->target_hostname;
        }

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index fc58c31b717a3c6d2cdad237a032440bfee4e00a..4c013f073cba75cd6ad5a42711924a1a5000506e 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -165,7 +165,7 @@
            OPTIONS is a comma-separated list of any permissible
            options to the tmpfs filesystem.  The only pre-specified
            default is <option>mode=700</option>, which can
-           overriden by specifying <option>mode</option> in
+           overridden by specifying <option>mode</option> in
            OPTIONS.  It probably makes sense to specify a maximum
            <option>size</option>.
          </para>

diff --git a/docs-xml/Samba3-Developers-Guide/vfs.xml b/docs-xml/Samba3-Developers-Guide/vfs.xml
index f70fc96f37299efbd1f01391fd2177f095139623..70e2c65c32d43b83124f1b83bc29201557b41042 100644 (file)
--- a/docs-xml/Samba3-Developers-Guide/vfs.xml
+++ b/docs-xml/Samba3-Developers-Guide/vfs.xml
@@ -107,7 +107,7 @@ and how those functions would co-operate with the rest of VFS
 subsystem. Each operation could perform in a following ways:
 <itemizedlist>
        <listitem><para><emphasis>transparent</emphasis>, meaning that while
-  operation is overriden, the module will still call a previous
+  operation is overridden, the module will still call a previous
   implementation, before or after its own action. This mode is
   indicated by the constant
   <literal>SMB_VFS_LAYER_TRANSPARENT</literal>;</para>

diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index e91bebd2a26fb079abba794ea724dac315f514fc..ad8143de856f074bc45fc50aefa4b7e53fba99a6 100644 (file)
--- a/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
@@ -179,7 +179,7 @@ class Command(object):
             return -1
 
     def run(self):
-        """Run the command. This should be overriden by all subclasses."""
+        """Run the command. This should be overridden by all subclasses."""
         raise NotImplementedError(self.run)
 
     def get_logger(self, name="netcmd"):

diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py
index 960206633bea0a9e47e2d0e3b5c74bd885f94822..349349428cb00819313507219b81f3dbf324c678 100644 (file)
--- a/python/samba/tests/dcerpc/dnsserver.py
+++ b/python/samba/tests/dcerpc/dnsserver.py
@@ -494,7 +494,7 @@ class DnsserverTests(RpcInterfaceTestCase):
                 # an alias can only map to one CNAME record.
                 # Also, on Windows, when the empty string is added and
                 # another record is added afterwards, the empty string
-                # will be silently overriden by the new one, so it
+                # will be silently overridden by the new one, so it
                 # fails this test for the empty string.
                 expected_num = 1 if record_type_str == 'CNAME' else 2
 

diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 8f00534bf664df9b6bacd98fd42b3e4a540120bb..c57e9e94a1b90ba2ab629137bfc8b75707d5fe69 100644 (file)
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -73,7 +73,7 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase):
     def runsubcmd(self, name, sub, *args):
         """run a command with sub commands"""
         # The reason we need this function separate from runcmd is
-        # that the .outf StringIO assignment is overriden if we use
+        # that the .outf StringIO assignment is overridden if we use
         # runcmd, so we can't capture stdout and stderr
         cmd = cmd_sambatool.subcommands[name].subcommands[sub]
         cmd.outf = StringIO()