URL: https://github.com/freeipa/freeipa/pull/716
Author: realsobek
 Title: #716: Fix minor typos
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/716/head:pr716
git checkout pr716
From f063b0d4b19cb1f969e00e404cb9a6200bee48db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Genz?= <liebundar...@freenet.de>
Date: Sat, 29 Apr 2017 19:54:09 +0200
Subject: [PATCH 1/2] fix spelling mistake; minor rewording

---
 install/html/browserconfig.html | 10 +++++-----
 ipaserver/install/adtrust.py    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
index 9c5cf68..f1ab764 100644
--- a/install/html/browserconfig.html
+++ b/install/html/browserconfig.html
@@ -91,23 +91,23 @@
                 <p id="config-success" style="display:none">Browser successfully configured</p>
                 <p id="config-aborted" style="display:none">Configuration aborted</p>
                 <p id="config-noext" style="display:none">Configuration was not successful, extension isn't installed or is disabled. Please proceed to step 2.</p>
-                <p id="config-error" style="display:none">Configuration was not successful, unknown error uccured.</p>
+                <p id="config-error" style="display:none">Configuration was not successful, unknown error occurred.</p>
             </div>
 
             <div id="step2b" class="step">
                 <h2>Step 2</h2>
                 <ol>
                     <li>
-                        In the address bar of Firefox, type <code>about:config</code> to display the list of current configuration options.
+                        In the address bar of Firefox, type <code>about:config</code> and press enter to display the list of current configuration options.
                     </li>
                     <li>
-                        In the Filter field, type <code>negotiate</code> to restrict the list of options.
+                        In the Filter field, type <code>network.negotiate-auth.trusted-uris</code> to restrict the list of options.
                     </li>
                     <li>
-                        Double-click the <code>network.negotiate-auth.trusted-uris</code> entry to display the Enter string value dialog box.
+                        Double-click the entry to display the "Enter string value" dialog box.
                     </li>
                     <li>
-                        Enter the name of the domain against which you want to authenticate, for example, <code class="example-domain">.example.com.</code>
+                        Enter the name of the domain against which you want to authenticate, <code class="example-domain">.example.com</code> as an example.
                     </li>
                 </ol>
             </div>
diff --git a/ipaserver/install/adtrust.py b/ipaserver/install/adtrust.py
index 69eae38..967e744 100644
--- a/ipaserver/install/adtrust.py
+++ b/ipaserver/install/adtrust.py
@@ -80,14 +80,14 @@ def retrieve_netbios_name(api):
 
 def set_and_check_netbios_name(netbios_name, unattended, api):
     """
-    Depending if trust in already configured or not a given NetBIOS domain
-    name must be handled differently.
+    Depending on whether trust is already configured or not a given NetBIOS
+    domain name must be handled differently.
 
-    If trust is not configured the given NetBIOS is used or the NetBIOS is
+    If trust is not configured, the given NetBIOS is used. The NetBIOS is
     generated if none was given on the command line.
 
-    If trust is  already configured the given NetBIOS name is used to reset
-    the stored NetBIOS name it it differs from the current one.
+    If trust is already configured, the given NetBIOS name is used to reset
+    the stored NetBIOS name in case it differs from the current one.
     """
 
     cur_netbios_name = None

From 08f6778d52d29daae8f0ab588c94171726d5965d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Genz?= <liebundar...@freenet.de>
Date: Sat, 29 Apr 2017 20:30:21 +0200
Subject: [PATCH 2/2] fix minor spelling mistakes

