saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24948 from jfindlay/doc_links

Browse source 
fix some malformed doc links and anchors
This commit is contained in:
Mike Place 2015-06-25 09:51:38 -06:00
commit 773c4cf8e4
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/topics/development/contributing.rst
View file

@ -11,6 +11,8 @@ There are a number of ways to contribute to Salt development.
For details on how to contribute documentation improvements please review
:ref:`Writing Salt Documentation <salt-docs>`.
.. _github-pull-request:
Sending a GitHub pull request
=============================
@ -41,7 +43,7 @@ Fork a Repo Guide_>`_ and is well worth reading.
isolated into separate branches.
If you're working on a fix, create your branch from the oldest release
branch having the bug. See :ref:`Which Salt Branch?`.
branch having the bug. See :ref:`Which Salt Branch? <which-salt-branch>`.
.. code-block:: bash
@ -155,13 +157,15 @@ Fork a Repo Guide_>`_ and is well worth reading.
Test progress and results can be found at http://jenkins.saltstack.com/.
.. _which-salt-branch:
Which Salt branch?
==================
GitHub will open pull requests against Salt's main branch, ``develop``, by
default. Ideally features should go into ``develop`` and bug fixes should go
into the oldest supported release branch affected by the bug. See
:ref:`Sending a GitHub pull request`.
:ref:`Sending a GitHub pull request <github-pull-request>`.
If you have a bug fix and have already forked your working branch from
``develop`` and do not know how to rebase your commits against another branch,
@ -355,8 +359,8 @@ Issue and Pull Request Labeling System
======================================
SaltStack uses several labeling schemes to help facilitate code contributions
and bug resolution. See the :doc:`<labels-and-milestones>` documentation for
more information.
and bug resolution. See the :ref:`Labels and Milestones
<labels-and-milestones>` documentation for more information.
.. _`saltstack/salt`: https://github.com/saltstack/salt
.. _`GitHub Fork a Repo Guide`: https://help.github.com/articles/fork-a-repo

4
doc/topics/development/hacking.rst
View file

@ -288,5 +288,5 @@ Issue and Pull Request Labeling System
--------------------------------------
SaltStack uses several labeling schemes to help facilitate code contributions
and bug resolution. See the :doc:`<labels-and-milestones>` documentation for
more information.
and bug resolution. See the :ref:`Labels and Milestones
<labels-and-milestones>` documentation for more information.