docs: Merge development docs into a single document

docs/changes.rst

@@ -860,8 +860,8 @@ In the last two months, Mopidy's MPD frontend has gotten lots of stability
 fixes and error handling improvements, proper support for having the same track
 multiple times in a playlist, and support for IPv6. We have also fixed the
 choppy playback on the libspotify backend. For the road ahead of us, we got an
-updated :doc:`release roadmap <development/roadmap>` with our goals for the 0.1
+updated :doc:`release roadmap <development>` with our goals for the 0.1 to 0.3
-to 0.3 releases.
+releases.
 
 Enjoy the best alpha relase of Mopidy ever :-)
 

docs/development.rst

@@ -1,11 +1,42 @@
-*****************
+***********
-How to contribute
+Development
-*****************
+***********
 
 Development of Mopidy is coordinated through the IRC channel ``#mopidy`` at
 ``irc.freenode.net`` and through `GitHub <http://github.com/>`_.
 
 
+Release schedule
+================
+
+We intend to have about one timeboxed feature release every month
+in periods of active development. The feature releases are numbered 0.x.0. The
+features added is a mix of what we feel is most important/requested of the
+missing features, and features we develop just because we find them fun to
+make, even though they may be useful for very few users or for a limited use
+case.
+
+Bugfix releases, numbered 0.x.y, will be released whenever we discover bugs
+that are too serious to wait for the next feature release. We will only release
+bugfix releases for the last feature release. E.g. when 0.3.0 is released, we
+will no longer provide bugfix releases for the 0.2 series. In other words,
+there will be just a single supported release at any point in time.
+
+
+Feature wishlist
+================
+
+We maintain our collection of sane or less sane ideas for future Mopidy
+features as `issues <https://github.com/mopidy/mopidy/issues>`_ at GitHub
+labeled with `the "wishlist" label
+<https://github.com/mopidy/mopidy/issues?labels=wishlist>`_. Feel free to vote
+up any feature you would love to see in Mopidy, but please refrain from adding
+a comment just to say "I want this too!". You are of course free to add
+comments if you have suggestions for how the feature should work or be
+implemented, and you may add new wishlist issues if your ideas are not already
+represented.
+
+
 Code style
 ==========
 
@@ -125,6 +156,7 @@ statistics and uses pylint to check for errors and possible improvements in our
 code. So, if you're out of work, the code coverage and pylint data at the CI
 server should give you a place to start.
 
+
 Protocol debugging
 ==================
 
@@ -167,6 +199,7 @@ To ensure that Mopidy and MPD have comparable state it is suggested you setup
 both to use ``tests/data/library_tag_cache`` for their tag cache and
 ``tests/data`` for music/playlist folders.
 
+
 Writing documentation
 =====================
 

docs/development/index.rst

@@ -1,9 +0,0 @@
-***********
-Development
-***********
-
-.. toctree::
-    :maxdepth: 3
-
-    roadmap
-    contributing

docs/development/roadmap.rst

@@ -1,34 +0,0 @@
-*******
-Roadmap
-*******
-
-
-Release schedule
-================
-
-We intend to have about one timeboxed feature release every month
-in periods of active development. The feature releases are numbered 0.x.0. The
-features added is a mix of what we feel is most important/requested of the
-missing features, and features we develop just because we find them fun to
-make, even though they may be useful for very few users or for a limited use
-case.
-
-Bugfix releases, numbered 0.x.y, will be released whenever we discover bugs
-that are too serious to wait for the next feature release. We will only release
-bugfix releases for the last feature release. E.g. when 0.3.0 is released, we
-will no longer provide bugfix releases for the 0.2 series. In other words,
-there will be just a single supported release at any point in time.
-
-
-Feature wishlist
-================
-
-We maintain our collection of sane or less sane ideas for future Mopidy
-features as `issues <https://github.com/mopidy/mopidy/issues>`_ at GitHub
-labeled with `the "wishlist" label
-<https://github.com/mopidy/mopidy/issues?labels=wishlist>`_. Feel free to vote
-up any feature you would love to see in Mopidy, but please refrain from adding
-a comment just to say "I want this too!". You are of course free to add
-comments if you have suggestions for how the feature should work or be
-implemented, and you may add new wishlist issues if your ideas are not already
-represented.

docs/index.rst

@@ -54,7 +54,7 @@ Development documentation
 .. toctree::
     :maxdepth: 3
 
-    development/index
+    development
 
 Indices and tables
 ==================

docs/installation/index.rst

@@ -173,7 +173,7 @@ If you want to contribute to Mopidy, you should install Mopidy using Git.
 
 For an introduction to ``git``, please visit `git-scm.com
 <http://git-scm.com/>`_. Also, please read our :doc:`developer documentation
-</development/index>`.
+</development>`.
 
 
 From AUR on ArchLinux