summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2015-07-03 19:14:42 +0300
committerPetr Vobornik <pvoborni@redhat.com>2015-07-17 14:33:30 +0200
commit75fde43491872d3e2f52e8a523af9e60486fd0e0 (patch)
treefa0a907aabfeba9a7ae66fadd5e7398cce37ab3f
parent9f701283534745bf93b41a1886183e9ef1d06566 (diff)
downloadfreeipa-75fde43491872d3e2f52e8a523af9e60486fd0e0.tar.gz
freeipa-75fde43491872d3e2f52e8a523af9e60486fd0e0.tar.xz
freeipa-75fde43491872d3e2f52e8a523af9e60486fd0e0.zip
Fix minor typos
<ame> -> <name> overriden -> overridden ablity -> ability enties -> entries the the -> the https://fedorahosted.org/freeipa/ticket/5109 Reviewed-By: Petr Vobornik <pvoborni@redhat.com> Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rw-r--r--daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c2
-rw-r--r--install/ui/src/freeipa/_base/Singleton_registry.js2
-rw-r--r--ipalib/__init__.py2
-rw-r--r--ipalib/plugins/idviews.py4
-rw-r--r--ipalib/plugins/servicedelegation.py2
-rw-r--r--ipalib/plugins/stageuser.py2
-rw-r--r--ipalib/plugins/trust.py2
-rw-r--r--ipalib/plugins/vault.py2
-rw-r--r--ipaserver/advise/base.py2
-rw-r--r--ipatests/test_xmlrpc/ldaptracker.py2
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 c70385dd6..bffaa0120 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 18b0c420a..eca7898f5 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 44aacd091..4ab152243 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 cannot 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 67f52f886..4a1416224 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 34312e39a..37de91638 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 6cbc8f4ab..415dc6a3b 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 196df5926..b2e18f5bc 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 37a32282e..81197f932 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 f6c82b5bf..467203f54 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 974124404..d9763e116 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