From 0da73075219e8a0d01ee9485753454ebe3bbbc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Sat, 25 Mar 2017 11:09:44 -0400 Subject: [PATCH] merge two index pages --- doc/oper-guide/charybdis-oper-guide.rst | 12 ------------ doc/oper-guide/conf.py | 2 +- doc/oper-guide/index.rst | 14 ++++++++++---- 3 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 doc/oper-guide/charybdis-oper-guide.rst diff --git a/doc/oper-guide/charybdis-oper-guide.rst b/doc/oper-guide/charybdis-oper-guide.rst deleted file mode 100644 index d626b456..00000000 --- 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 a1668dcb..b741a30f 100644 --- 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 0a3295cc..b1ad2bbd 100644 --- 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 ==================