---
 asn1/asn1c/constr_CHOICE.c                         |  2 +-
 asn1/asn1c/constr_SET_OF.c                         |  2 +-
 client/man/ipa-client-install.1                    |  4 +-
 client/man/ipa.1                                   |  2 +-
 .../ipa-extdom-extop/ipa_extdom_common.c           |  2 +-
 install/tools/ipa-managed-entries                  |  2 +-
 install/tools/man/ipa-adtrust-install.1            |  4 +-
 install/tools/man/ipa-server-install.1             | 54 +++++++++++-----------
 ipaclient/install/client.py                        |  2 +-
 ipaclient/remote_plugins/2_114/dns.py              |  2 +-
 ipaclient/remote_plugins/2_114/idrange.py          |  2 +-
 ipaclient/remote_plugins/2_114/idviews.py          |  2 +
 ipaclient/remote_plugins/2_156/dns.py              |  2 +-
 ipaclient/remote_plugins/2_156/idrange.py          |  2 +-
 ipaclient/remote_plugins/2_156/idviews.py          |  2 +
 ipaclient/remote_plugins/2_164/dns.py              |  2 +-
 ipaclient/remote_plugins/2_164/idrange.py          |  2 +-
 ipaclient/remote_plugins/2_164/idviews.py          |  2 +
 ipaclient/remote_plugins/2_49/idrange.py           |  2 +-
 ipaserver/plugins/baseldap.py                      |  4 +-
 ipaserver/plugins/dns.py                           |  2 +-
 ipaserver/plugins/idrange.py                       |  2 +-
 ipaserver/plugins/idviews.py                       | 10 ++--
 po/README                                          | 14 +++---
 24 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/asn1/asn1c/constr_CHOICE.c b/asn1/asn1c/constr_CHOICE.c
index 7c1b155..adf542c 100644
--- a/asn1/asn1c/constr_CHOICE.c
+++ b/asn1/asn1c/constr_CHOICE.c
@@ -518,7 +518,7 @@ CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			int ret = elm->type->check_constraints(elm->type,
 					memb_ptr, ctfailcb, app_key);
 			/*
-			 * Cannot inherit it eralier:
+			 * Cannot inherit it earlier:
 			 * need to make sure we get the updated version.
 			 */
 			elm->memb_constraints = elm->type->check_constraints;
diff --git a/asn1/asn1c/constr_SET_OF.c b/asn1/asn1c/constr_SET_OF.c
index b68d7ca..5252ca0 100644
--- a/asn1/asn1c/constr_SET_OF.c
+++ b/asn1/asn1c/constr_SET_OF.c
@@ -854,7 +854,7 @@ SET_OF_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 
 	/*
-	 * Cannot inherit it eralier:
+	 * Cannot inherit it earlier:
 	 * need to make sure we get the updated version.
 	 */
 	if(!elm->memb_constraints)
diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
index 319952c..b669b17 100644
--- a/client/man/ipa-client-install.1
+++ b/client/man/ipa-client-install.1
@@ -16,7 +16,7 @@ An authorized user is required to join a client machine to IPA. This can take th
 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 principal 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 "Assumptions"
-The ipa\-client\-install script assumes that the machine has already generated SSH keys. It will not generate SSH keys of its own accord. If SSH keys are not present (e.g when running the ipa\-client\-install in a kickstart, before ever running sshd), they will not be uploaded to the client host entry on the server.
+The ipa\-client\-install script assumes that the machine has already generated SSH keys. It will not generate SSH keys of its own accord. If SSH keys are not present (e.g. when running the ipa\-client\-install in a kickstart, before ever running sshd), they will not be uploaded to the client host entry on the server.
 
 .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.
@@ -53,7 +53,7 @@ There are two method of authenticating a re\-enrollment:
 
 1. You can use \-\-force\-join option with ipa\-client\-install command. This authenticates the re\-enrollment using the admin's credentials provided via the \-w/\-\-password option.
 .br
-2. If providing the admin's password via the command line is not an option (e.g you want to create a script to re\-enroll a host and keep the admin's password secure), you can use backed up keytab from the previous enrollment of this host to authenticate. See \-\-keytab option.
+2. If providing the admin's password via the command line is not an option (e.g. you want to create a script to re\-enroll a host and keep the admin's password secure), you can use backed up keytab from the previous enrollment of this host to authenticate. See \-\-keytab option.
 
 Consequences of the re\-enrollment on the host entry:
 
diff --git a/client/man/ipa.1 b/client/man/ipa.1
index b843e7b..d190677 100644
--- a/client/man/ipa.1
+++ b/client/man/ipa.1
@@ -199,7 +199,7 @@ IPA default configuration file.
 
 1 if an error occurred
 
