From 236dcfa236a703592e6a17b9fac5b9d9e15d242b Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 5 Sep 2011 16:32:53 +0200 Subject: Fix typos Fix "The the" and "classses" in FreeIPA code and messages. https://fedorahosted.org/freeipa/ticket/1480 --- daemons/ipa-kpasswd/ipa_kpasswd.c | 2 +- daemons/ipa-slapi-plugins/common/util.h | 2 +- daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c | 2 +- daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c | 2 +- daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c | 4 ++-- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c | 2 +- daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c | 2 +- daemons/ipa-slapi-plugins/ipa-version/ipa_repl_version.c | 2 +- daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c | 2 +- daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c | 2 +- daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h | 2 +- daemons/ipa-version.h.in | 2 +- install/ui/test/data/ipa_init.json | 4 ++-- install/ui/test/data/json_metadata.json | 4 ++-- ipalib/__init__.py | 2 +- ipalib/plugins/aci.py | 4 ++-- ipalib/plugins/config.py | 4 ++-- ipapython/ipautil.py | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/daemons/ipa-kpasswd/ipa_kpasswd.c b/daemons/ipa-kpasswd/ipa_kpasswd.c index 0f014c294..7b77f5329 100644 --- a/daemons/ipa-kpasswd/ipa_kpasswd.c +++ b/daemons/ipa-kpasswd/ipa_kpasswd.c @@ -927,7 +927,7 @@ void handle_krb_packets(uint8_t *buf, ssize_t buflen, kpreply: - /* set-up the the clear text reply */ + /* set-up the clear text reply */ kdec.length = 2 + strlen(result_string); kdec.data = malloc(kdec.length); if (!kdec.data) { diff --git a/daemons/ipa-slapi-plugins/common/util.h b/daemons/ipa-slapi-plugins/common/util.h index 82fb08360..8804fbebe 100644 --- a/daemons/ipa-slapi-plugins/common/util.h +++ b/daemons/ipa-slapi-plugins/common/util.h @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c index 5d276de53..51231231f 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c b/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c index 0284872b8..08e193a50 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c +++ b/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c b/daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c index 91cc2cccc..70a4ea821 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index cb9af98e4..259138d9a 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h index e204bba20..39e5bb6af 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c index fc9ccb05c..7bc2e7d54 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey @@ -54,7 +54,7 @@ extern const char *ipa_pwd_config_dn; /* These are the default enc:salt types if nothing is defined. * TODO: retrieve the configure set of ecntypes either from the - * kfc.conf file or by synchronizing the the file content into + * kfc.conf file or by synchronizing the file content into * the directory */ static const char *ipapwd_def_encsalts[] = { "des3-hmac-sha1:normal", diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c index 1b6bc6f9c..cd4610c6f 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c index 99fc10405..f6ddc17a6 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c b/daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c index 77eec6bdd..5430de4c9 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c +++ b/daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-version/ipa_repl_version.c b/daemons/ipa-slapi-plugins/ipa-version/ipa_repl_version.c index 60b42e17d..28cd3e07a 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/ipa_repl_version.c +++ b/daemons/ipa-slapi-plugins/ipa-version/ipa_repl_version.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c index 450375ddc..456a839aa 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c +++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c index 48c45c19b..ef237e93a 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c +++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h index 8f79dc64e..939e63c1b 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h +++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/daemons/ipa-version.h.in b/daemons/ipa-version.h.in index b5ff91bc8..3a475414e 100644 --- a/daemons/ipa-version.h.in +++ b/daemons/ipa-version.h.in @@ -16,7 +16,7 @@ * * In the following paragraph, "GPL" means the GNU General Public * License, version 3 or any later version, and "Non-GPL Code" means - * code that is governed neither by the the GPL nor a license + * code that is governed neither by the GPL nor a license * compatible with the GPL. * * You may link the code of this Program with Non-GPL Code and convey diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index bd89f5eb7..e15c26188 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -8767,7 +8767,7 @@ "cli_name": "groupobjectclasses", "cli_short_name": null, "default": null, - "doc": "Default group objectclassses (comma-separated list).", + "doc": "Default group objectclasses (comma-separated list).", "exclude": null, "flags": [], "hint": null, @@ -8790,7 +8790,7 @@ "cli_name": "userobjectclasses", "cli_short_name": null, "default": null, - "doc": "Default user objectclassses (comma-separated list).", + "doc": "Default user objectclasses (comma-separated list).", "exclude": null, "flags": [], "hint": null, diff --git a/install/ui/test/data/json_metadata.json b/install/ui/test/data/json_metadata.json index 509fc5ee4..482eb6c3b 100644 --- a/install/ui/test/data/json_metadata.json +++ b/install/ui/test/data/json_metadata.json @@ -2753,7 +2753,7 @@ "cli_name": "groupobjectclasses", "cli_short_name": null, "default": null, - "doc": "Default group objectclassses (comma-separated list)", + "doc": "Default group objectclasses (comma-separated list)", "exclude": null, "flags": [], "hint": null, @@ -2776,7 +2776,7 @@ "cli_name": "userobjectclasses", "cli_short_name": null, "default": null, - "doc": "Default user objectclassses (comma-separated list)", + "doc": "Default user objectclasses (comma-separated list)", "exclude": null, "flags": [], "hint": null, diff --git a/ipalib/__init__.py b/ipalib/__init__.py index 16d7db761..04896465a 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -768,7 +768,7 @@ session. The global environment will have an ``api`` variable, which is the standard `plugable.API` instance found at ``ipalib.api``. All plugins will have been loaded (well, except the backend plugins if ``in_server`` is False) and ``api`` will be fully initialized. To launch the console from within the -top-level directory in the the source tree, just run ``ipa console`` from a +top-level directory in the source tree, just run ``ipa console`` from a terminal, like this: :: diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index afdfaf458..fc5582db8 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -62,7 +62,7 @@ The targets include: ldap://uid=*,cn=users,cn=accounts,dc=example,dc=com. The subtree option is a fail-safe for objects that may not be covered by the type option. -The permissions define what the the ACI is allowed to do, and are one or +The permissions define what the ACI is allowed to do, and are one or more of: 1. write - write one or more attributes 2. read - read one or more attributes @@ -100,7 +100,7 @@ command-line now (see last example). Add an ACI that allows members of the editors manage members of the admins group: ipa aci-add --permissions=write --attrs=member --targetgroup=admins --group=editors --prefix=none "Editors manage admins" - Add an ACI that allows members of the admin group to manage the street and zip code of those in the editors group: + Add an ACI that allows members of the admins group to manage the street and zip code of those in the editors group: ipa aci-add --permissions=write --memberof=editors --group=admins --attrs=street,postalcode --prefix=none "admins edit the address of editors" Add an ACI that allows the admins group manage the street and zipcode of those who work for the boss: diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index b78597c1b..7ef626553 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -154,12 +154,12 @@ class config(LDAPObject): List('ipagroupobjectclasses?', cli_name='groupobjectclasses', label=_('Default group objectclasses'), - doc=_('Default group objectclassses (comma-separated list).'), + doc=_('Default group objectclasses (comma-separated list).'), ), List('ipauserobjectclasses?', cli_name='userobjectclasses', label=_('Default user objectclasses'), - doc=_('Default user objectclassses (comma-separated list).'), + doc=_('Default user objectclasses (comma-separated list).'), ), Int('ipapwdexpadvnotify?', cli_name='pwdexpnotify', diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index da6e94c85..97284b384 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -864,7 +864,7 @@ class AttributeValueCompleter: readline.redisplay() return None else: - # lhs and operator are complete, if the the rhs is blank + # lhs and operator are complete, if the rhs is blank # (either empty or only only whitespace) then attempt # to complete by inserting the default value, otherwise # there is nothing we can complete to so we're done. -- cgit