2 files changed, 5 insertions, 4 deletions
diff --git a/latest/usage/administration/admin_api/index.html b/latest/usage/administration/admin_api/index.html
index 3522a67a49..411e10114c 100644
--- a/latest/usage/administration/admin_api/index.html
+++ b/latest/usage/administration/admin_api/index.html
@@ -150,7 +150,8 @@
<h2 id="authenticate-as-a-server-admin"><a class="header" href="#authenticate-as-a-server-admin">Authenticate as a server admin</a></h2>
<p>Many of the API calls in the admin api will require an <code>access_token</code> for a
server admin. (Note that a server admin is distinct from a room admin.)</p>
-<p>A user can be marked as a server admin by updating the database directly, e.g.:</p>
+<p>An existing user can be marked as a server admin by updating the database directly.</p>
+<p>Check your <a href="config_documentation.html#database">database settings</a> in the configuration file, connect to the correct database using either <code>psql [database name]</code> (if using PostgreSQL) or <code>sqlite3 path/to/your/database.db</code> (if using SQLite) and elevate the user <code>@foo:bar.com</code> to administrator.</p>
<pre><code class="language-sql">UPDATE users SET admin = 1 WHERE name = '@foo:bar.com';
</code></pre>
<p>A new server admin user can also be created using the <code>register_new_matrix_user</code>
diff --git a/latest/usage/administration/admin_api/registration_tokens.html b/latest/usage/administration/admin_api/registration_tokens.html
index 78a38518a0..330fc171e1 100644
--- a/latest/usage/administration/admin_api/registration_tokens.html
+++ b/latest/usage/administration/admin_api/registration_tokens.html
@@ -149,11 +149,11 @@
<h1 id="registration-tokens"><a class="header" href="#registration-tokens">Registration Tokens</a></h1>
<p>This API allows you to manage tokens which can be used to authenticate
registration requests, as proposed in
-<a href="https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md">MSC3231</a>.
+<a href="https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md">MSC3231</a>
+and stabilised in version 1.2 of the Matrix specification.
To use it, you will need to enable the <code>registration_requires_token</code> config
option, and authenticate by providing an <code>access_token</code> for a server admin:
-see <a href="../../usage/administration/admin_api">Admin API</a>.
-Note that this API is still experimental; not all clients may support it yet.</p>
+see <a href="../admin_api">Admin API</a>.</p>
<h2 id="registration-token-objects"><a class="header" href="#registration-token-objects">Registration token objects</a></h2>
<p>Most endpoints make use of JSON objects that contain details about tokens.
These objects have the following fields:</p>
|