-2 If an entry is not found
+2 if an entry is not found
 .SH "SEE ALSO"
 ipa\-client\-install(1), ipa\-compat\-manage(1), ipactl(1), ipa\-dns\-install(1),
 ipa\-getcert(1), ipa\-getkeytab(1), ipa\-join(1), ipa\-ldap\-updater(1),
diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c
index fe225fa..750f1ec 100644
--- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c
+++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c
@@ -302,7 +302,7 @@ int parse_request_data(struct berval *req_val, struct extdom_req **_req)
 
     req = calloc(sizeof(struct extdom_req), 1);
     if (req == NULL) {
-        /* Since we return req even in the case of an error we make sure is is
+        /* Since we return req even in the case of an error we make sure it is
          * always safe to call free_req_data() on the returned data. */
         *_req = NULL;
         return LDAP_OPERATIONS_ERROR;
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index 731dcc3..e1ca9da 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -43,7 +43,7 @@ def parse_options():
                       help="DN for the Managed Entry Definition")
     parser.add_option("-l", "--list", dest="list_managed_entries",
                       action="store_true",
-                      help="DN for the Managed Entry Definition")
+                      help="List available Managed Entries")
     parser.add_option("-p", "--password", dest="dirman_password",
                       help="Directory Manager password")
 
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index ef3c23b..308728d 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -102,13 +102,13 @@ version 1.13 on IPA master is required to be able to perform as a trust agent.
 An unattended installation that will never prompt for user input.
 .TP
 \fB\-\-rid-base\fR=\fIRID_BASE\fR
-First RID value of the local domain. The first Posix ID of the local domain will
+First RID value of the local domain. The first POSIX ID of the local domain will
 be assigned to this RID, the second to RID+1 etc. See the online help of the
 idrange CLI for details.
 .TP
 \fB\-\-secondary-rid-base\fR=\fISECONDARY_RID_BASE\fR
 Start value of the secondary RID range, which is only used in the case a user
-and a group share numerically the same Posix ID. See the online help of the
+and a group share numerically the same POSIX ID. See the online help of the
 idrange CLI for details.
 .TP
 \fB\-A\fR, \fB\-\-admin\-name\fR=\fIADMIN_NAME\fR
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index d5d28df..3f46eba 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -15,7 +15,7 @@ Configures the services needed by an IPA server. This includes setting up a Kerb
 \fB\-r\fR \fIREALM_NAME\fR, \fB\-\-realm\fR=\fIREALM_NAME\fR
 The Kerberos realm name for the new IPA deployment.
 
-It is strongly recommended to \fBuse an upper-cased name of the primary DNS domain name\fR of your IPA deployment. You will not be able to estabilish trust with Active Directory unless the realm name is the upper-cased domain name.
+It is strongly recommended to \fBuse an upper-cased name of the primary DNS domain name\fR of your IPA deployment. You will not be able to establish trust with Active Directory unless the realm name is the upper-cased domain name.
 
 The realm name cannot be changed after the installation.
 .TP
@@ -27,26 +27,26 @@ It is strongly recommended to \fBuse a lower-cased name of the IPA Kerberos real
 The primary DNS domain name cannot be changed after the installation.
 .TP
 \fB\-p\fR \fIDM_PASSWORD\fR, \fB\-\-ds\-password\fR=\fIDM_PASSWORD\fR
-The password to be used by the Directory Server for the Directory Manager user
+The password to be used by the Directory Server for the Directory Manager user.
 .TP
 \fB\-a\fR \fIADMIN_PASSWORD\fR, \fB\-\-admin\-password\fR=\fIADMIN_PASSWORD\fR
-The password for the IPA admin user
+The password for the IPA admin user.
 .TP
 \fB\-\-mkhomedir\fR
-Create home directories for users on their first login
+Create home directories for users on their first login.
 .TP
 \fB\-\-hostname\fR=\fIHOST_NAME\fR
 The fully\-qualified DNS name of this server.
 .TP
 \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR
