[Freeipa-devel] [freeipa PR#716][comment] Fix minor typos

[realsobek]

  URL: https://github.com/freeipa/freeipa/pull/716
Title: #716: Fix minor typos

realsobek commented:
"""
Thank you for guiding me. :)

> There are no tickets associated with these changes.

In the sense of:
http://www.freeipa.org/page/Contribute/Code#Update_Trac_ticket
I consider my code changes small and omitted the ticket.
Shall I create a ticket to associate the changes with?


> Do not change --forwarder-* to --forward-* because you are dealing with 
> well-known DNS term here, not a simple word.

As far as I can see in FreeIPA there is no '--forwarder-policy' option. 
'--forward-policy' and '--forwarder' options are present.


> Please normalize your From: line to be from the same email address.

That is my fault.
It is fixed in my fork now, but the change is not reflected in the pull 
request. How can I fix this?

What I did to fix the author of the commit on my computer:
$ cd freeipa ; git checkout fix-uk-forwarder-policy
$ git log # output has been shortened manually
commit 2c3db7b6645868d8d41b8bf6039228214f4f6660
realsobek
add empty lines to be consistent
commit cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72
user
use correct option name
commit 703691c605b39e08ce3aff4623c90edafa0bca53
realsobek
fix minor typo in ipa-adtrust-install.1
$ git rebase -i -p 703691c605b39e08ce3aff4623c90edafa0bca53 # change file to:
edit cb4250af
keep 2c3db7b6

Stopped at cb4250afda73a1ad3b3fb1d8a94f04b6dd944c72...

$ git commit --amend --reset-author
[detached HEAD 23a1023] use correct option name
 1 file changed, 4 insertions(+), 4 deletions(-)

$ git rebase --continue
Successfully rebased and updated refs/heads/fix-uk-forwarder-policy.

$ git log # output has been shortened manually
commit 7aa5ce36bd98dd8bafa06fe962ae994cad585c51
realsobek
add empty lines to be consistent
commit 23a1023100c969e2d3b2482f991a707349233bd0
realsobek
use correct option name
commit 703691c605b39e08ce3aff4623c90edafa0bca53
realsobek
fix minor typo in ipa-adtrust-install.1

$ git commit -a
On branch fix-uk-forwarder-policy
Your branch and 'origin/fix-uk-forwarder-policy' have diverged,
and have 2 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean

$ git push
To https://github.com/realsobek/freeipa.git
 ! [rejected]fix-uk-forwarder-policy -> fix-uk-forwarder-policy 
(non-fast-forward)
error: failed to push some refs to 'https://github.com/realsobek/freeipa.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git push -f
Counting objects: 8, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (8/8), 892 bytes | 0 bytes/s, done.
Total 8 (delta 6), reused 3 (delta 3)
remote: Resolving deltas: 100% (6/6), completed with 3 local objects.
To https://github.com/realsobek/freeipa.git
 + 2c3db7b...7aa5ce3 fix-uk-forwarder-policy -> fix-uk-forwarder-policy (forced 
update)


> Updates to translations should be done via ...

I will do after the '--forwarder-policy' discussion is resolved.


> Change like plugable -> pluggable ...

No normal sentence, it is all code.
Maybe it can be changed in the future with the release of a major new version?
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-294603758
-- 
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

[Freeipa-devel] [freeipa PR#715][synchronized] use correct option name

[realsobek]

   URL: https://github.com/freeipa/freeipa/pull/715
Author: realsobek
 Title: #715: use correct option name
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/715/head:pr715
git checkout pr715
From 703691c605b39e08ce3aff4623c90edafa0bca53 Mon Sep 17 00:00:00 2001
From: realsobek 
Date: Sat, 15 Apr 2017 13:52:44 +0200
Subject: [PATCH 1/3] 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 23a1023100c969e2d3b2482f991a707349233bd0 Mon Sep 17 00:00:00 2001
From: realsobek 
Date: Mon, 17 Apr 2017 22:37:20 +0200
Subject: [PATCH 2/3] 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 7aa5ce36bd98dd8bafa06fe962ae994cad585c51 Mon Sep 17 00:00:00 2001
From: realsobek 
Date: Sun, 16 Apr 2017 18:21:10 +0200
Subject: [PATCH 3/3] 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"
 "В основному, ці функціональні можливості призначено для уможливлення "
-- 
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