From 8ca871cad9b4e22476f46842c59d29fb56d394ce Mon Sep 17 00:00:00 2001 From: jcass Date: Sun, 27 Dec 2015 08:04:32 +0200 Subject: [PATCH] docs: Provide details on procedure for submitting bug fixes for a minor release of Mopidy. --- docs/contributing.rst | 8 ++++++++ docs/releasing.rst | 1 + 2 files changed, 9 insertions(+) diff --git a/docs/contributing.rst b/docs/contributing.rst index b5230b18..199c6b2a 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -126,3 +126,11 @@ Pull request guidelines #. Send a pull request to the ``develop`` branch. See the `GitHub pull request docs `_ for help. + +.. note:: + + If you are contributing a bug fix for a specific minor version of Mopidy + you should create the branch based on ``release-x.y`` instead of + ``develop``. When the release is done the changes will be merged back into + ``develop`` automatically as part of the normal release process. See + :ref:`creating-releases`. diff --git a/docs/releasing.rst b/docs/releasing.rst index 4c2d8373..8d489146 100644 --- a/docs/releasing.rst +++ b/docs/releasing.rst @@ -6,6 +6,7 @@ Here we try to keep an up to date record of how Mopidy releases are made. This documentation serves both as a checklist, to reduce the project's dependency on key individuals, and as a stepping stone to more automation. +.. _creating-releases: Creating releases =================