File tree 3 files changed +8
-8
lines changed
3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 19
19
## Checklist:
20
20
<!-- - Go over all the following points, and put an `x` in all the boxes that apply. -->
21
21
<!-- - If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
22
- - [ ] I have read the [ ** CONTRIBUTING** ] ( https://github.com/vyos/vyos-documentation/blob/master /CONTRIBUTING.md ) document
22
+ - [ ] I have read the [ ** CONTRIBUTING** ] ( https://github.com/vyos/vyos-documentation/blob/current /CONTRIBUTING.md ) document
Original file line number Diff line number Diff line change @@ -11,10 +11,10 @@ Our old wiki with documentation from the VyOS 1.1.x and early 1.2.0 era can stil
11
11
12
12
Our version follows the very same branching scheme as the VyOS source modules
13
13
itself. We maintain one documentation branch per VyOS release. The default
14
- branch that contains the most recent VyOS documentation is called ` master `
14
+ branch that contains the most recent VyOS documentation is called ` current `
15
15
and matches the latest VyOS release which is 1.4 at the time.
16
16
17
- All new documentation enhancements go to the ` master ` branch. If those changes
17
+ All new documentation enhancements go to the ` current ` branch. If those changes
18
18
are beneficial for previous VyOS documentation versions they will be
19
19
cherry-picked to the appropriate branch(es).
20
20
Original file line number Diff line number Diff line change @@ -442,19 +442,19 @@ access to the official codebase.
442
442
.. code-block :: none
443
443
444
444
$ git fetch upstream
445
- $ git checkout master
446
- $ git merge upstream/master
445
+ $ git checkout current
446
+ $ git merge upstream/current
447
447
448
448
* If you also want to update your fork on GitHub, use the following: ``$ git
449
- push origin master ``
449
+ push origin current ``
450
450
451
451
.. stop_vyoslinter
452
452
453
453
.. _Sphinx-doc : https://www.sphinx-doc.org
454
454
.. _reStructuredText : http://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html
455
455
.. _reStructuredTextDirectives : https://docutils.sourceforge.io/docs/ref/rst/directives.html
456
- .. _README.md : https://github.com/vyos/vyos-documentation/blob/master /README.md
457
- .. _Dockerfile : https://github.com/vyos/vyos-documentation/blob/master /docker/Dockerfile
456
+ .. _README.md : https://github.com/vyos/vyos-documentation/blob/current /README.md
457
+ .. _Dockerfile : https://github.com/vyos/vyos-documentation/blob/current /docker/Dockerfile
458
458
.. _Grammarly : https://www.grammarly.com/
459
459
.. include :: /_include/common-references.txt
460
460
You can’t perform that action at this time.
0 commit comments