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

[stlaz]

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

stlaz commented:
"""
I asked today at a meeting and the `ipaclient/remote_plugins/2_*/*.py` changes 
are fine. If you could possibly change the one small issue, we will finally be 
able tu push this :)
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-301492072
-- 
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#716][comment] Fix minor typos

[stlaz]

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

stlaz commented:
"""
Except for the one change I pointed out, this is all OK with me. The only thing 
I am not sure is whether we can go changing the doc texts in 
`ipaclient/remote_plugins/2_*/*.py` since these are kept for backward 
compatibility but I hope someone can clear this out for me.
If you could possibly remove the change at the line I noted, I will ACK this as 
soon as we can be sure about those changes in the `remote_plugins/` directory.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-299122208
-- 
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#716][comment] Fix minor typos

[realsobek]

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

realsobek commented:
"""
For some commits the titles were the same, but the contents were different. 
That was due to my working habit.
The messy `git log` output was due to my attempts to fix the problems.
`git rebase -i HEAD~27` worked wonders to beautify the commits. I can squash 
the two remaining commits, if required.
`git push  newbranch:fix-minor-typos` worked fine too.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-298194339
-- 
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#716][comment] Fix minor typos

[stlaz]

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

stlaz commented:
"""
Please, see what `git rebase -i master` will do for you, along with `git commit 
--amend --author="Author Name "`.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-296531382
-- 
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#716][comment] Fix minor typos

[stlaz]

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

stlaz commented:
"""
Please, see what `git rebase -i master` will do for you, along with `git commit 
--amend --author="Author Name "`.

**edit:** I see a lot of confusion in your commits in this PR, some commits 
appear multiple times, there are revert and merge commits and that makes this 
PR simply unmergable. Please not that you don't have to make a new PR, but you 
can make a new local branch with the changes you want and simply do `git push 
 newbranch:fix-minor-typos`
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-296531382
-- 
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#716][comment] Fix minor typos

[stlaz]

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

stlaz commented:
"""
Please, see what `git rebase -i master` will do for you.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-296531382
-- 
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#716][comment] Fix minor typos

[stlaz]

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

stlaz commented:
"""
Please, see what `git rebase -i master` will do for you.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-296531382
-- 
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#716][comment] Fix minor typos

[realsobek]

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

realsobek commented:
"""
I cannot get rid of commit cb4250a to normalize `From:`. Hence I am going to 
close this PR soon. Afterwards I will create a new branch in my fork, copy all 
changes (excluding changes to PO files) to it and open a new PR.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-296491394
-- 
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#716][comment] Fix minor typos

[realsobek]

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

realsobek commented:
"""
> There are no tickets associated with these changes.
On the other hand, if the ticket is required for giving attribution, I will 
create it.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-294957570
-- 
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#716][comment] Fix minor typos

[realsobek]

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

realsobek commented:
"""
> There are no tickets associated with these changes.
On the other hand, if the ticket is required for giving attribution, I will 
create it.
"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-294957570
-- 
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#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#716][comment] Fix minor typos

[abbra]

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

abbra commented:
"""
Thanks for this pull request.

There are no tickets associated with these changes.

The changes themselves are controversial. Do not change `--forwarder-*` to 
`--forward-*` because you are dealing with well-known DNS term here, not a 
simple word.

Please normalize your `From:` line to be from the same email address. We do not 
accept something like `From: user 
`

Updates to translations should be done via 
https://fedora.zanata.org/project/view/freeipa?dswid=2118, see 
https://fedoraproject.org/wiki/L10N/Translate_on_Zanata for details.

Changes like `plugable` -> `pluggable` may be OK in the text when they are part 
of a normal sentence. However, do not change the code itself and references in 
the text to those code names. These constitute part of a released plugin API 
and should not be changed.


"""

See the full comment at 
https://github.com/freeipa/freeipa/pull/716#issuecomment-294407938
-- 
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#716][comment] Fix minor typos

[realsobek]

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

realsobek commented:
"""
There are 353 occurrences of 'plugable'. 2 in file names. 351 in code. 
I can make the change in a separate branch. But I cannot evaluate the outcome. 
Hence I would like to have your opinion before jumping to conclusions. Can I go 
ahead and make the change?
"""

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