-The IP address of this server. If this address does not match the address the host resolves to and \-\-setup\-dns is not selected the installation will fail. If the server hostname is not resolvable, a record for the hostname and IP_ADDRESS is added to /etc/hosts.
-This this option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
+The IP address of this server. If this address does not match the address the host resolves to and \-\-setup\-dns is not selected, the installation will fail. If the server hostname is not resolvable, a record for the hostname and IP_ADDRESS is added to /etc/hosts.
+This option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
 .TP
 \fB\-N\fR, \fB\-\-no\-ntp\fR
-Do not configure NTP
+Do not configure NTP.
 .TP
 \fB\-\-idstart\fR=\fIIDSTART\fR
-The starting user and group id number (default random)
+The starting user and group id number (default random).
 .TP
 \fB\-\-idmax\fR=\fIIDMAX\fR
 The maximum user and group id number (default: idstart+199999). If set to zero, the default value will be used.
@@ -73,13 +73,13 @@ Do not configure OpenSSH client.
 Do not configure OpenSSH server.
 .TP
 \fB\-d\fR, \fB\-\-debug\fR
-Enable debug logging when more verbose output is needed
+Enable debug logging when more verbose output is needed.
 .TP
 \fB\-U\fR, \fB\-\-unattended\fR
-An unattended installation that will never prompt for user input
+An unattended installation that will never prompt for user input.
 .TP
 \fB\-\-dirsrv\-config\-file\fR
-The path to LDIF file that will be used to modify configuration of dse.ldif during installation of the directory server instance
+The path to LDIF file that will be used to modify configuration of dse.ldif during installation of the directory server instance.
 
 .SS "CERTIFICATE SYSTEM OPTIONS"
 .TP
@@ -105,22 +105,22 @@ File containing the Apache Server SSL certificate and private key. The files are
 File containing the Kerberos KDC SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
 .TP
 \fB\-\-dirsrv\-pin\fR=\fIPIN\fR
-The password to unlock the Directory Server private key
+The password to unlock the Directory Server private key.
 .TP
 \fB\-\-http\-pin\fR=\fIPIN\fR
-The password to unlock the Apache Server private key
+The password to unlock the Apache Server private key.
 .TP
 \fB\-\-pkinit\-pin\fR=\fIPIN\fR
-The password to unlock the Kerberos KDC private key
+The password to unlock the Kerberos KDC private key.
 .TP
 \fB\-\-dirsrv\-cert\-name\fR=\fINAME\fR
-Name of the Directory Server SSL certificate to install
+Name of the Directory Server SSL certificate to install.
 .TP
 \fB\-\-http\-cert\-name\fR=\fINAME\fR
-Name of the Apache Server SSL certificate to install
+Name of the Apache Server SSL certificate to install.
 .TP
 \fB\-\-pkinit\-cert\-name\fR=\fINAME\fR
-Name of the Kerberos KDC SSL certificate to install
+Name of the Kerberos KDC SSL certificate to install.
 .TP
 \fB\-\-ca\-cert\-file\fR=\fIFILE\fR
 File containing the CA certificate of the CA which issued the Directory Server, Apache Server and Kerberos KDC certificates. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times. Use this option if the CA certificate is not present in the certificate files.
@@ -180,16 +180,16 @@ IP address is detected.
 The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones.
 .TP
 \fB\-\-no\-reverse\fR
-Do not create reverse DNS zone
+Do not create reverse DNS zone.
 .TP
 \fB\-\-auto\-reverse\fR
-Try to resolve reverse records and reverse zones for server IP addresses and if neither is resolvable creates these reverse zones.
+Try to resolve reverse records and reverse zones for server IP addresses. If neither is resolvable, creates the reverse zones.
 .TP
 \fB\-\-zonemgr\fR
 The e\-mail address of the DNS zone manager. Defaults to hostmaster@DOMAIN
 .TP
 \fB\-\-no\-host\-dns\fR
-Do not use DNS for hostname lookup during installation
+Do not use DNS for hostname lookup during installation.
 .TP
 \fB\-\-no\-dns\-sshfp\fR
 Do not automatically create DNS SSHFP records.
