diff --git a/doc/datastore-setup.rst b/doc/datastore-setup.rst
index bd95a952b21..12b1c743e61 100644
--- a/doc/datastore-setup.rst
+++ b/doc/datastore-setup.rst
@@ -2,7 +2,6 @@
 Setting up the DataStore
 ========================
 
-.. warning:: Make sure that you follow the steps below and make sure that the settings are correct. Wrong settings could lead to serious security issues.
 
 .. note:: The DataStore requires PostgreSQL 9.0 or later. It is possible to use the DataStore on versions prior to 9.0 (for example 8.4). However, the :meth:`~ckanext.datastore.logic.action.datastore_search_sql` will not be available and the set-up is slightly different. Make sure, you read :ref:`legacy_mode` for more details.
 
@@ -24,6 +23,8 @@ Since the DataStore is an optional extension, it has to be enabled separately. T
 2. Set-up the database
 ======================
 
+.. note:: Make sure that you follow the steps below to set up the permissions correctly. Wrong settings could lead to serious security issues.
+
 The DataStore requires a separate PostgreSQL database to save the resources to.
 
 List existing databases::
diff --git a/doc/index.rst b/doc/index.rst
index 4acc89dc4e7..04b9520ce48 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -9,7 +9,7 @@ Welcome to CKAN's Administration Guide
 This Administration Guide 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`, cover setup and basic admin.
+* The rest of the first half of the Guide, up to :doc:`authorization`, covers setup and basic admin.
 * The second half of the Guide, from :doc:`extensions` onwards, covers advanced tasks, including extensions and forms.
 
 For high-level information on what CKAN is, see the `CKAN website <http://ckan.org>`_.