Merge branch '618-source-contributing-file-from-docs'

ckan · Apr 10, 2013 · 254222f · 254222f
2 parents 96dee5f + 2ab6084
commit 254222f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -5,7 +5,6 @@ Contributing to CKAN
 .. _CKAN repo on GitHub: https://github.com/okfn/ckan
 .. _CKAN issue tracker: https://github.com/okfn/ckan/issues
 .. _docs.ckan.org: http://docs.ckan.org
-.. _Contributing to CKAN's Documentation: https://github.com/okfn/ckan/blob/master/CONTRIBUTING.rst#contributing-to-ckans-documentation
 
 (This section is about contributing code, if you want to contribute
 documentation see `Contributing to CKAN's Documentation`_.)
@@ -16,6 +15,13 @@ your code to a feature branch on your fork, then make a pull request for your
 branch on the central CKAN repo. We'll go through each step in detail below...
 
 
+Coding Standards
+----------------
+
+When writing code for CKAN, try to follow our
+`coding standards <http://docs.ckan.org/en/latest/#for-ckan-developers>`_.
+
+
 Fork CKAN on GitHub
 -------------------
 
@@ -133,13 +139,6 @@ When merging a feature or bug branch into master:
 - Use the ``--no-ff`` option in the ``git merge`` command,
 
 
-Coding Standards
-----------------
-
-When writing code for CKAN, try to follow our
-`coding standards <http://docs.ckan.org/en/latest/#for-ckan-developers>`_.
-
-
 ====================================
 Contributing to CKAN's Documentation
 ====================================

diff --git a/doc/contributing.rst b/doc/contributing.rst
@@ -0,0 +1 @@
+../CONTRIBUTING.rst
diff --git a/doc/index.rst b/doc/index.rst
@@ -92,6 +92,7 @@ For CKAN Developers
 .. toctree::
    :maxdepth: 1
 
+   contributing
    architecture
    python-coding-standards
    javascript-coding-standards