aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installing
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2015-01-07 15:55:00 +0000
committerDave Whiteland <dave@mysociety.org>2015-01-08 12:23:10 +0000
commit931e54cf6a6289c20ff9fda08fa475b241c8007c (patch)
treeeb618f0b9c6f3c661eb9c3401d522f5a08960687 /docs/installing
parent8a5ba6af17b57bcd35a4b57b23b2869e3a060003 (diff)
new entries and small tidies in glossary around admin/superuser
Diffstat (limited to 'docs/installing')
-rw-r--r--docs/installing/manual_install.md7
-rw-r--r--docs/installing/next_steps.md4
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md
index 8c9e2a8d6..9cad6b5b9 100644
--- a/docs/installing/manual_install.md
+++ b/docs/installing/manual_install.md
@@ -351,7 +351,12 @@ Example `development` section of `config/database.yml`:
Make sure that the user specified in `database.yml` exists, and has full
permissions on these databases.
-As the user needs the ability to turn off constraints whilst running the tests they also need to be a superuser. If you don't want your database user to be a superuser, you can add this line to the `test` section in `database.yml` (as seen in `config/database.yml-example`):
+As the user needs the ability to turn off constraints whilst running the tests
+they also need to be a superuser (clarification: a <em>Postgres</em> superuser,
+not an Alaveteli
+<a href="{{ site.baseurl }}docs/glossary/#super" class="glossary__link">superuser</a>).
+If you don't want your database user to be a superuser, you can add this line
+to the `test` section in `database.yml` (as seen in `config/database.yml-example`):
constraint_disabling: false
diff --git a/docs/installing/next_steps.md b/docs/installing/next_steps.md
index 4199daabf..20c69a504 100644
--- a/docs/installing/next_steps.md
+++ b/docs/installing/next_steps.md
@@ -14,7 +14,9 @@ Alaveteli ships with an
<a href="{{site.baseurl}}docs/glossary/#emergency" class="glossary__link">emergency user</a>
that has access to the admin. So when you've just created a new site, you
should sign up to create your own account, then log into admin as the emergency
-user to promote your new account to be an administrator with *super* privileges.
+user to promote your new account to be an administrator with
+<a href="{{ site.baseurl }}docs/glossary/#super" class="glossary__link">super</a>
+privilege.
As soon as that's done, disable the emergency user, because you don't need to
use it any more: you've superseded it with your new admin account.