diff options
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | docs/documentation.rst | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2c8a9873..c1eaa038 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -19,4 +19,4 @@ ## Checklist: <!--- 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! --> -- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/master/CONTRIBUTING.md) document
\ No newline at end of file +- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/current/CONTRIBUTING.md) document
\ No newline at end of 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 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. -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 cherry-picked to the appropriate branch(es). diff --git a/docs/documentation.rst b/docs/documentation.rst index 61487f57..79365c0d 100644 --- a/docs/documentation.rst +++ b/docs/documentation.rst @@ -442,19 +442,19 @@ access to the official codebase. .. code-block:: none $ git fetch upstream - $ git checkout master - $ git merge upstream/master + $ git checkout current + $ git merge upstream/current * If you also want to update your fork on GitHub, use the following: ``$ git - push origin master`` + push origin current`` .. stop_vyoslinter .. _Sphinx-doc: https://www.sphinx-doc.org .. _reStructuredText: http://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html .. _reStructuredTextDirectives: https://docutils.sourceforge.io/docs/ref/rst/directives.html -.. _README.md: https://github.com/vyos/vyos-documentation/blob/master/README.md -.. _Dockerfile: https://github.com/vyos/vyos-documentation/blob/master/docker/Dockerfile +.. _README.md: https://github.com/vyos/vyos-documentation/blob/current/README.md +.. _Dockerfile: https://github.com/vyos/vyos-documentation/blob/current/docker/Dockerfile .. _Grammarly: https://www.grammarly.com/ .. include:: /_include/common-references.txt |