diff --git a/doc/oper-guide/cmodes.rst b/doc/oper-guide/cmodes.rst
index 236fc7f3..0232e1ee 100644
--- a/doc/oper-guide/cmodes.rst
+++ b/doc/oper-guide/cmodes.rst
@@ -1,12 +1,5 @@
-.. contents::
-   :depth: 3
-..
-
-Cmodes
-======
-
-Meanings of channel modes
-=========================
+Channel modes
+=============
 
 +b, channel ban
 ---------------
diff --git a/doc/oper-guide/commands.rst b/doc/oper-guide/commands.rst
index b76318b8..97725e56 100644
--- a/doc/oper-guide/commands.rst
+++ b/doc/oper-guide/commands.rst
@@ -1,12 +1,8 @@
-.. contents::
-   :depth: 3
-..
-
 Operator Commands
 =================
 
 Network management commands
-===========================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     **Note**
 
@@ -210,7 +206,7 @@ SPLITNUM
     splitmode. Only servers that have finished bursting count for this.
 
 User management commands
-========================
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 KILL
 ----
@@ -633,7 +629,7 @@ this session. This command is disabled by default because of the abuse
 potential and little practical use.
 
 Miscellaneous commands
-======================
+~~~~~~~~~~~~~~~~~~~~~~
 
 ADMIN
 -----
diff --git a/doc/oper-guide/config.rst b/doc/oper-guide/config.rst
index 3bc79601..2ba7a471 100644
--- a/doc/oper-guide/config.rst
+++ b/doc/oper-guide/config.rst
@@ -1,12 +1,8 @@
-.. contents::
-   :depth: 3
-..
-
 Server config file format
 =========================
 
 General format
-==============
+~~~~~~~~~~~~~~
 
 The config file consists of a series of BIND-style blocks. Each block
 consists of a series of values inside it which pertain to configuration
@@ -25,7 +21,7 @@ Anything from a # to the end of a line is a comment. Blank lines are
 ignored. C-style comments are also supported.
 
 Specific blocks and directives
-==============================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Not all configuration blocks and directives are listed here, only the
 most common ones. More blocks and directives will be documented in later
@@ -768,7 +764,7 @@ name
     wildcards.
 
 Hostname resolution (DNS)
-=========================
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Charybdis uses solely DNS for all hostname/address lookups (no
 ``/etc/hosts`` or anything else). The DNS servers are taken from
diff --git a/doc/oper-guide/index.rst b/doc/oper-guide/index.rst
index b1ad2bbd..5b283f2f 100644
--- a/doc/oper-guide/index.rst
+++ b/doc/oper-guide/index.rst
@@ -10,7 +10,8 @@ Operators guide for the charybdis IRC server
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
+
    intro
    umodes
    cmodes
diff --git a/doc/oper-guide/intro.rst b/doc/oper-guide/intro.rst
index ab64141c..5585075d 100644
--- a/doc/oper-guide/intro.rst
+++ b/doc/oper-guide/intro.rst
@@ -1,10 +1,3 @@
-.. contents::
-   :depth: 3
-..
-
-Introduction
-============
-
 Scope of this document
 ======================
 
diff --git a/doc/oper-guide/oprivs.rst b/doc/oper-guide/oprivs.rst
index 620d6d90..5567b063 100644
--- a/doc/oper-guide/oprivs.rst
+++ b/doc/oper-guide/oprivs.rst
@@ -1,13 +1,6 @@
-.. contents::
-   :depth: 3
-..
-
 Oper privileges
 ===============
 
-Meanings of oper privileges
-===========================
-
 These are specified in privset{}.
 
 oper:admin, server administrator
diff --git a/doc/oper-guide/ucommands.rst b/doc/oper-guide/ucommands.rst
index cf471854..ba74edfa 100644
--- a/doc/oper-guide/ucommands.rst
+++ b/doc/oper-guide/ucommands.rst
@@ -1,13 +1,6 @@
-.. contents::
-   :depth: 3
-..
-
 User Commands
 =============
 
-User commands
-=============
-
 Standard IRC commands are not listed here. Several of the commands in
 the operator commands chapter can also be used by normal users.
 
diff --git a/doc/oper-guide/umodes.rst b/doc/oper-guide/umodes.rst
index 32e099e4..a05523e8 100644
--- a/doc/oper-guide/umodes.rst
+++ b/doc/oper-guide/umodes.rst
@@ -1,12 +1,5 @@
-.. contents::
-   :depth: 3
-..
-
-Umodes
-======
-
-Meanings of user modes
-======================
+User modes
+==========
 
 +a, server administrator
 ------------------------
@@ -155,7 +148,7 @@ This umode is set on clients connected via SSL/TLS. It cannot be set or
 unset after initial connection.
 
 Snomask usage
-=============
+~~~~~~~~~~~~~
 
 Usage is as follows:
 
@@ -176,7 +169,7 @@ Umode +s is oper only by default, but even if you allow nonopers to set
 it, they will not get any server notices.
 
 Meanings of server notice masks
-===============================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 +b, bot warnings
 ----------------