merge two index pages

diff --git a/doc/oper-guide/charybdis-oper-guide.rst b/doc/oper-guide/charybdis-oper-guide.rst
deleted file mode 100644 (file)
index d626b45..0000000
--- a/doc/oper-guide/charybdis-oper-guide.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-============================================
-Operators guide for the charybdis IRC server
-============================================
-
-:Author: Jilles Tjoelker
-:Date:   2009
-
-.. contents::
-   :depth: 3
-..
-
-INTRO UMODES CMODES UCOMMANDS COMMANDS OPRIVS CONFIG

diff --git a/doc/oper-guide/conf.py b/doc/oper-guide/conf.py
index a1668dcb7f52fedf04d5eb724ed48b3317ed7cde..b741a30f69c1faec64271d5c47217f43013a3060 100644 (file)
--- a/doc/oper-guide/conf.py
+++ b/doc/oper-guide/conf.py
@@ -49,7 +49,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Charybdis operator guide'
-copyright = u'2017, Jilles Tjoelker'
+copyright = u'2009, Jilles Tjoelker'
 author = u'Jilles Tjoelker'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/doc/oper-guide/index.rst b/doc/oper-guide/index.rst
index 0a3295cca817f4eb68ae5e4814d5708b94d2ff1f..b1ad2bbd0020d4c8c9bdc9d241ca1207697b9962 100644 (file)
--- a/doc/oper-guide/index.rst
+++ b/doc/oper-guide/index.rst
@@ -3,15 +3,21 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to Charybdis operator guide's documentation!
-====================================================
+============================================
+Operators guide for the charybdis IRC server
+============================================
 
 Contents:
 
 .. toctree::
    :maxdepth: 2
-
-
+   intro
+   umodes
+   cmodes
+   ucommands
+   commands
+   oprivs
+   config
 
 Indices and tables
 ==================