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

Change wording of Going Further section #35949

Merged
merged 4 commits into from
Feb 11, 2018
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions docs/docsite/rst/dev_guide/developing_modules_general.rst
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,15 @@ test/units/modules/.../test/my_new_test_module.py``
Going Further
=============

If you are starting new development or fixing a bug, create a new branch:

``$ git checkout -b my-new-branch``.

If you are planning on contributing
back to the main Ansible repository, fork the Ansible repository into
your own GitHub account and develop against the new non-devel branch
in your fork. When you believe you have a good working code change,
submit a pull request to the Ansible repository.
If you would like to contribute to the main Ansible repository
by by adding a new feature or fixing a bug, `create a fork <https://help.github.com/articles/fork-a-repo/>`_
Copy link
Contributor

Choose a reason for hiding this comment

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

'by' is given twice in the beginning of the sentence

of the Ansible repository and develop against a new feature
branch using the ``devel`` branch as a starting point.

When you you have a good working code change,
submit a pull request to the Ansible repository by you selecting
your feature branch as a source and the Ansible devel branch as
a target.

If you want to submit a new module to the upstream Ansible repo, be sure
to run through sanity checks first. For example:
Expand Down