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

docs typo, missing a space #2004

Merged
merged 1 commit into from
Oct 16, 2024
Merged

docs typo, missing a space #2004

merged 1 commit into from
Oct 16, 2024

Conversation

dwgrth
Copy link
Contributor

@dwgrth dwgrth commented Oct 11, 2024

works either way, but it annoyed me so I fixed it

works either way, but it annoyed me so I fixed it
@ansible-documentation-bot ansible-documentation-bot bot added the new_contributor This PR is the first contribution by a new community member. label Oct 11, 2024
@ansible-documentation-bot
Copy link
Contributor

Thanks for your Ansible docs contribution! We talk about Ansible documentation on Matrix at #docs:ansible.im if you ever want to join us and chat about the docs! We meet on Matrix every Tuesday. See the Ansible calendar for meeting details. We welcome additions to our weekly agenda items too. You can add the dawgs-meeting tag to a forum topic to bring it up at the next meeting.

Copy link
Contributor

@oraNod oraNod left a comment

Choose a reason for hiding this comment

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

Nice one @dwgrth Thanks for taking the time to fix this!

@oraNod oraNod added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch backport-2.18 Automatically create a backport for the stable-2.18 branch labels Oct 16, 2024
@oraNod oraNod merged commit 071f461 into ansible:devel Oct 16, 2024
10 checks passed
Copy link

patchback bot commented Oct 16, 2024

Backport to stable-2.15: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 071f461 on top of patchback/backports/stable-2.15/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004

Backporting merged PR #2004 into devel

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-documentation.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-2.15/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004 upstream/stable-2.15
  4. Now, cherry-pick PR docs typo, missing a space #2004 contents into that branch:
    $ git cherry-pick -x 071f4614808683f8afde22d16f2b97d9e83a9d8b
    If it'll yell at you with something like fatal: Commit 071f4614808683f8afde22d16f2b97d9e83a9d8b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 071f4614808683f8afde22d16f2b97d9e83a9d8b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR docs typo, missing a space #2004 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 16, 2024

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004

Backported as #2028

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)
Copy link

patchback bot commented Oct 16, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004

Backported as #2030

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)
Copy link

patchback bot commented Oct 16, 2024

Backport to stable-2.18: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.18/071f4614808683f8afde22d16f2b97d9e83a9d8b/pr-2004

Backported as #2031

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)
oraNod pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)

Co-authored-by: Douglas Griffith <[email protected]>
oraNod pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)

Co-authored-by: Douglas Griffith <[email protected]>
oraNod pushed a commit that referenced this pull request Oct 16, 2024
works either way, but it annoyed me so I fixed it

(cherry picked from commit 071f461)

Co-authored-by: Douglas Griffith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch backport-2.18 Automatically create a backport for the stable-2.18 branch new_contributor This PR is the first contribution by a new community member.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants