Merge branch '517-test-db' of github.com:okfn/ckan into 517-test-db

Conflicts: doc/test.rst fixed doc
ckan · Mar 26, 2013 · 0ba06dc · 0ba06dc
2 parents 7215631 + 1e0a260
commit 0ba06dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/install-from-source.rst b/doc/install-from-source.rst
@@ -121,7 +121,7 @@ config file::
     ``sqlalchemy.url`` line, filling in the database name, user and password you
     used::
 
-        sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantest
+        sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckandatabase
 
     If you're using a remote host with password authentication rather than SSL
     authentication, use::

diff --git a/doc/test.rst b/doc/test.rst
@@ -59,7 +59,7 @@ Testing with PostgreSQL
 -----------------------
 
 Starting in CKAN 2.1 tests are run in a separate postgres database by
-default.  You should create the test databases as follows.::
+default.  You should create the test databases as follows::
 
     sudo -u postgres createdb -O ckanuser ckan_test -E utf-8
     sudo -u postgres createdb -O ckanuser ckan_test_datastore -E utf-8