@@ -198,29 +198,29 @@ Do not automatically create DNS SSHFP records.
 Disable DNSSEC validation on this server.
 .TP
 \fB\-\-allow\-zone\-overlap\fR
-Allow creatin of (reverse) zone even if the zone is already resolvable. Using this option is discouraged as it result in later problems with domain name resolution.
+Allow creation of (reverse) zone even if the zone is already resolvable. Using this option is discouraged as it result in later problems with domain name resolution.
 
-.SS "AD TRUST OPRIONS"
+.SS "AD TRUST OPTIONS"
 
 .TP
 \fB\-\-setup\-adtrust\fR
 Configure AD Trust capability.
 .TP
 \fB\-\-netbios\-name\fR=\fINETBIOS_NAME\fR
-The NetBIOS name for the IPA domain. If not provided then this is determined
+The NetBIOS name for the IPA domain. If not provided, this is determined
 based on the leading component of the DNS domain name. Running
 ipa\-adtrust\-install for a second time with a different NetBIOS name will
 change the name. Please note that changing the NetBIOS name might break
 existing trust relationships to other domains.
 .TP
 \fB\-\-rid-base\fR=\fIRID_BASE\fR
-First RID value of the local domain. The first Posix ID of the local domain will
+First RID value of the local domain. The first POSIX ID of the local domain will
 be assigned to this RID, the second to RID+1 etc. See the online help of the
 idrange CLI for details.
 .TP
 \fB\-\-secondary-rid-base\fR=\fISECONDARY_RID_BASE\fR
 Start value of the secondary RID range, which is only used in the case a user
-and a group share numerically the same Posix ID. See the online help of the
+and a group share numerically the same POSIX ID. See the online help of the
 idrange CLI for details.
 .TP
 \fB\-\-enable\-compat\fR
@@ -249,10 +249,10 @@ path.
 .SS "UNINSTALL OPTIONS"
 .TP
 \fB\-\-uninstall\fR
-Uninstall an existing IPA installation
+Uninstall an existing IPA installation.
 .TP
 \fB\-U\fR, \fB\-\-unattended\fR
