This patch from Yuri Chornoivan fixes some typos. All fixes look ok to me.

https://fedorahosted.org/freeipa/ticket/5109
https://bugzilla.redhat.com/show_bug.cgi?id=1239132
From 9554caac8965671840e2361cbb62884333c12e3c Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurc...@ukr.net>
Date: Fri, 3 Jul 2015 19:14:42 +0300
Subject: [PATCH] Fix minor typos

<ame> -> <name>
overriden -> overridden
ablity -> ability
enties -> entries
the the -> the

https://fedorahosted.org/freeipa/ticket/5109

Reviewed-By: Christian Heimes <chei...@redhat.com>
---
 daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c        | 2 +-
 install/ui/src/freeipa/_base/Singleton_registry.js | 2 +-
 ipalib/__init__.py                                 | 2 +-
 ipalib/plugins/idviews.py                          | 4 ++--
 ipalib/plugins/servicedelegation.py                | 2 +-
 ipalib/plugins/stageuser.py                        | 2 +-
 ipalib/plugins/trust.py                            | 2 +-
 ipalib/plugins/vault.py                            | 2 +-
 ipaserver/advise/base.py                           | 2 +-
 ipatests/test_xmlrpc/ldaptracker.py                | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c b/daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c
index c70385dd608147dc08736cb915b506f715108527..bffaa0120387b72ff4a201c4201c741b871e55f3 100644
--- a/daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c
+++ b/daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c
@@ -129,7 +129,7 @@ ipadns_entry_iszone( Slapi_Entry *entry ) {
  * The server calls this plug-in function before executing LDAP ADD operation.
  *
  * ipadns_add function adds default value to idnsSOAserial attribute
- * in idnsZone objects if the the attribute is not present.
+ * in idnsZone objects if the attribute is not present.
  *
  * Default value is added only to objects coming from other servers
  * via replication.
diff --git a/install/ui/src/freeipa/_base/Singleton_registry.js b/install/ui/src/freeipa/_base/Singleton_registry.js
index 18b0c420a702ed16abeece3e1fb7f5d48894ec1e..eca7898f5992b919326b61b73b93234e22539363 100644
--- a/install/ui/src/freeipa/_base/Singleton_registry.js
+++ b/install/ui/src/freeipa/_base/Singleton_registry.js
@@ -54,7 +54,7 @@ define(['dojo/_base/declare',
          *
          * When an object is passed in, the function returns it.
          *
-         * @param {string|Object} type Type's name. Or the the object itself.
+         * @param {string|Object} type Type's name. Or the object itself.
          * @return {Object|null}
          */
         get: function(type) {
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 44aacd0916454e03c6611f106088b98ea0169979..5ba2c9760891c5d45f7bf9841a54c59fc99da01e 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -711,7 +711,7 @@ assume these variables will all exist by the time the module containing their
 plugin (or plugins) is imported.
 
 `Env._bootstrap()`, which is called by `API.bootstrap()`, will create several
-run-time variables that connot be overriden in configuration files or through
+run-time variables that connot be overridden in configuration files or through
 command-line options.  Here is an overview of this run-time information:
 
 =============  =============================  =======================
diff --git a/ipalib/plugins/idviews.py b/ipalib/plugins/idviews.py
index 67f52f886f0e19288a829616603c7aef6768f8db..4a14162249959088ab389b99df3867f872a34030 100644
--- a/ipalib/plugins/idviews.py
+++ b/ipalib/plugins/idviews.py
@@ -339,7 +339,7 @@ class baseidview_apply(LDAPQuery):
 class idview_apply(baseidview_apply):
     __doc__ = _('Applies ID View to specified hosts or current members of '
                 'specified hostgroups. If any other ID View is applied to '
-                'the host, it is overriden.')
+                'the host, it is overridden.')
 
     member_count_out = (_('ID View applied to %i host.'),
                         _('ID View applied to %i hosts.'))
@@ -462,7 +462,7 @@ def resolve_object_to_anchor(ldap, obj_type, obj, fallback_to_ldap):
             raise errors.ValidationError(
                     name=_('IPA object'),
                     error=_('system IPA objects (e.g system groups, user '
-                            'private groups) cannot be overriden')
+                            'private groups) cannot be overridden')
                 )
 
         # The domain prefix, this will need to be reworked once we
diff --git a/ipalib/plugins/servicedelegation.py b/ipalib/plugins/servicedelegation.py
index 34312e39a844eb798d55c659ab850da57ab126f7..37de916389c46d99f17b66c1cac16e391265491d 100644
--- a/ipalib/plugins/servicedelegation.py
+++ b/ipalib/plugins/servicedelegation.py
@@ -65,7 +65,7 @@ the bound user's behalf.
 
 It is strongly discouraged to modify the delegations that ship with
 IPA, ipa-http-delegation and its targets ipa-cifs-delegation-targets and
-ipa-ldap-delegation-targets. Incorrect changes can remove the ablity
+ipa-ldap-delegation-targets. Incorrect changes can remove the ability
 to delegate, causing the framework to stop functioning.
 """)
 
diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py
index 6cbc8f4ab07f2c1172f2b2c45bfe8f30a74938b3..415dc6a3b2e79fa95dfa9cac94a59315b8edf770 100644
--- a/ipalib/plugins/stageuser.py
+++ b/ipalib/plugins/stageuser.py
@@ -57,7 +57,7 @@ Active user entries are Posix users directly under the container: "cn=accounts,
 User can authenticate with Active entries, at the condition they have
 credentials
 
-Delete user enties are Posix users directly under the container: "cn=deleted users,
+Delete user entries are Posix users directly under the container: "cn=deleted users,
 cn=accounts, cn=provisioning, SUFFIX".
 User can not authenticate with those entries (even if the entries contain credentials)
 
diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py
index 196df5926e7965dc1f0165f301bd5ac11528d1cd..b2e18f5bc7160880fa1d04503f1f56259abcde75 100644
--- a/ipalib/plugins/trust.py
+++ b/ipalib/plugins/trust.py
@@ -244,7 +244,7 @@ def add_range(myapi, trustinstance, range_name, dom_sid, *keys, **options):
     If that was not successful, we go for our usual defaults (random base,
     range size 200 000, ipa-ad-trust range type).
 
-    Any of these can be overriden by passing appropriate CLI options
+    Any of these can be overridden by passing appropriate CLI options
     to the trust-add command.
     """
 
diff --git a/ipalib/plugins/vault.py b/ipalib/plugins/vault.py
index 37a32282e7a4e87889eea90d987b737f98fd82c3..81197f9328c7ed890fa336f464bfcda475ac6189 100644
--- a/ipalib/plugins/vault.py
+++ b/ipalib/plugins/vault.py
@@ -111,7 +111,7 @@ EXAMPLES:
    ipa vault-add <name> --service <service name>
 """) + _("""
  Add a shared vault:
-   ipa vault-add <ame> --shared
+   ipa vault-add <name> --shared
 """) + _("""
  Add a user vault:
    ipa vault-add <name> --user <username>
diff --git a/ipaserver/advise/base.py b/ipaserver/advise/base.py
index f6c82b5bfcad77f4f1a1745176b4e8dd865a39c3..467203f54200773edfbdcc354c95b53ff6c33e49 100644
--- a/ipaserver/advise/base.py
+++ b/ipaserver/advise/base.py
@@ -114,7 +114,7 @@ class Advice(Plugin):
 
     def get_info(self):
         """
-        This method should be overriden by child Advices.
+        This method should be overridden by child Advices.
 
         Returns a string with instructions.
         """
diff --git a/ipatests/test_xmlrpc/ldaptracker.py b/ipatests/test_xmlrpc/ldaptracker.py
index 97412440446a0cc56e283e58fb731a31c4d9458f..d9763e116d43daa16fa21cc808968bb8d8b1dcc3 100644
--- a/ipatests/test_xmlrpc/ldaptracker.py
+++ b/ipatests/test_xmlrpc/ldaptracker.py
@@ -70,7 +70,7 @@ class Tracker(object):
     managedby_keys = None
     allowedto_keys = None
 
-    _override_me_msg = "This method needs to be overriden in a subclass"
+    _override_me_msg = "This method needs to be overridden in a subclass"
 
     def __init__(self, default_version=None):
         self.api = api
-- 
2.4.3

Attachment: signature.asc
Description: OpenPGP digital signature

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to