Merge branch 'release-v2.0' of github.com:okfn/ckan into release-v2.0

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
 ====================================

doc/_templates/footer.html

@@ -9,7 +9,7 @@
 <p>
 <a href="https://github.com/okfn/ckan">Source</a>
 &mdash;
-<a href="https://trac.ckan.org/">Issues</a>
+<a href="https://github.com/okfn/ckan/issues">Issues</a>
 &mdash;
 <a href="http://lists.okfn.org/mailman/listinfo/ckan-dev">Mailing List</a>
 &mdash;

doc/conf.py

@@ -44,7 +44,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'CKAN Data Management System Documentation'
+project = u'CKAN Documentation'
 project_short_name = u'CKAN'
 copyright = u'''&copy; 2009-2012, <a href="http://okfn.org/">Open Knowledge Foundation</a>.
     Licensed under <a

doc/contributing.rst

@@ -0,0 +1 @@
+../CONTRIBUTING.rst

doc/index.rst

@@ -1,12 +1,12 @@
-=======================================
-Welcome to CKAN's Administration Guide
-=======================================
+===============================
+Welcome to CKAN's Documentation
+===============================
 
 .. note ::
 
    This is the documentation for CKAN version '|version|'. If you are using a different version, use the links on the bottom right corner of the page to select the appropriate documentation.
 
-This Administration Guide covers how to set up and manage `CKAN <http://ckan.org>`_ software.
+This documentation covers how to set up and manage `CKAN <http://ckan.org>`_ software.
 
 * The first two sections cover your two options for installing CKAN: package or source install.
 * The rest of the first half of the Guide, up to :doc:`authorization`, covers setup and basic admin.
@@ -93,6 +93,7 @@ For CKAN Developers
 .. toctree::
    :maxdepth: 1
 
+   contributing
    architecture
    python-coding-standards
    javascript-coding-standards
@@ -109,7 +110,6 @@ Other material
    :maxdepth: 2
 
    contrib.rst
-   user-stories
    CHANGELOG.rst
 
 Indices and tables

doc/install-from-source.rst

@@ -31,8 +31,8 @@ wiki page for help):
 =====================  ===============================================
 Package                Description
 =====================  ===============================================
-Python                 `The Python programming language, v2.5-2.7 <http://www.python.org/getit/>`_
-PostgreSQL             `The PostgreSQL database system <http://www.postgresql.org/download/>`_
+Python                 `The Python programming language, v2.6 or 2.7 <http://www.python.org/getit/>`_
+PostgreSQL             `The PostgreSQL database system, v8.4 or newer <http://www.postgresql.org/download/>`_
 libpq                  `The C programmer's interface to PostgreSQL <http://www.postgresql.org/docs/8.1/static/libpq.html>`_
 pip                    `A tool for installing and managing Python packages <http://www.pip-installer.org>`_
 virtualenv             `The virtual Python environment builder <http://pypi.python.org/pypi/virtualenv>`_

doc/post-installation.rst

@@ -24,7 +24,7 @@ First create an admin account from the command line (you must be root, ``sudo -s
 
 ::
 
-    paster --plugin=ckan user add admin --config=/etc/ckan/std/std.ini
+    paster --plugin=ckan user add admin email=admin@example.com --config=development.ini
 
 When prompted, enter a password - this is the password you will use to log in to CKAN. In the resulting output, note that you will also get assigned a CKAN API key.
 
@@ -37,7 +37,7 @@ this:
 
 ::
 
-    paster --plugin=ckan sysadmin add admin --config=/etc/ckan/std/std.ini
+    paster --plugin=ckan sysadmin add admin --config=development.ini
 
 You can now login to the CKAN frontend with the username ``admin`` and the password you set up.