Banio Carpenter
b97c9df5f3
added clarity on how to figure out what is the oldest supported main release branch
2018-04-25 10:59:22 -05:00
Wedge Jarrad
5a0fe104f7
Fix contributing doc typo
2018-02-18 10:57:28 -08:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
rallytime
0d5a46dbaa
Update release branch section with a few more details
2017-08-29 09:38:11 -04:00
Ch3LL
1b24244bd3
Add New Release Branch Strategy to Contribution Docs
2017-08-24 12:51:00 -04:00
rallytime
13622899d2
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/topics/development/contributing.rst
2017-02-23 14:37:48 -07:00
Mike Place
652044b18f
A note in the docs about mentionbot
2017-02-22 19:34:02 -07:00
rallytime
2f74dcf685
Various doc updates to fix warnings in doc build
2017-02-06 16:56:58 -07:00
rallytime
3d6d32edc5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/topics/development/contributing.rst
2016-11-21 17:29:07 -07:00
Nicole Thomas
0e74bad284
Update branch refs to more relevant branch ( #37826 )
...
And cleanup some :ref: links that are rendering incorrectly
2016-11-21 16:41:02 -07:00
rallytime
1755f22de1
Merge branch '2016.3' into 'carbon'
...
No conflicts.
2016-09-22 10:01:17 -06:00
Erik Johnson
4839c325ae
Improve the rebase docs in contributing guidelines
...
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.
This update shows how to force-push when necessary.
2016-09-21 13:53:27 -05:00
kaihowl
b465d54a76
Fix broken links in topics/development/contributing.rst
2016-04-09 19:09:17 +02:00
rallytime
6b526b5878
Add mentioned of Salt's Coding Style docs to the Contributing docs
2016-03-03 11:41:46 -07:00
rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07:00
Justin Findlay
8575192cc4
revise label and milestone documentation
2015-06-27 16:17:44 -06:00
Justin Findlay
152a9b2a12
fix some malformed doc links and anchors
2015-06-24 16:56:52 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Justin Findlay
fa2d411f53
update example release branch in contrib docs
2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3
clarify git rebase instructions
2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f
fix contribution docs link typos
2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4
backport dev contrib doc updates to 2015.5
2015-05-25 22:54:54 -06:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Colton Myers
36ef47e7a2
Merge branch '2014.7' into develop
...
Conflicts:
conf/minion
salt/modules/mine.py
2014-09-02 10:43:31 -06:00
Seth House
47efe38949
Added instructions on how to back-port fixes to release branches
2014-08-27 20:17:12 -06:00
wackycaptain
1032754af9
Fix broken links in contributing documentation.
2014-08-16 23:27:58 +02:00
Seth House
94d8fc966e
Updated the contributor documentation with the new branching workflow
2014-07-21 20:19:33 -06:00
Seth House
39a0b4dfc3
Fix bad global rST links for the mailing lists
2014-07-14 15:04:50 -06:00
Forrest Alvarez
208832f9ab
Fixed some spacing issues in the contributing docs.
2014-07-10 12:14:37 -07:00
Forrest Alvarez
846bc97bd2
Updated the contributing guide with a link to the documentation contribution docs.
2014-07-10 12:11:11 -07:00
Erik Johnson
a76747f780
Split up contributing/development docs
...
This page has become massive and merits being split into two pages.
Also, it affords the opportunity of getting rid of an ambiguous header
name that causes confusion.
Fixes #10830 .
2014-04-22 17:25:58 -05:00
