moved github issues/pr info into index page, leaving the developing page more about actual development, not housekeeping

docs/contributing/developing.rst

@@ -1,15 +1,32 @@
-Developing Wagtail
+Development environment
 -----------------------
 
-Issues
-~~~~~~
+Using the demo site & Vagrant
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The easiest way to contribute to Wagtail is to tell us how to improve it! First, check to see if your bug or feature request has already been submitted at `github.com/torchbox/wagtail/issues <https://github.com/torchbox/wagtail/issues>`_. If it has, and you have some supporting information which may help us deal with it, comment on the existing issue. If not, please `create a new one <https://github.com/torchbox/wagtail/issues/new>`_, providing as much relevant context as possible. For example, if you're experiencing problems with installation, detail your environment and the steps you've already taken. If something isn't displaying correctly, tell us what browser you're using, and include a screenshot if possible.
+We recommend using the `Wagtail demo site <https://github.com/torchbox/wagtaildemo/>`_ which uses Vagrant, as a basis for developing Wagtail itself.
 
-Pull requests
-~~~~~~~~~~~~~
+Install the wagtaildemo following the instructions in the `wagtaildemo README <https://github.com/torchbox/wagtaildemo/blob/master/README.md>`_, then continue with the instructions below.
+
+Clone a copy of `the Wagtail codebase <https://github.com/torchbox/wagtail>`_ alongside your demo site at the same level. So in the directory containing wagtaildemo, run::
+
+    git clone https://github.com/torchbox/wagtail.git
+
+Enable the Vagrantfile included with the demo - this ensures you can edit the Wagtail codebase from outside Vagrant::
+
+    cd wagtaildemo
+    cp Vagrantfile.local.example Vagrantfile.local
+
+If you clone Wagtail's codebase to somewhere other than one level above, edit ``Vagrantfile.local`` to specify the alternate path.
+
+Lastly, we tell Django to use your freshly cloned Wagtail codebase as the source of Wagtail CMS, not the pip-installed version that came with wagtaildemo::
+
+    cp wagtaildemo/settings/local.py.example wagtaildemo/settings/local.py
+
+Uncomment the lines from ``import sys`` onward, and edit the rest of ``local.py`` as appropriate.
+
+If your VM is currently running, you'll then need to run ``vagrant halt`` followed by ``vagrant up`` for the changes to take effect.
 
-If you're a Python or Django developer, `fork <https://github.com/torchbox/wagtail/>`_ and get stuck in! Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_. We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list <https://github.com/torchbox/wagtail/issues?state=open>`_, or email us directly on `hello@wagtail.io <mailto:hello@wagtail.io>`_ if you'd like us to suggest something!
 
 Coding guidelines
 ~~~~~~~~~~~~~~~~~
@@ -18,6 +35,7 @@ Coding guidelines
 * Python 2 and 3 compatibility. All contributions should support Python 2 and 3 and we recommend using the `six <https://pythonhosted.org/six/>`_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django).
 * Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail <https://travis-ci.org/torchbox/wagtail>`_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly.
 
+
 Running the unit tests
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -81,35 +99,3 @@ If your Elasticsearch instance is located somewhere else, you can set the
 
 If you no longer want Wagtail to test against Elasticsearch, uninstall the
 ``elasticsearch`` package.
-
-Styleguide
-~~~~~~~~~~
-
-Developers working on the Wagtail UI or creating new UI components may wish to test their work against our Styleguide, which is provided as the contrib module "wagtailstyleguide".
-
-To install the styleguide module on your site, add it to the list of ``INSTALLED_APPS`` in your settings:
-
-.. code-block:: python
-
-	INSTALLED_APPS = (
-	   ...
-	   'wagtail.contrib.wagtailstyleguide',
-	   ...
-	)
-
-At present the styleguide is static: new UI components must be added to it manually, and there are no hooks into it for other modules to use. We hope to support hooks in the future.
-
-The styleguide doesn't currently provide examples of all the core interface components; notably the Page, Document, Image and Snippet chooser interfaces are not currently represented.
-
-
-Translations
-~~~~~~~~~~~~
-
-Wagtail has internationalisation support so if you are fluent in a non-English language you can contribute by localising the interface.
-
-Translation work should be submitted through `Transifex <https://www.transifex.com/projects/p/wagtail/>`_.
-
-Other contributions
-~~~~~~~~~~~~~~~~~~~
-
-We welcome contributions to all aspects of Wagtail. If you would like to improve the design of the user interface, or extend the documentation, please submit a pull request as above. If you're not familiar with Github or pull requests, `contact us directly <mailto:hello@wagtail.io>`_ and we'll work something out.

docs/contributing/index.rst

@@ -1,6 +1,31 @@
 Contributing to Wagtail
 =======================
 
+Issues
+~~~~~~
+
+The easiest way to contribute to Wagtail is to tell us how to improve it! First, check to see if your bug or feature request has already been submitted at `github.com/torchbox/wagtail/issues <https://github.com/torchbox/wagtail/issues>`_. If it has, and you have some supporting information which may help us deal with it, comment on the existing issue. If not, please `create a new one <https://github.com/torchbox/wagtail/issues/new>`_, providing as much relevant context as possible. For example, if you're experiencing problems with installation, detail your environment and the steps you've already taken. If something isn't displaying correctly, tell us what browser you're using, and include a screenshot if possible.
+
+Pull requests
+~~~~~~~~~~~~~
+
+If you're a Python or Django developer, `fork <https://github.com/torchbox/wagtail/>`_ and get stuck in! Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_. We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list <https://github.com/torchbox/wagtail/issues?state=open>`_, or email us directly on `hello@wagtail.io <mailto:hello@wagtail.io>`_ if you'd like us to suggest something!
+
+
+Translations
+~~~~~~~~~~~~
+
+Wagtail has internationalisation support so if you are fluent in a non-English language you can contribute by localising the interface.
+
+Translation work should be submitted through `Transifex <https://www.transifex.com/projects/p/wagtail/>`_.
+
+
+Other contributions
+~~~~~~~~~~~~~~~~~~~
+
+We welcome contributions to all aspects of Wagtail. If you would like to improve the design of the user interface, or extend the documentation, please submit a pull request as above. If you're not familiar with Github or pull requests, `contact us directly <mailto:hello@wagtail.io>`_ and we'll work something out.
+
+
 
 .. toctree::
     :maxdepth: 2