summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-20 02:31:44 +0200
committerwm4 <wm4@nowhere>2014-05-24 16:43:28 +0200
commitaeeb7a92f221901badf45e76f1b70b253c979695 (patch)
tree235292ad760e4b5f17c6cd7e83792391fcc1dcd5
parent1e2f3191a78ad654819a88b8dcb6c2b7745d42bc (diff)
downloadmpv-aeeb7a92f221901badf45e76f1b70b253c979695.tar.bz2
mpv-aeeb7a92f221901badf45e76f1b70b253c979695.tar.xz
README: describe release cycle
-rw-r--r--README.md20
1 files changed, 18 insertions, 2 deletions
diff --git a/README.md b/README.md
index 975bd77f34..c54963e6ac 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,22 @@ Generally, mpv should work with the latest release as well as the git version
of both FFmpeg and Libav. But FFmpeg is preferred, and some mpv features work
with FFmpeg only. See the [wiki article][ffmpeg_vs_libav] about the issue.
+
+Release cycle
+-------------
+
+Every few months, a new release is cut off of the master branch. Currently,
+these releases are assigned a version number ``0.X.0``. Only the latest release
+is maintained. As part of the maintenance process, minor releases are made,
+which are assigned ``0.X.Y`` version numbers. Minor releases contain bug fixes
+only. They never merge the master branch, and no features are added to it. The
+goal of releases is to provide stability and an unchanged base for the sake of
+Linux distributions. If you want the newest features, just use the master
+branch. (The master branch is stable most of the time, except sometimes, when
+it's not.)
+
+Releases other than the latest release are unsupported and unmaintained.
+
Bug reports
-----------
@@ -95,8 +111,8 @@ For small changes you can just send us pull requests through GitHub. For bigger
changes come and talk to us on IRC before you start working on them. It will
make code review easier for both parties later on.
-Contacts
---------
+Contact
+-------
These forms of contact are meant to ask questions about mpv usage, give
feedback on mpv and discuss it's development.