Skip to content

Commit

Permalink
[#2226,doc][xs]: fix minor formatting issues causing sphinx warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
rufuspollock committed Mar 18, 2012
1 parent 6289f98 commit 0145526
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/configuration.rst
Expand Up @@ -150,7 +150,7 @@ Example::

If there is a page which allows you to download a dump of the entire catalogue then specify the URL and the format here, so that it can be advertised in the web interface. ``dumps_format`` is just a string for display.

For more information on using dumpfiles, see :doc:`database_dumps`.
For more information on using dumpfiles, see :doc:`database-dumps`.

recaptcha
^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion doc/domain-model.rst
Expand Up @@ -40,5 +40,5 @@ Entity List
Part of the domain model but not central:

* Revision - changes to the domain model
* :doc:`task status` - key/value information stored by CKAN Tasks
* :doc:`task-status` - key/value information stored by CKAN Tasks

4 changes: 2 additions & 2 deletions doc/install-from-source.rst
Expand Up @@ -211,7 +211,7 @@ If you're using a remote host with password authentication rather than SSL authe
8. Setup Solr
~~~~~~~~~~~~~~
~~~~~~~~~~~~~

Set up Solr following the instructions on :ref:`solr-single` or :ref:`solr-multi-core` depending on your needs.

Expand All @@ -222,7 +222,7 @@ Set appropriate values for the ``ckan.site_id`` and ``solr_url`` config variable
ckan.site_id=my_ckan_instance
solr_url=http://127.0.0.1:8983/solr

9. Create database tables.
9. Create database tables
~~~~~~~~~~~~~~~~~~~~~~~~~

Now that you have a configuration file that has the correct settings for
Expand Down
4 changes: 2 additions & 2 deletions doc/paster.rst
Expand Up @@ -198,7 +198,7 @@ To load it in again, you first have to clean the database of existing data (be c

.. warning: The pg_dump file is a complete backup of the database in plain text, and includes API keys and other user data which may be regarded as private. So keep it secure, like your database server.
The pg_dump file notes which PostgreSQL user 'owns' the data on the server. Because the PostgreSQL user (by default) is identified as the current Linux user, and this is setup to be ``ckanINSTANCE`` where ``INSTANCE`` is the name of the CKAN instance. This means if you want to restore the pg_dump as another CKAN instance name (often needed if you move it to another server) then you will need to change the database owner - see :doc:`howto-editing--database-ownership`.
The pg_dump file notes which PostgreSQL user 'owns' the data on the server. Because the PostgreSQL user (by default) is identified as the current Linux user, and this is setup to be ``ckanINSTANCE`` where ``INSTANCE`` is the name of the CKAN instance. This means if you want to restore the pg_dump as another CKAN instance name (often needed if you move it to another server) then you will need to change the database owner - see :doc:`howto-editing-database-ownership`.

Upgrade migration
~~~~~~~~~~~~~~~~~
Expand All @@ -210,7 +210,7 @@ When you upgrade CKAN software by any method *other* than the package update des
Creating dump files
~~~~~~~~~~~~~~~~~~~

For information on using ``db`` to create dumpfiles, see :doc:`database_dumps`.
For information on using ``db`` to create dumpfiles, see :doc:`database-dumps`.


ratings: Manage dataset ratings
Expand Down

0 comments on commit 0145526

Please sign in to comment.