vyos/vyos-documentation
1
0
Fork 0
mirror of https://github.com/vyos/vyos-documentation.git synced 2025-10-26 08:41:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

change master to current branch name

Browse Source
This commit is contained in:
rebortg 2024-04-16 21:28:39 +02:00
parent 27998ef557
commit a5fcebd11b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -19,4 +19,4 @@
## Checklist: ## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/master/CONTRIBUTING.md) document - [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/current/CONTRIBUTING.md) document

4
README.md
View File

@ -11,10 +11,10 @@ Our old wiki with documentation from the VyOS 1.1.x and early 1.2.0 era can stil
Our version follows the very same branching scheme as the VyOS source modules Our version follows the very same branching scheme as the VyOS source modules
itself. We maintain one documentation branch per VyOS release. The default itself. We maintain one documentation branch per VyOS release. The default
branch that contains the most recent VyOS documentation is called `master` branch that contains the most recent VyOS documentation is called `current`
and matches the latest VyOS release which is 1.4 at the time. and matches the latest VyOS release which is 1.4 at the time.
All new documentation enhancements go to the `master` branch. If those changes All new documentation enhancements go to the `current` branch. If those changes
are beneficial for previous VyOS documentation versions they will be are beneficial for previous VyOS documentation versions they will be
cherry-picked to the appropriate branch(es). cherry-picked to the appropriate branch(es).

10
docs/documentation.rst
View File

@ -442,19 +442,19 @@ access to the official codebase.
.. code-block:: none .. code-block:: none
$ git fetch upstream $ git fetch upstream
$ git checkout master $ git checkout current
$ git merge upstream/master $ git merge upstream/current
* If you also want to update your fork on GitHub, use the following: ``$ git * If you also want to update your fork on GitHub, use the following: ``$ git
push origin master`` push origin current``
.. stop_vyoslinter .. stop_vyoslinter
.. _Sphinx-doc: https://www.sphinx-doc.org .. _Sphinx-doc: https://www.sphinx-doc.org
.. _reStructuredText: http://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html .. _reStructuredText: http://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html
.. _reStructuredTextDirectives: https://docutils.sourceforge.io/docs/ref/rst/directives.html .. _reStructuredTextDirectives: https://docutils.sourceforge.io/docs/ref/rst/directives.html
.. _README.md: https://github.com/vyos/vyos-documentation/blob/master/README.md .. _README.md: https://github.com/vyos/vyos-documentation/blob/current/README.md
.. _Dockerfile: https://github.com/vyos/vyos-documentation/blob/master/docker/Dockerfile .. _Dockerfile: https://github.com/vyos/vyos-documentation/blob/current/docker/Dockerfile
.. _Grammarly: https://www.grammarly.com/ .. _Grammarly: https://www.grammarly.com/
.. include:: /_include/common-references.txt .. include:: /_include/common-references.txt