Attachment 613307 Details for Bug 857466 – Better patch with more fixes

[patch] Better patch with more fixes

0001-Fix-various-typos.patch (text/plain), 15.79 KB, created by Yuri Chornoivan on 2012-09-15 16:08:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Chornoivan

Created: 2012-09-15 16:08:21 UTC

Size: 15.79 KB

patch

obsolete

>From 1f4a9a1ae2487b17b7391b0861d9f06732cf376b Mon Sep 17 00:00:00 2001
>From: Yuri Chornoivan <yurchor@ukr.net>
>Date: Sat, 15 Sep 2012 19:04:46 +0300
>Subject: [PATCH] Fix various typos.
>
>---
> install/tools/man/ipa-adtrust-install.1     |    2 +-
> install/tools/man/ipa-replica-manage.1      |    2 +-
> install/ui/test/data/ipa_init.json          |    2 +-
> install/ui/test/data/ipa_init_commands.json |    4 ++--
> install/ui/test/ipa_tests.js                |    4 ++--
> ipa-client/man/default.conf.5               |    2 +-
> ipa-client/man/ipa-client-install.1         |    2 +-
> ipa-client/man/ipa-getkeytab.1              |    2 +-
> ipa-client/man/ipa-join.1                   |    2 +-
> ipa.1                                       |    2 +-
> ipalib/errors.py                            |    2 +-
> ipalib/plugins/automember.py                |    2 +-
> ipalib/plugins/idrange.py                   |    2 +-
> ipalib/plugins/internal.py                  |    2 +-
> ipalib/plugins/sudorule.py                  |    4 ++--
> ipalib/plugins/trust.py                     |    4 ++--
> ipalib/plugins/user.py                      |    2 +-
> ipalib/session.py                           |    4 ++--
> ipapython/log_manager.py                    |    2 +-
> tests/test_xmlrpc/test_attr.py              |    2 +-
> 20 files changed, 25 insertions(+), 25 deletions(-)
>
>diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
>index 936e04c..5303ec2 100644
>--- a/install/tools/man/ipa-adtrust-install.1
>+++ b/install/tools/man/ipa-adtrust-install.1
>@@ -22,7 +22,7 @@ ipa\-adtrust\-install \- Prepare an IPA server to be able to establish trust rel
> .SH "SYNOPSIS"
> ipa\-adtrust\-install [\fIOPTION\fR]...
> .SH "DESCRIPTION"
>-Adds all necesary objects and configuration to allow an IPA server to create a
>+Adds all necessary objects and configuration to allow an IPA server to create a
> trust to an Active Directory domain. This requires that the IPA server is
> already installed and configured.
> .SH "OPTIONS"
>diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
>index 98103ff..2767579 100644
>--- a/install/tools/man/ipa-replica-manage.1
>+++ b/install/tools/man/ipa-replica-manage.1
>@@ -120,7 +120,7 @@ A special user entry is created for the PassSync service. The DN of this entry i
> The following examples use the AD administrator account as the synchronization user. This is not mandatory but the user must have read\-access to the subtree.
> 
> .TP
>-1. Transfer the base64\-encoded Windows AD CA Certficate to your IPA Server
>+1. Transfer the base64\-encoded Windows AD CA Certificate to your IPA Server
> .TP
> 2. Remove any existing kerberos credentials
>   # kdestroy
>diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
>index 9c158d5..0d94d9b 100644
>--- a/install/ui/test/data/ipa_init.json
>+++ b/install/ui/test/data/ipa_init.json
>@@ -110,7 +110,7 @@
>                         "refresh": "Refresh the page.",
>                         "reload": "Reload the browser.",
>                         "main_page": "Return to the main page and retry the operation",
>-                        "title": "An error has occured (${error})"
>+                        "title": "An error has occurred (${error})"
>                     },
>                     "errors": {
>                         "error": "Error",
>diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
>index 4237cc8..2c128f7 100644
>--- a/install/ui/test/data/ipa_init_commands.json
>+++ b/install/ui/test/data/ipa_init_commands.json
>@@ -16780,9 +16780,9 @@
>                     },
>                     {
>                         "class": "Password",
>-                        "doc": "Active directory domain adminstrator's password",
>+                        "doc": "Active directory domain administrator's password",
>                         "flags": [],
>-                        "label": "Active directory domain adminstrator's password",
>+                        "label": "Active directory domain administrator's password",
>                         "name": "realm_passwd",
>                         "noextrawhitespace": true,
>                         "type": "unicode"
>diff --git a/install/ui/test/ipa_tests.js b/install/ui/test/ipa_tests.js
>index 7a2c18b..478196c 100644
>--- a/install/ui/test/ipa_tests.js
>+++ b/install/ui/test/ipa_tests.js
>@@ -110,7 +110,7 @@ test("Testing successful IPA.command().", function() {
> 
>     var xhr = {};
>     var text_status = null;
>-    var error_thrown = {name:'ERROR', message:'An error has occured'};
>+    var error_thrown = {name:'ERROR', message:'An error has occurred'};
> 
>     var ajax_counter = 0;
> 
>@@ -186,7 +186,7 @@ test("Testing unsuccessful IPA.command().", function() {
> 
>     var xhr = {};
>     var text_status = null;
>-    var error_thrown = {name:'ERROR', message:'An error has occured'};
>+    var error_thrown = {name:'ERROR', message:'An error has occurred'};
> 
>     var ajax_counter = 0;
> 
>diff --git a/ipa-client/man/default.conf.5 b/ipa-client/man/default.conf.5
>index ba9b125..f6873de 100644
>--- a/ipa-client/man/default.conf.5
>+++ b/ipa-client/man/default.conf.5
>@@ -90,7 +90,7 @@ When True provides detailed information. Specifically this set the global log le
> loggers matching regexp will be assigned XXX level.
> .IP
> Logger levels can be explicitly specified for specific loggers as
>-opposed to a global logging level. Specific loggers are indiciated
>+opposed to a global logging level. Specific loggers are indicated
> by a list of regular expressions bound to a level. If a logger's
> name matches the regexp then it is assigned that level. This config item
> must begin with "log_logger_level_" and then be
>diff --git a/ipa-client/man/ipa-client-install.1 b/ipa-client/man/ipa-client-install.1
>index ef77f41..382d487 100644
>--- a/ipa-client/man/ipa-client-install.1
>+++ b/ipa-client/man/ipa-client-install.1
>@@ -28,7 +28,7 @@ By default this configures SSSD to connect to an IPA server for authentication a
> 
> An authorized user is required to join a client machine to IPA. This can take the form of a kerberos principal or a one\-time password associated with the machine.
> 
>-This same tool is used to unconfigure IPA and attemps to return the machine to its previous state. Part of this process is to unenroll the host from the IPA server. Unenrollment consists of disabling the prinicipal key on the IPA server so that it may be re\-enrolled. The machine principal in /etc/krb5.keytab (host/<fqdn>@REALM) is used to authenticate to the IPA server to unenroll itself. If this principal does not exist then unenrollment will fail and an administrator will need to disable the host principal (ipa host\-disable <fqdn>).
>+This same tool is used to unconfigure IPA and attempts to return the machine to its previous state. Part of this process is to unenroll the host from the IPA server. Unenrollment consists of disabling the prinicipal key on the IPA server so that it may be re\-enrolled. The machine principal in /etc/krb5.keytab (host/<fqdn>@REALM) is used to authenticate to the IPA server to unenroll itself. If this principal does not exist then unenrollment will fail and an administrator will need to disable the host principal (ipa host\-disable <fqdn>).
> 
> .SS "HOSTNAME REQUIREMENTS"
> Client must use a \fBstatic hostname\fR. If the machine hostname changes for example due to a dynamic hostname assignment by a DHCP server, client enrollment to IPA server breaks and user then would not be able to perform Kerberos authentication.
>diff --git a/ipa-client/man/ipa-getkeytab.1 b/ipa-client/man/ipa-getkeytab.1
>index b967497..ce62d9d 100644
>--- a/ipa-client/man/ipa-getkeytab.1
>+++ b/ipa-client/man/ipa-getkeytab.1
>@@ -47,7 +47,7 @@ example above).
> \fBWARNING:\fR retrieving the keytab resets the secret for the Kerberos principal.
> This renders all other keytabs for that principal invalid.
> 
>-This is used during IPA client enrollement to retrieve a host service principal and store it in /etc/krb5.keytab. It is possible to retrieve the keytab without Kerberos credentials if the host was pre\-created with a one\-time password. The keytab can be retrieved by binding as the host and authenticating with this one\-time password. The \fB\-D|\-\-binddn\fR and \fB\-w|\-\-bindpw\fR options are used for this authentication.
>+This is used during IPA client enrollment to retrieve a host service principal and store it in /etc/krb5.keytab. It is possible to retrieve the keytab without Kerberos credentials if the host was pre\-created with a one\-time password. The keytab can be retrieved by binding as the host and authenticating with this one\-time password. The \fB\-D|\-\-binddn\fR and \fB\-w|\-\-bindpw\fR options are used for this authentication.
> .SH "OPTIONS"
> .TP
> \fB\-s ipaserver\fR
>diff --git a/ipa-client/man/ipa-join.1 b/ipa-client/man/ipa-join.1
>index 49887c7..bd33b16 100644
>--- a/ipa-client/man/ipa-join.1
>+++ b/ipa-client/man/ipa-join.1
>@@ -136,4 +136,4 @@ The exit status is 0 on success, nonzero on error.
> 
> .SH "SEE ALSO"
> .BR ipa-rmkeytab (1)
>-.BR ipa-client-instal (1)
>+.BR ipa-client-install (1)
>diff --git a/ipa.1 b/ipa.1
>index e9946b8..3d998cc 100644
>--- a/ipa.1
>+++ b/ipa.1
>@@ -139,7 +139,7 @@ Display a high\-level list of help topics
> Display documentation and list of commands in the "user" topic.
> .TP
> \fBipa env\fR
>-List IPA enviromental variables and their values.
>+List IPA environmental variables and their values.
> .TP
> \fBipa user\-add foo \-\-first foo \-\-last bar\fR
> Create a new user with username "foo", first name "foo" and last name "bar".
>diff --git a/ipalib/errors.py b/ipalib/errors.py
>index 42181d2..6a4e2c5 100644
>--- a/ipalib/errors.py
>+++ b/ipalib/errors.py
>@@ -446,7 +446,7 @@ class XMLRPCMarshallError(PublicError):
> 
> class RefererError(PublicError):
>     """
>-    **911** Raised when the the request does not contain an HTTP referer
>+    **911** Raised when the request does not contain an HTTP referer
> 
>     For example:
> 
>diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py
>index 4035960..0a7f373 100644
>--- a/ipalib/plugins/automember.py
>+++ b/ipalib/plugins/automember.py
>@@ -29,7 +29,7 @@ __doc__ = _("""
> Auto Membership Rule.
> 
> Bring clarity to the membership of hosts and users by configuring inclusive
>-or exclusive regex paterns, you can automatically assign a new entries into
>+or exclusive regex patterns, you can automatically assign a new entries into
> a group or hostgroup based upon attribute information.
> 
> A rule is directly associated with a group by name, so you cannot create
>diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py
>index 9604e16..3a8b43c 100644
>--- a/ipalib/plugins/idrange.py
>+++ b/ipalib/plugins/idrange.py
>@@ -261,7 +261,7 @@ class idrange_add(LDAPCreate):
>     Additionally
> 
>         --rid-base
>-        --econdary-rid-base
>+        --secondary-rid-base
> 
>     may be given for a new ID range for the local domain while
> 
>diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
>index 09e08be..4dc409c 100644
>--- a/ipalib/plugins/internal.py
>+++ b/ipalib/plugins/internal.py
>@@ -245,7 +245,7 @@ class i18n_messages(Command):
>             "refresh": _("Refresh the page."),
>             "reload": _("Reload the browser."),
>             "main_page": _("Return to the main page and retry the operation"),
>-            "title": _("An error has occured (${error})"),
>+            "title": _("An error has occurred (${error})"),
>         },
>         "errors": {
>             "error": _("Error"),
>diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py
>index 8359c33..1110809 100644
>--- a/ipalib/plugins/sudorule.py
>+++ b/ipalib/plugins/sudorule.py
>@@ -32,9 +32,9 @@ commands as root or another user while providing an audit trail of the
> commands and their arguments.
> 
> FreeIPA provides a means to configure the various aspects of Sudo:
>-   Users: The user(s)/group(s) allowed to envoke Sudo.
>+   Users: The user(s)/group(s) allowed to invoke Sudo.
>    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
>-   Allow Command: The specific command(s) permited to be run via Sudo.
>+   Allow Command: The specific command(s) permitted to be run via Sudo.
>    Deny Command: The specific command(s) prohibited to be run via Sudo.
>    RunAsUser: The user(s) or group(s) of users whose rights Sudo will be invoked with.
>    RunAsGroup: The group(s) whose gid rights Sudo will be invoked with.
>diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py
>index 074560d..9d77549 100644
>--- a/ipalib/plugins/trust.py
>+++ b/ipalib/plugins/trust.py
>@@ -138,7 +138,7 @@ class trust_add(LDAPCreate):
>         ),
>         Password('realm_passwd?',
>             cli_name='password',
>-            label=_("Active directory domain adminstrator's password"),
>+            label=_("Active directory domain administrator's password"),
>             confirm=False,
>         ),
>         Str('realm_server?',
>@@ -299,7 +299,7 @@ class trust_mod(LDAPUpdate):
>     __doc__ = _("""
>     Modify a trust (for future use).
> 
>-    Currently only the default option to modify the LDAP attributes are
>+    Currently only the default option to modify the LDAP attributes is
>     available. More specific options will be added in coming releases.
>     """)
> 
>diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
>index 84a63df..e6eb0d9 100644
>--- a/ipalib/plugins/user.py
>+++ b/ipalib/plugins/user.py
>@@ -56,7 +56,7 @@ about this topic please see: ipa help passwd
> 
> Account lockout on password failure happens per IPA master. The user-status
> command can be used to identify which master the user is locked out on.
>-It is on that master the the administrator must unlock the user.
>+It is on that master the administrator must unlock the user.
> 
> EXAMPLES:
> 
>diff --git a/ipalib/session.py b/ipalib/session.py
>index 87fa448..36beece 100644
>--- a/ipalib/session.py
>+++ b/ipalib/session.py
>@@ -230,7 +230,7 @@ Proposed Solution
> 
> Our interface to the web server is via WSGI which invokes a callback
> per request passing us an environmental context for the request. For
>-this discussion we'll name the the WSGI callback "application()", a
>+this discussion we'll name the WSGI callback "application()", a
> conventional name in WSGI parlance.
> 
> Shared session data will be handled by memcached. We will create one
>@@ -304,7 +304,7 @@ in the future. Session data may not be available because:
> Cookie manipulation is done via the standard Python Cookie module.
> 
> Session cookies will be set to only persist as long as the browser has
>-the session open. They will be tagged so the the browser only returns
>+the session open. They will be tagged so the browser only returns
> the session ID on SSL secured HTTP requests. They will not be visible
> to Javascript in the browser.
> 
>diff --git a/ipapython/log_manager.py b/ipapython/log_manager.py
>index c847142..21e4106 100644
>--- a/ipapython/log_manager.py
>+++ b/ipapython/log_manager.py
>@@ -877,7 +877,7 @@ class LogManager(object):
>           The regular expression comparision is performed with the
>           re.search() function which means the match can be located
>           anywhere in the name string (as opposed to the start of
>-          the the string). Do not forget to escape regular
>+          the string). Do not forget to escape regular
>           expression metacharacters when appropriate. For example
>           dot ('.') is used to seperate loggers in a logging
>           hierarchy path (e.g. a.b.c)
>diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py
>index f5353e1..e1a1070 100644
>--- a/tests/test_xmlrpc/test_attr.py
>+++ b/tests/test_xmlrpc/test_attr.py
>@@ -303,7 +303,7 @@ class test_attr(Declarative):
> 
> 
>         dict(
>-            desc='Set and delete the a phone number for %r' % user1,
>+            desc='Set and delete a phone number for %r' % user1,
>             command=(
>                 'user_mod', [user1], dict(setattr=(u'telephoneNumber=301-555-1212',
>                                                    u'telephoneNumber=202-888-9833'),
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 857466: 612880 | 613307 | 613462