-An unattended uninstallation that will never prompt for user input
+An unattended uninstallation that will never prompt for user input.
 
 .SH "DEPRECATED OPTIONS"
 .TP
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 549c9b8..d6598b6 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -261,7 +261,7 @@ def configure_nsswitch_database(fstore, database, services, preserve=True,
     Arguments:
         fstore - FileStore to backup the nsswitch.conf
         database - database configuration that should be ammended,
-                   e.g 'sudoers'
+                   e.g. 'sudoers'
         service - list of services that should be added, e.g. ['sss']
         preserve - if True, the already configured services will be preserved
 
diff --git a/ipaclient/remote_plugins/2_114/dns.py b/ipaclient/remote_plugins/2_114/dns.py
index acb8a65..6260420 100644
--- a/ipaclient/remote_plugins/2_114/dns.py
+++ b/ipaclient/remote_plugins/2_114/dns.py
@@ -187,7 +187,7 @@
    queries, which cannot be answered from its local cache, to configured
    forwarders.
 
- Semantics of the --forwarder-policy option:
+ Semantics of the --forward-policy option:
    * none - disable forwarding for the given zone.
    * first - forward all queries to configured forwarders. If they fail,
    do resolution using DNS root servers.
diff --git a/ipaclient/remote_plugins/2_114/idrange.py b/ipaclient/remote_plugins/2_114/idrange.py
index 2de0687..f81c572 100644
--- a/ipaclient/remote_plugins/2_114/idrange.py
+++ b/ipaclient/remote_plugins/2_114/idrange.py
@@ -55,7 +55,7 @@
 This ID range is then used by the IPA server and the SSSD IPA provider to
 assign Posix UIDs to users from the trusted domain.
 
-If e.g a range for a trusted domain is configured with the following values:
+If e.g. a range for a trusted domain is configured with the following values:
  base-id = 1200000
  range-size = 200000
  rid-base = 0
diff --git a/ipaclient/remote_plugins/2_114/idviews.py b/ipaclient/remote_plugins/2_114/idviews.py
index 6bd422c..7de24dc 100644
--- a/ipaclient/remote_plugins/2_114/idviews.py
+++ b/ipaclient/remote_plugins/2_114/idviews.py
@@ -18,7 +18,9 @@
 
 __doc__ = _("""
 ID Views
+
 Manage ID Views
+
 IPA allows to override certain properties of users and groups per each host.
 This functionality is primarily used to allow migration from older systems or
 other Identity Management solutions.
diff --git a/ipaclient/remote_plugins/2_156/dns.py b/ipaclient/remote_plugins/2_156/dns.py
index bbfaa9f..4ebad93 100644
--- a/ipaclient/remote_plugins/2_156/dns.py
+++ b/ipaclient/remote_plugins/2_156/dns.py
@@ -187,7 +187,7 @@
    queries, which cannot be answered from its local cache, to configured
    forwarders.
 
- Semantics of the --forwarder-policy option:
+ Semantics of the --forward-policy option:
    * none - disable forwarding for the given zone.
    * first - forward all queries to configured forwarders. If they fail,
    do resolution using DNS root servers.
diff --git a/ipaclient/remote_plugins/2_156/idrange.py b/ipaclient/remote_plugins/2_156/idrange.py
index e4f4728..722ee74 100644
--- a/ipaclient/remote_plugins/2_156/idrange.py
+++ b/ipaclient/remote_plugins/2_156/idrange.py
@@ -55,7 +55,7 @@
 This ID range is then used by the IPA server and the SSSD IPA provider to
 assign Posix UIDs to users from the trusted domain.
 
-If e.g a range for a trusted domain is configured with the following values:
+If e.g. a range for a trusted domain is configured with the following values:
  base-id = 1200000
  range-size = 200000
  rid-base = 0
diff --git a/ipaclient/remote_plugins/2_156/idviews.py b/ipaclient/remote_plugins/2_156/idviews.py
index 2b34cba..cf07ceb 100644
--- a/ipaclient/remote_plugins/2_156/idviews.py
+++ b/ipaclient/remote_plugins/2_156/idviews.py
@@ -18,7 +18,9 @@
 
 __doc__ = _("""
 ID Views
+
 Manage ID Views
+
 IPA allows to override certain properties of users and groups per each host.
 This functionality is primarily used to allow migration from older systems or
 other Identity Management solutions.
diff --git a/ipaclient/remote_plugins/2_164/dns.py b/ipaclient/remote_plugins/2_164/dns.py
index 244be87..f5adb4d 100644
--- a/ipaclient/remote_plugins/2_164/dns.py
+++ b/ipaclient/remote_plugins/2_164/dns.py
@@ -187,7 +187,7 @@
    queries, which cannot be answered from its local cache, to configured
    forwarders.
 
- Semantics of the --forwarder-policy option:
+ Semantics of the --forward-policy option:
    * none - disable forwarding for the given zone.
    * first - forward all queries to configured forwarders. If they fail,
    do resolution using DNS root servers.
diff --git a/ipaclient/remote_plugins/2_164/idrange.py b/ipaclient/remote_plugins/2_164/idrange.py
index e4f4728..722ee74 100644
--- a/ipaclient/remote_plugins/2_164/idrange.py
+++ b/ipaclient/remote_plugins/2_164/idrange.py
@@ -55,7 +55,7 @@
 This ID range is then used by the IPA server and the SSSD IPA provider to
 assign Posix UIDs to users from the trusted domain.
 
-If e.g a range for a trusted domain is configured with the following values:
+If e.g. a range for a trusted domain is configured with the following values:
  base-id = 1200000
  range-size = 200000
  rid-base = 0
diff --git a/ipaclient/remote_plugins/2_164/idviews.py b/ipaclient/remote_plugins/2_164/idviews.py
index 2b34cba..cf07ceb 100644
--- a/ipaclient/remote_plugins/2_164/idviews.py
+++ b/ipaclient/remote_plugins/2_164/idviews.py
@@ -18,7 +18,9 @@
 
 __doc__ = _("""
 ID Views
+
 Manage ID Views
+
 IPA allows to override certain properties of users and groups per each host.
 This functionality is primarily used to allow migration from older systems or
 other Identity Management solutions.
diff --git a/ipaclient/remote_plugins/2_49/idrange.py b/ipaclient/remote_plugins/2_49/idrange.py
index 5b2c109..0dd1fef 100644
--- a/ipaclient/remote_plugins/2_49/idrange.py
+++ b/ipaclient/remote_plugins/2_49/idrange.py
@@ -55,7 +55,7 @@
 This ID range is then used by the IPA server and the SSSD IPA provider to
 assign Posix UIDs to users from the trusted domain.
 
-If e.g a range for a trusted domain is configured with the following values:
+If e.g. a range for a trusted domain is configured with the following values:
  base-id = 1200000
  range-size = 200000
  rid-base = 0
diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py
index dbe3cbd..560810b 100644
--- a/ipaserver/plugins/baseldap.py
+++ b/ipaserver/plugins/baseldap.py
@@ -375,7 +375,7 @@ def add_external_post_callback(ldap, dn, entry_attrs, failed, completed,
         membertype - the object type of the member (e.g. host)
         externalattr - the attribute name that IPA uses to store the membership
                        of the entries that are not managed by IPA
-                       (e.g externalhost)
+                       (e.g. externalhost)
 
     Returns the number of completed entries so far (the number of entries
     handled by IPA incremented by the number of handled external entries) and
@@ -445,7 +445,7 @@ def remove_external_post_callback(ldap, dn, entry_attrs, failed, completed,
         membertype - the object type of the member (e.g. host)
         externalattr - the attribute name that IPA uses to store the membership
                        of the entries that are not managed by IPA
-                       (e.g externalhost)
+                       (e.g. externalhost)
 
     Returns the number of completed entries so far (the number of entries
     handled by IPA incremented by the number of handled external entries) and
diff --git a/ipaserver/plugins/dns.py b/ipaserver/plugins/dns.py
index 47ac963..05b4c00 100644
--- a/ipaserver/plugins/dns.py
+++ b/ipaserver/plugins/dns.py
@@ -259,7 +259,7 @@
    queries, which cannot be answered from its local cache, to configured
    forwarders.
 """) + _("""
- Semantics of the --forwarder-policy option:
+ Semantics of the --forward-policy option:
    * none - disable forwarding for the given zone.
    * first - forward all queries to configured forwarders. If they fail,
    do resolution using DNS root servers.
diff --git a/ipaserver/plugins/idrange.py b/ipaserver/plugins/idrange.py
index c8ea95a..49d98d2 100644
--- a/ipaserver/plugins/idrange.py
+++ b/ipaserver/plugins/idrange.py
@@ -92,7 +92,7 @@
 This ID range is then used by the IPA server and the SSSD IPA provider to
 assign Posix UIDs to users from the trusted domain.
 
-If e.g a range for a trusted domain is configured with the following values:
+If e.g. a range for a trusted domain is configured with the following values:
  base-id = 1200000
  range-size = 200000
  rid-base = 0
diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py
index b5ee32c..3cc7762 100644
--- a/ipaserver/plugins/idviews.py
+++ b/ipaserver/plugins/idviews.py
@@ -54,7 +54,9 @@
 
 __doc__ = _("""
 ID Views
+
 Manage ID Views
+
 IPA allows to override certain properties of users and groups per each host.
 This functionality is primarily used to allow migration from older systems or
 other Identity Management solutions.
@@ -357,7 +359,7 @@ def execute(self, *keys, **options):
 
                 ldap.update_entry(host_entry)
 
-                # If no exception was raised, view assigment went well
+                # If no exception was raised, view assignment went well
                 completed = completed + 1
                 succeeded['host'].append(host)
             except errors.EmptyModlist:
@@ -527,7 +529,7 @@ def resolve_object_to_anchor(ldap, obj_type, obj, fallback_to_ldap):
     Takes options:
         ldap - the backend
         obj_type - either 'user' or 'group'
-        obj - the name of the object, e.g 'admin' or 'testuser'
+        obj - the name of the object, e.g. 'admin' or 'testuser'
     """
 
     try:
@@ -546,7 +548,7 @@ def resolve_object_to_anchor(ldap, obj_type, obj, fallback_to_ldap):
         if required_objectclass not in entry['objectclass']:
             raise errors.ValidationError(
                     name=_('IPA object'),
-                    error=_('system IPA objects (e.g system groups, user '
+                    error=_('system IPA objects (e.g. system groups, user '
                             'private groups) cannot be overridden')
                 )
 
@@ -559,7 +561,7 @@ def resolve_object_to_anchor(ldap, obj_type, obj, fallback_to_ldap):
     except errors.NotFound:
         pass
 
-    # If not successfull, try looking up the object in the trusted domain
+    # If not successful, try looking up the object in the trusted domain
     try:
         if _dcerpc_bindings_installed:
             domain_validator = ipaserver.dcerpc.DomainValidator(api)
diff --git a/po/README b/po/README
index 2ba0348..9463049 100644
--- a/po/README
+++ b/po/README
@@ -22,14 +22,14 @@ A: Edit the LINGUAS file and add the new language. Then run "make create-po".
    certain languages, you may have to edit the Plurals line.  See:
    http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
    However, if this line is wrong, it is often an indicator that the locale
-   value is incorrect.  For example, using 'jp' for Japanese in stead of 'ja'
+   value is incorrect.  For example, using 'jp' for Japanese instead of 'ja'
    will result in an invalid Plurals line.
 
 Q: What files must be under source code control?
 
 A: The files Makefile.in, LINGUAS control the build, they must be in the SCM.
    The *.pot file contains list of translatable strings and can be re-generated
-   at any time from program sources, so is does not need to be in SCM.
+   at any time from program sources, so it does not need to be in SCM.
    *.po files contain snapshot of translated strings so they must be in SCM
    for the case where translation service we use goes down.
 
@@ -41,7 +41,7 @@ A: The files Makefile.in, LINGUAS control the build, they must be in the SCM.
    If there is a conflict, you should generate new pot file,
    upload it do the translation service, and re-download the po files.
 
-Q: Which are automatically generated and thus do not need to be in SCM?
+Q: Which files are automatically generated and thus do not need to be in SCM?
 
 A: *.pot files are automatically generated from program sources.
    The *.gmo files are automatically generated on demand from their
@@ -69,7 +69,7 @@ A: A .po file contains the translations for particular language. It derives
    Today the work is done inside translation service Zanata so the .po files
    are kept in SCM just for the case of failure in the translation service.
 
-Q: What is the transation workflow?
+Q: What is the translation workflow?
    Let's use an example for French, it's .po file will be fr.po.
 
    1)  Developer creates main.c with one translatable sting _("Begin").
@@ -78,14 +78,14 @@ Q: What is the transation workflow?
 
    3)  .pot file contains one msgid, "Begin".
 
-   4)  Maintainer uploads .pot file is to Zanata translation service:
+   4)  Maintainer uploads .pot file to Zanata translation service:
        $ zanata-cli push
        (all the parameters are taken from zanata.xml file)
 
    5)  Translator uses Zanata service to provide the French translation
        of "Begin".
 
-   5)  Maintainer download fr.po is generated by Zanata service,
+   5)  Maintainer downloads fr.po as generated by Zanata service,
        it also contains one msgid, "Begin".
        $ zanata-cli pull
 
@@ -100,7 +100,7 @@ Q: What are .gmo files?
 A: .gmo files are the content of a .po file but in "machine" format for fast
    run time access (mo = Machine Object, po = Portable Object). .mo files are
    what gets installed along with the package. Think of a .po as a source file
-   which is compiled into a object file for run time use.
+   which is compiled into an object file for run time use.
 
 Credits:
 - GNU project
-- 
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