From: Mathieu Parent Date: Mon, 25 Mar 2019 14:02:45 +0000 (+0100) Subject: Spelling fix s/informations/information/ X-Git-Tag: tdb-1.4.1~553 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=720396f0fb499d587062d7b2ce7c3a62ee3b6dd3;p=thirdparty%2Fsamba.git Spelling fix s/informations/information/ Signed-off-by: Mathieu Parent Reviewed-by: Andrew Bartlett Reviewed-by: Martin Schwenke --- diff --git a/lib/talloc/man/talloc.3.xml b/lib/talloc/man/talloc.3.xml index 6139fe73825..c51061fce1f 100644 --- a/lib/talloc/man/talloc.3.xml +++ b/lib/talloc/man/talloc.3.xml @@ -199,7 +199,7 @@ you can talloc_free() the pointer itself if it has at maximum one parent. This behaviour has been changed since the release of version - 2.0. Further informations in the description of "talloc_free". + 2.0. Further information in the description of "talloc_free". diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h index 5240f1e8dda..34fe772d2df 100644 --- a/lib/talloc/talloc.h +++ b/lib/talloc/talloc.h @@ -966,7 +966,7 @@ size_t talloc_reference_count(const void *ptr); * * - you can talloc_free() the pointer itself if it has at maximum one * parent. This behaviour has been changed since the release of version - * 2.0. Further informations in the description of "talloc_free". + * 2.0. Further information in the description of "talloc_free". * * For more control on which parent to remove, see talloc_unlink() * @param[in] ctx The additional parent. @@ -1007,7 +1007,7 @@ void *_talloc_reference_loc(const void *context, const void *ptr, const char *lo * * You can just use talloc_free() instead of talloc_unlink() if there * is at maximum one parent. This behaviour has been changed since the - * release of version 2.0. Further informations in the description of + * release of version 2.0. Further information in the description of * "talloc_free". * * @param[in] context The talloc parent to remove. diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt index aba285e72df..dedda6c0678 100644 --- a/lib/talloc/talloc_guide.txt +++ b/lib/talloc/talloc_guide.txt @@ -189,7 +189,7 @@ ways: - you can talloc_free() the pointer itself if it has at maximum one parent. This behaviour has been changed since the release of version - 2.0. Further informations in the description of "talloc_free". + 2.0. Further information in the description of "talloc_free". For more control on which parent to remove, see talloc_unlink() @@ -207,7 +207,7 @@ is NULL, then the function will make no modifications and return -1. You can just use talloc_free() instead of talloc_unlink() if there is at maximum one parent. This behaviour has been changed since the -release of version 2.0. Further informations in the description of +release of version 2.0. Further information in the description of "talloc_free". =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/python/samba/netcmd/common.py b/python/samba/netcmd/common.py index c68cbabf42e..86f3e5161b1 100644 --- a/python/samba/netcmd/common.py +++ b/python/samba/netcmd/common.py @@ -63,7 +63,7 @@ def netcmd_finddc(lp, creds, realm=None): def netcmd_get_domain_infos_via_cldap(lp, creds, address=None): - '''Return domain informations (CLDAP record) of the ldap-capable + '''Return domain information (CLDAP record) of the ldap-capable DC with the specified address''' net = Net(creds=creds, lp=lp) cldap_ret = net.finddc(address=address, diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 2aebb5f8166..851e7241d15 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -1304,7 +1304,7 @@ class cmd_domain_passwordsettings_show(Command): except Exception as e: raise CommandError("Could not retrieve password properties!", e) - self.message("Password informations for domain '%s'" % domain_dn) + self.message("Password information for domain '%s'" % domain_dn) self.message("") if pwd_props & DOMAIN_PASSWORD_COMPLEX != 0: self.message("Password complexity: on") diff --git a/python/samba/samdb.py b/python/samba/samdb.py index 308b5f96a7b..eda31cb90c3 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -201,7 +201,7 @@ pwdLastSet: 0 group_dn = "CN=%s,%s,%s" % (groupname, (groupou or "CN=Users"), self.domain_dn()) # The new user record. Note the reliance on the SAMLDB module which - # fills in the default informations + # fills in the default information ldbmessage = {"dn": group_dn, "sAMAccountName": groupname, "objectClass": "group"} @@ -389,7 +389,7 @@ member: %s dnsdomain = ldb.Dn(self, self.domain_dn()).canonical_str().replace("/", "") user_principal_name = "%s@%s" % (username, dnsdomain) # The new user record. Note the reliance on the SAMLDB module which - # fills in the default informations + # fills in the default information ldbmessage = {"dn": user_dn, "sAMAccountName": username, "userPrincipalName": user_principal_name, diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py index c6a1df5ea43..8b46357c670 100755 --- a/source4/dsdb/tests/python/dirsync.py +++ b/source4/dsdb/tests/python/dirsync.py @@ -315,14 +315,14 @@ class SimpleDirsyncTests(DirsyncBaseTests): delete_force(self.ldb_admin, ouname) def test_dirsync_with_controls(self): - """Check that dirsync return correct informations when dealing with the NC""" + """Check that dirsync return correct information when dealing with the NC""" res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s)" % str(self.base_dn), attrs=["name"], controls=["dirsync:1:0:10000", "extended_dn:1", "show_deleted:1"]) def test_dirsync_basenc(self): - """Check that dirsync return correct informations when dealing with the NC""" + """Check that dirsync return correct information when dealing with the NC""" res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s)" % str(self.base_dn), attrs=["name"], diff --git a/source4/dsdb/tests/python/password_lockout_base.py b/source4/dsdb/tests/python/password_lockout_base.py index 24b066c188d..597633a6f73 100644 --- a/source4/dsdb/tests/python/password_lockout_base.py +++ b/source4/dsdb/tests/python/password_lockout_base.py @@ -401,7 +401,7 @@ lockoutThreshold: """ + str(lockoutThreshold) + """ self.assertGreaterEqual(lastLogon, lastLogonTimestamp) # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. creds_lockout = self.insta_creds(creds) @@ -695,7 +695,7 @@ lockoutThreshold: """ + str(lockoutThreshold) + """ # time should increase. # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. username = creds.get_username() userdn = "cn=%s,cn=users,%s" % (username, self.base_dn) diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py index e1d0a981897..b5a91ddfbbd 100755 --- a/source4/dsdb/tests/python/passwords.py +++ b/source4/dsdb/tests/python/passwords.py @@ -140,7 +140,7 @@ add: userPassword self.ldb.enable_account("(sAMAccountName=testuser)") # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. creds2 = Credentials() creds2.set_username("testuser") diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py index c2c41634b8c..988eeaf8094 100644 --- a/source4/dsdb/tests/python/rodc_rwdc.py +++ b/source4/dsdb/tests/python/rodc_rwdc.py @@ -343,7 +343,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase): creds = self.lockout1ntlm_creds # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. creds_lockout = self.insta_creds(creds) @@ -403,7 +403,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase): userpass = creds.get_password() # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. creds_lockout = self.insta_creds(creds) diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index 2d39286dd2e..99d308648df 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -1766,7 +1766,7 @@ class SamTests(samba.tests.TestCase): self.assertNotEqual(int(res1[0]["pwdLastSet"][0]), 0) # Open a second LDB connection with the user credentials. Use the - # command line credentials for informations like the domain, the realm + # command line credentials for information like the domain, the realm # and the workstation. sasl_creds = Credentials() sasl_creds.set_username(username) diff --git a/source4/selftest/provisions/alpha13/private/named.txt b/source4/selftest/provisions/alpha13/private/named.txt index c609bbab3ad..9641c48691a 100644 --- a/source4/selftest/provisions/alpha13/private/named.txt +++ b/source4/selftest/provisions/alpha13/private/named.txt @@ -1,4 +1,4 @@ -# Additional informations for DNS setup using BIND +# Additional information for DNS setup using BIND # If you are running a capable version of BIND and you wish to support secure # GSS-TSIG updates, you must make the following configuration changes: diff --git a/source4/selftest/provisions/release-4-1-0rc3/private/named.txt b/source4/selftest/provisions/release-4-1-0rc3/private/named.txt index 0c7e387d88c..616dd72813e 100644 --- a/source4/selftest/provisions/release-4-1-0rc3/private/named.txt +++ b/source4/selftest/provisions/release-4-1-0rc3/private/named.txt @@ -1,4 +1,4 @@ -# Additional informations for DNS setup using BIND +# Additional information for DNS setup using BIND # If you are running a capable version of BIND and you wish to support # secure GSS-TSIG updates, you must make the following configuration diff --git a/source4/setup/named.txt b/source4/setup/named.txt index 511bc67c82b..60c9e1478a4 100644 --- a/source4/setup/named.txt +++ b/source4/setup/named.txt @@ -1,4 +1,4 @@ -# Additional informations for DNS setup using BIND +# Additional information for DNS setup using BIND # If you are running a capable version of BIND and you wish to support # secure GSS-TSIG updates, you must make the following configuration