summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-02-02 17:15:35 +0100
committerRob Crittenden <rcritten@redhat.com>2011-02-02 15:38:50 -0500
commit0353a2be677594125892e16fe0cdebe264d2ccb2 (patch)
tree207c512050aec52000b8179098b68d98a3f96974
parentbb56285f6b350fcdd7b22f6d6c4fb69da5ce438d (diff)
downloadfreeipa-0353a2be677594125892e16fe0cdebe264d2ccb2.tar.gz
freeipa-0353a2be677594125892e16fe0cdebe264d2ccb2.tar.xz
freeipa-0353a2be677594125892e16fe0cdebe264d2ccb2.zip
Typos in freeIPA messages
This patch fixes several reported typos in IPA messages and in comments. Contributors file has been updated + the original author of the patch reporting the typos was added. https://fedorahosted.org/freeipa/ticket/848
-rw-r--r--API.txt4
-rw-r--r--Contributors.txt10
-rw-r--r--doc/examples/examples.py2
-rw-r--r--ipalib/plugins/automount.py4
-rw-r--r--ipalib/plugins/migration.py4
5 files changed, 14 insertions, 10 deletions
diff --git a/API.txt b/API.txt
index e08a35f9b..992ba9908 100644
--- a/API.txt
+++ b/API.txt
@@ -204,7 +204,7 @@ command: automountlocation_import
args: 2,1,1
arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
arg: Str('masterfile', label=Gettext('Master file', domain='ipa', localedir=None))
-option: Flag('continue?', autofill=True, cli_name='continue', default=False,lag('continue?', autofill=True, cli_name='continue', default=False, doc=Gettext('Continous operation mode. Errors are reported but the process continues', domain='ipa', localedir=None))
+option: Flag('continue?', autofill=True, cli_name='continue', default=False,lag('continue?', autofill=True, cli_name='continue', default=False, doc=Gettext('Continuous operation mode. Errors are reported but the process continues', domain='ipa', localedir=None))
output: Output('result', None, None)
command: automountlocation_show
args: 1,4,3
@@ -1467,7 +1467,7 @@ option: Str('groupcontainer?', autofill=True, cli_name='group_container', defaul
option: List('userobjectclass?', autofill=True, cli_name='user_objectclass', default=(u'person',), label=Gettext('User object class', domain='ipa', localedir=None), multivalue=True)
option: List('groupobjectclass?', autofill=True, cli_name='group_objectclass', default=(u'groupOfUniqueNames', u'groupOfNames'), label=Gettext('Group object class', domain='ipa', localedir=None), multivalue=True)
option: StrEnum('schema?', autofill=True, cli_name='schema', default=u'RFC2307bis', label=Gettext('LDAP schema', domain='ipa', localedir=None), values=(u'RFC2307bis', u'RFC2307'))
-option: Flag('continue?', autofill=True, default=False,lag('continue?', autofill=True, default=False, doc=Gettext('Continous operation mode. Errors are reported but the process continues', domain='ipa', localedir=None))
+option: Flag('continue?', autofill=True, default=False,lag('continue?', autofill=True, default=False, doc=Gettext('Continuous operation mode. Errors are reported but the process continues', domain='ipa', localedir=None))
option: List('exclude_groups?', autofill=True, cli_name='exclude_groups', default=(), multivalue=True)
option: List('exclude_users?', autofill=True, cli_name='exclude_users', default=(), multivalue=True)
output: Output('result', <type 'dict'>, Gettext('Lists of objects migrated; categorized by type.', domain='ipa', localedir=None))
diff --git a/Contributors.txt b/Contributors.txt
index 79f8188b9..6cc9b1f4f 100644
--- a/Contributors.txt
+++ b/Contributors.txt
@@ -4,18 +4,22 @@ The following people have contributed to the FreeIPA project.
(Listed in alphabetical order within category)
Developers:
+ Jr Aquino
Rob Crittenden
Nalin Dahyabhai
John Dennis
Jason DeRose
Endi Dewata
+ Jakub Hrozek
+ Martin Kosek
Nathan Kinder
Rich Megginson
Martin Nagy
Simo Sorce
Andrew Wnuk
+ Adam Young
+ Jan Zeleny
Pavel Zůna
- Jr Aquino
Documentation:
David O'Brien
@@ -54,16 +58,16 @@ Managment:
Karl Wirth
Past and Occasional Contributors:
+ Yuri Chornoivan
Frank Cusack
Don Davis
Gunther Deschner
Stephen Gallagher
- Jakub Hrozek
+ Ian Kumlien
Karl MacMillan
Jon McCann
Kevin McCarthy
Jim Meyering
Pete Rowley
Andreas Schneider
- Ian Kumlien
diff --git a/doc/examples/examples.py b/doc/examples/examples.py
index b59dc908f..0ae212601 100644
--- a/doc/examples/examples.py
+++ b/doc/examples/examples.py
@@ -366,7 +366,7 @@ class exuser_find(Method):
# standard_list_of_entries is an output pattern that
# define a dict with a list of entries, their count
# and a truncated flag. The truncated flag is used to mark
- # truncated (uncomplete) search results - for example due to
+ # truncated (incomplete) search results - for example due to
# timeouts.
has_output = output.standard_list_of_entries
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py
index ec306ac71..9c2c0ad13 100644
--- a/ipalib/plugins/automount.py
+++ b/ipalib/plugins/automount.py
@@ -67,7 +67,7 @@ Locations:
ipa automountlocation-import baltimore /etc/auto.master
The import will fail if any duplicate entries are found. For
- continous operation where errors are ignored use the --continue
+ continuous operation where errors are ignored use the --continue
option.
Maps:
@@ -318,7 +318,7 @@ class automountlocation_import(LDAPQuery):
takes_options = (
Flag('continue?',
cli_name='continue',
- doc=_('Continous operation mode. Errors are reported but the process continues'),
+ doc=_('Continuous operation mode. Errors are reported but the process continues'),
),
)
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py
index fff0afd1c..4e3a4b00e 100644
--- a/ipalib/plugins/migration.py
+++ b/ipalib/plugins/migration.py
@@ -309,7 +309,7 @@ class migrate_ds(Command):
autofill=True,
),
Flag('continue?',
- doc=_('Continous operation mode. Errors are reported but the process continues'),
+ doc=_('Continuous operation mode. Errors are reported but the process continues'),
default=False,
),
)
@@ -334,7 +334,7 @@ class migrate_ds(Command):
truncated_err_msg = _('''\
search results for objects to be migrated
have been truncated by the server;
-migration process might be uncomplete\n''')
+migration process might be incomplete\n''')
migration_disabled_msg = _('''\
Migration mode is disabled. Use \'ipa config-mod\' to enable it.''')