From ce7a3b3ff5e7f9f6780e47cac16e8dc44c477b44 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 4 Apr 2014 04:52:25 +0200
Subject: [PATCH] Update contribution guidelines to mention mailing list

Conflicts:
	CONTRIBUTING.rst
---
 CONTRIBUTING.rst | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 1d74ab66d..828df8d05 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -4,14 +4,21 @@ Contributing to Converse.js
 
 Thanks for contributing to `Converse.js <http://conversejs.org>`_.
 
-Please follow the usual github workflow. Create your own local fork of this
-repository, make your changes and then submit a pull request.
+Support questions
+=================
+Please ask support and setup questions on the mailing list: conversejs@librelist.com
+The issue tracker is only for bugs (i.e. issues) and feature requests.
+
+Contributing Code
+=================
+Please follow the usual github workflow. Create your own local fork of this repository,
+make your changes and then submit a pull request.
 
 Before submitting a pull request
-================================
+--------------------------------
 
 Add tests for your bugfix or feature
-------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Add a test for any bug fixed or feature added. We use Jasmine
 for testing. 
@@ -21,13 +28,13 @@ and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.ht
 to see how tests are implemented.
 
 Check that the tests pass
--------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Check that the Jasmine tests complete sucessfully. Open
 `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
 in your browser, and the tests will run automatically.
 
 Check your code for errors or bad habits by running JSHint
-----------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run ``grunt jshint`` and check the output.