Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix minor typo in ipa-adtrust-install.1 #714

Closed
wants to merge 1 commit into from
Closed

fix minor typo in ipa-adtrust-install.1 #714

wants to merge 1 commit into from

Conversation

realsobek
Copy link
Contributor

@realsobek realsobek commented Apr 15, 2017 •
edited by MartinBasti

ipa-4-5 and ipa-4-4 are affected too. I ignore branches that are not listed at http://www.freeipa.org/page/Roadmap#Current_Efforts
As far as I can see I cannot put the changes in here. Do I have to create a pull request for each one?

stlaz
stlaz requested changes Apr 19, 2017
View reviewed changes
Copy link
Contributor

@stlaz stlaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution! Please, see my comment if you could possibly add one more fix.

install/tools/man/ipa-adtrust-install.1 Outdated
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please also fix the typo "an trust" to "a trust"? Thank you :)

@stlaz stlaz self-assigned this Apr 19, 2017
@stlaz stlaz mentioned this pull request Apr 20, 2017
Closed
@realsobek
Copy link
Contributor Author

fix has been added

@stlaz
Copy link
Contributor

stlaz commented Apr 24, 2017

Thanks, ACK.

@stlaz stlaz added ack Pull Request approved, can be merged and removed ack Pull Request approved, can be merged labels Apr 24, 2017
@stlaz
Copy link
Contributor

stlaz commented Apr 24, 2017

Ah, I did not notice you made a second commit for this. Please, squash them.

@realsobek
Copy link
Contributor Author

It was my fault. I knew how to squash two unpushed commits, but squashing two pushed commits was beyond me.
Thanks for your comment in #716 I had a look again and I managed it this time. :)
I squashed the last two commits (see git log) in my branch with git rebase --interactive HEAD~2 and pushed the result to my fork with git push origin master --force

@stlaz
Copy link
Contributor

stlaz commented Apr 25, 2017

Thanks, now this is ready to be pushed :)

@stlaz stlaz added the ack Pull Request approved, can be merged label Apr 25, 2017
@MartinBasti
Copy link
Contributor

master:

  • 298f725 fix minor typos in ipa-adtrust-install.1

@MartinBasti MartinBasti added the pushed Pull Request has already been pushed label Apr 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stlaz stlaz stlaz requested changes

Assignees

@stlaz stlaz

Labels
ack Pull Request approved, can be merged pushed Pull Request has already been pushed
Projects
None yet
Milestone
No milestone
3 participants
@realsobek @stlaz @MartinBasti