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 703691c605b39e08ce3aff4623c90edafa0bca53 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 13:52:44 +0200
Subject: [PATCH 01/25] fix minor typo in ipa-adtrust-install.1
---
install/tools/man/ipa-adtrust-install.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index ef3c23b..464bbfa 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -26,7 +26,7 @@ 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.
-Please note you will not be able to estabilish an trust to an Active Directory
+Please note you will not be able to establish an trust to an Active Directory
domain unless the realm name of the IPA server matches its domain name.
ipa\-adtrust\-install can be run multiple times to reinstall deleted objects or
From 9226f80f8c397eecc76654f6f74faf53bc0076a2 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 15:09:32 +0200
Subject: [PATCH 02/25] fix output of `ipa-managed-entries --help`
New string for '-l, --list' option taken from `man 1 ipa-managed-entries`.
Branches 4-4 and 4-5 are affected too. Shall I create separate pull requests for them?
---
install/tools/ipa-managed-entries | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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")
From 926206023dde0cb7b49fb8060f651682bec26731 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 15:14:19 +0200
Subject: [PATCH 03/25] fix minor typo in install/html/browserconfig.html
---
install/html/browserconfig.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
index 9c5cf68..d3c8d1c 100644
--- a/install/html/browserconfig.html
+++ b/install/html/browserconfig.html
@@ -91,7 +91,7 @@
<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">
From c944abf98952c9a44f598131f4e3e91c2d859d76 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 15:19:39 +0200
Subject: [PATCH 04/25] rewording of firefox browser configuration
on CentOS 7 with firefox-52.0-4 authentication with 'example.com.' did not work; with 'example.com' it did
---
install/html/browserconfig.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
index d3c8d1c..f1ab764 100644
--- a/install/html/browserconfig.html
+++ b/install/html/browserconfig.html
@@ -98,16 +98,16 @@
<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>
From 6d1e6e48400a6db9c1cf58bcfa863da2e36545d9 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 17:57:57 +0200
Subject: [PATCH 05/25] Update ipa-adtrust-install.1
---
install/tools/man/ipa-adtrust-install.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index 464bbfa..ed02ae5 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
From 69e72cb6584d5dfc65c60e2bcdb3186b1cc37d99 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 20:08:11 +0200
Subject: [PATCH 06/25] remove surplus 'this' in ipa-server-install.1
---
install/tools/man/ipa-server-install.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index d5d28df..04b5542 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -40,7 +40,7 @@ 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).
+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
From f99056c039452c27021373cc5984ca4508beb113 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 20:19:17 +0200
Subject: [PATCH 07/25] add full stops
---
install/tools/man/ipa-server-install.1 | 36 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index 04b5542..730797b 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -27,13 +27,13 @@ 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.
@@ -43,10 +43,10 @@ The IP address of this server. If this address does not match the address the ho
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,7 +180,7 @@ 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.
@@ -189,7 +189,7 @@ Try to resolve reverse records and reverse zones for server IP addresses and if
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.
@@ -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
From 993158f7cd4f526b6764f43def803388b92d2eaf Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 20:45:55 +0200
Subject: [PATCH 08/25] minor typo fixes
---
install/tools/man/ipa-server-install.1 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index 730797b..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
@@ -39,7 +39,7 @@ Create home directories for users on their first login.
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.
+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
@@ -183,7 +183,7 @@ The reverse DNS zone to use. This option can be used multiple times to specify m
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
@@ -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
From 612afbf1a8eef6e186a66a64189d7fba08cc3005 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 22:47:47 +0200
Subject: [PATCH 09/25] fix option name
---
po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 1388bed..02b3a37 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10510,7 +10510,7 @@ msgstr ""
msgid ""
"\n"
-" Semantics of the --forwarder-policy option:\n"
+" Semantics of the --forward-policy option:\n"
" * none - disable forwarding for the given zone.\n"
" * first - forward all queries to configured forwarders. If they fail,\n"
" do resolution using DNS root servers.\n"
@@ -10518,7 +10518,7 @@ msgid ""
" return failure.\n"
msgstr ""
"\n"
-" Sémantique de l'option --forwarder-policy :\n"
+" Sémantique de l'option --forward-policy :\n"
" * none - désactive la redirection pour la zone donnée.\n"
" * first - redirige toutes les requêtes vers les redirecteurs "
"configurés.\n"
From 87e552172d92c9b6e805887896cc359463c353e6 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 22:53:42 +0200
Subject: [PATCH 10/25] use correct option name
---
ipaserver/plugins/dns.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
From abc88a43748a55c944aa22d02beec0368c530e7f Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 22:54:54 +0200
Subject: [PATCH 11/25] use correct option name
---
ipaclient/remote_plugins/2_114/dns.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
From 8bba863368f9f25c736ca1e76f3f23369aabcc2f Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 22:55:42 +0200
Subject: [PATCH 12/25] use correct option name
---
ipaclient/remote_plugins/2_156/dns.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
From 6732eea42fc607fe9ab6db960b960877d8c01117 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sat, 15 Apr 2017 22:56:23 +0200
Subject: [PATCH 13/25] user correct option name
---
ipaclient/remote_plugins/2_164/dns.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
From cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72 Mon Sep 17 00:00:00 2001
From: user <user@e5720.Speedport_W_724V_Typ_A_05011603_05_020>
Date: Sat, 15 Apr 2017 23:03:19 +0200
Subject: [PATCH 14/25] use correct option name
---
po/uk.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 720ca2e..4669fcb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11044,7 +11044,7 @@ msgstr ""
msgid ""
"\n"
-" Semantics of the --forwarder-policy option:\n"
+" Semantics of the --forward-policy option:\n"
" * none - disable forwarding for the given zone.\n"
" * first - forward all queries to configured forwarders. If they fail,\n"
" do resolution using DNS root servers.\n"
@@ -11052,7 +11052,7 @@ msgid ""
" return failure.\n"
msgstr ""
"\n"
-" Семантика параметра --forwarder-policy:\n"
+" Семантика параметра --forward-policy:\n"
" * none — вимкнути переспрямовування для вказаної зони.\n"
" * first — спрямувати усі запити до налаштованих переспрямовувачів. Якщо\n"
" це не спрацює, виконати перетворення за допомогою кореневих серверів "
@@ -23359,7 +23359,7 @@ msgid ""
" queries, which cannot be answered from its local cache, to configured\n"
" forwarders.\n"
"\n"
-" Semantics of the --forwarder-policy option:\n"
+" Semantics of the --forward-policy option:\n"
" * none - disable forwarding for the given zone.\n"
" * first - forward all queries to configured forwarders. If they fail,\n"
" do resolution using DNS root servers.\n"
@@ -23617,7 +23617,7 @@ msgstr ""
"кешу, до\n"
" налаштованих переспрямовувачів.\n"
"\n"
-" Семантика параметра --forwarder-policy:\n"
+" Семантика параметра --forward-policy:\n"
" * none — вимкнути переспрямовування для вказаної зони.\n"
" * first — спрямувати усі запити до налаштованих переспрямовувачів. Якщо\n"
" це не спрацює, виконати перетворення за допомогою кореневих серверів "
From 1a3c59a250ee799af90087e8def8144455006171 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 15:54:05 +0200
Subject: [PATCH 15/25] Update ipa.1
---
client/man/ipa.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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),
From c53b8824f51343d9a17bc48c8bd1e345e9246bcf Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 17:44:10 +0200
Subject: [PATCH 16/25] enter empty lines to be consistent
---
ipaclient/remote_plugins/2_114/idviews.py | 2 ++
1 file changed, 2 insertions(+)
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.
From f6ee14454a94182293a98f1e10e2ece9881dcac7 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 17:45:51 +0200
Subject: [PATCH 17/25] enter empty lines to be consistent
---
ipaclient/remote_plugins/2_156/idviews.py | 2 ++
1 file changed, 2 insertions(+)
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.
From bdece6779f83dbebba27cd0f3af86ca9c13e9b97 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 17:46:33 +0200
Subject: [PATCH 18/25] enter empty lines to be consistent
---
ipaclient/remote_plugins/2_164/idviews.py | 2 ++
1 file changed, 2 insertions(+)
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.
From 020417517f7dc03403714bd63b613ef2b5afaca9 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 17:47:21 +0200
Subject: [PATCH 19/25] enter empty lines to be consistent
---
ipaserver/plugins/idviews.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py
index b5ee32c..622c0ae 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.
From 8f65b4be0d27f735736b9abc5cfc65b42e694990 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 18:00:46 +0200
Subject: [PATCH 20/25] fix minor typos
---
ipaserver/plugins/idviews.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py
index 622c0ae..3cc7762 100644
--- a/ipaserver/plugins/idviews.py
+++ b/ipaserver/plugins/idviews.py
@@ -359,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:
@@ -529,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:
@@ -548,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')
)
@@ -561,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)
From 1e66420a4284aca9055e02767bc7c7aee6a17081 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 18:03:36 +0200
Subject: [PATCH 21/25] add empty lines to be consistent
---
po/fr.po | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/po/fr.po b/po/fr.po
index 02b3a37..b7b7643 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7478,7 +7478,9 @@ msgstr "Dictionnaire de messages I18N"
msgid ""
"\n"
"ID Views\n"
+"\n"
"Manage ID Views\n"
+"\n"
"IPA allows to override certain properties of users and groups per each "
"host.\n"
"This functionality is primarily used to allow migration from older systems "
@@ -7487,7 +7489,9 @@ msgid ""
msgstr ""
"\n"
"Vues d'identifiants\n"
+"\n"
"Gestion des vues d'identifiants\n"
+"\n"
"IPA permet de surcharger certaines propriétés des utilisateurs et groupes "
"par hôte.\n"
"Cette fonctionnalité est principalement utilisée dans les situations de "
From 2c3db7b6645868d8d41b8bf6039228214f4f6660 Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 18:21:10 +0200
Subject: [PATCH 22/25] add empty lines to be consistent
---
po/uk.po | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/po/uk.po b/po/uk.po
index 4669fcb..a53068e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7998,7 +7998,9 @@ msgstr "Словник перекладених повідомлень"
msgid ""
"\n"
"ID Views\n"
+"\n"
"Manage ID Views\n"
+"\n"
"IPA allows to override certain properties of users and groups per each "
"host.\n"
"This functionality is primarily used to allow migration from older systems "
@@ -8007,7 +8009,9 @@ msgid ""
msgstr ""
"\n"
"Перегляди ідентифікаторів\n"
+"\n"
"Керування переглядами ідентифікаторів\n"
+"\n"
"IPA надає вам змогу перевизначити певні властивості записів користувачів та "
"груп для окремих вузлів.\n"
"В основному, ці функціональні можливості призначено для уможливлення "
From 3a64da6a52d4e92b8084dafa7387332ba8de42cb Mon Sep 17 00:00:00 2001
From: realsobek <liebundar...@freenet.de>
Date: Sun, 16 Apr 2017 22:03:06 +0200
Subject: [PATCH 23/25] add missing dot to abbreviation
---
client/man/ipa-client-install.1 | 4 ++--
ipaclient/install/client.py | 2 +-
ipaclient/remote_plugins/2_114/idrange.py | 2 +-
ipaclient/remote_plugins/2_156/idrange.py | 2 +-
ipaclient/remote_plugins/2_164/idrange.py | 2 +-
ipaclient/remote_plugins/2_49/idrange.py | 2 +-
ipaserver/plugins/baseldap.py | 4 ++--
ipaserver/plugins/idrange.py | 2 +-
po/fr.po | 6 +++---
po/uk.po | 10 +++++-----
po/zh_CN.po | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
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/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/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_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_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_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/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/po/fr.po b/po/fr.po
index 1388bed..7be7b1e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7666,7 +7666,7 @@ msgid "IPA object"
msgstr "objet IPA"
msgid ""
-"system IPA objects (e.g system groups, user private groups) cannot be "
+"system IPA objects (e.g. system groups, user private groups) cannot be "
"overridden"
msgstr ""
"les objets systèmes IPA (c'est à dire les groupes et groupes privés "
@@ -7892,7 +7892,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
@@ -17990,7 +17990,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
diff --git a/po/uk.po b/po/uk.po
index a53068e..ef314a1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8190,7 +8190,7 @@ msgid "IPA object"
msgstr "Об’єкт IPA"
msgid ""
-"system IPA objects (e.g system groups, user private groups) cannot be "
+"system IPA objects (e.g. system groups, user private groups) cannot be "
"overridden"
msgstr ""
"системні об’єкти IPA (наприклад системні групи, приватні групи користувачів) "
@@ -8423,7 +8423,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
@@ -21022,7 +21022,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
@@ -25148,7 +25148,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
@@ -27157,7 +27157,7 @@ msgid ""
"This ID range is then used by the IPA server and the SSSD IPA provider to\n"
"assign Posix UIDs to users from the trusted domain.\n"
"\n"
-"If e.g a range for a trusted domain is configured with the following "
+"If e.g. a range for a trusted domain is configured with the following "
"values:\n"
" base-id = 1200000\n"
" range-size = 200000\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79a22c8..df721c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5374,7 +5374,7 @@ msgid "IPA object"
msgstr "IPA对象"
msgid ""
-"system IPA objects (e.g system groups, user private groups) cannot be "
+"system IPA objects (e.g. system groups, user private groups) cannot be "
"overridden"
msgstr "系统IPA对象（例如：系统用户组，用户私有组）不能被覆盖"
From 5911fc7c042e7c2a93cbe1b738e88d064653f77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Genz?= <liebundar...@freenet.de>
Date: Sun, 23 Apr 2017 21:32:42 +0200
Subject: [PATCH 24/25] Revert "use correct option name"
This reverts commit cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72.
---
po/uk.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index ef314a1..a9379c9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11048,7 +11048,7 @@ msgstr ""
msgid ""
"\n"
-" Semantics of the --forward-policy option:\n"
+" Semantics of the --forwarder-policy option:\n"
" * none - disable forwarding for the given zone.\n"
" * first - forward all queries to configured forwarders. If they fail,\n"
" do resolution using DNS root servers.\n"
@@ -11056,7 +11056,7 @@ msgid ""
" return failure.\n"
msgstr ""
"\n"
-" Семантика параметра --forward-policy:\n"
+" Семантика параметра --forwarder-policy:\n"
" * none — вимкнути переспрямовування для вказаної зони.\n"
" * first — спрямувати усі запити до налаштованих переспрямовувачів. Якщо\n"
" це не спрацює, виконати перетворення за допомогою кореневих серверів "
@@ -23363,7 +23363,7 @@ msgid ""
" queries, which cannot be answered from its local cache, to configured\n"
" forwarders.\n"
"\n"
-" Semantics of the --forward-policy option:\n"
+" Semantics of the --forwarder-policy option:\n"
" * none - disable forwarding for the given zone.\n"
" * first - forward all queries to configured forwarders. If they fail,\n"
" do resolution using DNS root servers.\n"
@@ -23621,7 +23621,7 @@ msgstr ""
"кешу, до\n"
" налаштованих переспрямовувачів.\n"
"\n"
-" Семантика параметра --forward-policy:\n"
+" Семантика параметра --forwarder-policy:\n"
" * none — вимкнути переспрямовування для вказаної зони.\n"
" * first — спрямувати усі запити до налаштованих переспрямовувачів. Якщо\n"
" це не спрацює, виконати перетворення за допомогою кореневих серверів "
From 391a2898bf4119e2dd048fc6957fe0a90e70884b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Genz?= <liebundar...@freenet.de>
Date: Sun, 23 Apr 2017 21:44:28 +0200
Subject: [PATCH 25/25] some more minor typo fixes
---
install/tools/man/ipa-adtrust-install.1 | 2 +-
po/README | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index ed02ae5..b110658 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -26,7 +26,7 @@ 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.
-Please note you will not be able to establish an trust to an Active Directory
+Please note you will not be able to establish a trust to an Active Directory
domain unless the realm name of the IPA server matches its domain name.
ipa\-adtrust\-install can be run multiple times to reinstall deleted objects or
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
