diff --git a/src/doc/administration/configuration.rst b/src/doc/administration/configuration.rst
index f8a9e4365843d317de4abeed1fd8f723372ad6ec..c91ac16b1068b9261638aa697f3d11fd42a0d5cc 100644
--- a/src/doc/administration/configuration.rst
+++ b/src/doc/administration/configuration.rst
@@ -1,6 +1,8 @@
-# Server Configuration
+Server Configuration
+====================
 
-## Main Configuration File
+Main Configuration File
+-----------------------
 
 The server is configured through configuration files. The main file is the
 `server.conf`.
@@ -29,12 +31,13 @@ The default configuration can be overriden by
 
 in this order.
 
-## Further Configuration Files
+Further Configuration Files
+---------------------------
 
 Further settings are to be set in files which are by default stored in `./conf/core/`:
 
 ``global_entity_permissions.xml``
-   :doc:`Permissions<../Permissions>` which are automatically set, based on user roles.  See the
+   :doc:`Permissions<../permissions>` which are automatically set, based on user roles.  See the
    `default file
    <https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/dev/conf/core/global_entity_permissions.xml>`__.
 
@@ -71,7 +74,8 @@ The administrator may set the corresponding options in the main configuration
 file (`./conf/core/server.conf` and it's friends) to replace these special
 files with custom configuration.
 
-## Changing the configuration at runtime
+Changing the configuration at runtime
+-------------------------------------
 
 Remark:
    Only when the server is in debug mode, the general configuration can be changed at runtime.
diff --git a/src/doc/roles.md b/src/doc/roles.md
index 5f4641b7a6f6fcb1b63cdd26edb706af117ee7d6..2d1d36c47c34658a306384e39033f7ea4e5eb040 100644
--- a/src/doc/roles.md
+++ b/src/doc/roles.md
@@ -10,7 +10,7 @@ users may have the same role, and there may be roles without any users.
 
 The user and their roles are always returned by the server in answers to requests
 and can thus be interpreted and used by clients.  The most important use though
-is [permission](Permissions) checking in the server: Access and
+is [permission](doc:`permissions`) checking in the server: Access and
 modification of
 entities can be controlled via roles, so that users of a given role are allowed
 or denied certain actions.  Incidentally, the permission to edit the permissions
@@ -32,4 +32,4 @@ There are some special roles, which are automatically assigned to users:
 
 Except for the `anonymous` role, these special roles are not returned by the
 server, but can nevertheless be used to define
-[permissions](Permissions).
+[permissions](doc:`permissions`).