diff --git a/manual/develop.rst b/manual/develop.rst
index 78d37a6fef..0b51d700dd 100644
--- a/manual/develop.rst
+++ b/manual/develop.rst
@@ -1,7 +1,7 @@
 .. _develop:
 
 Setting up a |app| development environment
-===========================================
+===========================================================
 
 |app| is completely open source, licensed under the `GNU GPL v3 <http://www.gnu.org/copyleft/gpl.html>`_.
 This means that you are free to download and modify the program to your heart's content. In this section,
@@ -249,7 +249,7 @@ in your favorite editor and add the line::
 near the top of the file. Now run the command :command:`calibredb`. The very first line of output should be ``Hello, world!``.
 
 Having separate "normal" and "development" |app| installs on the same computer
--------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------
 
 The |app| source tree is very stable and rarely breaks, but if you feel the need to run from source on a separate
 test library and run the released |app| version with your everyday library, you can achieve this easily using
diff --git a/manual/faq.rst b/manual/faq.rst
index f6d53bcf74..ac5486c54f 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -123,7 +123,7 @@ conversion dialog to control how the Table of Contents is generated.
     and customizing the HTML to ZIP plugin.
 
 The EPUB I produced with |app| is not valid?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 |app| does not guarantee that an EPUB produced by it is valid. The only
 guarantee it makes is that if you feed it valid XHTML 1.1 + CSS 2.1 it will
@@ -134,7 +134,7 @@ of its users. If you need a tool that always produces valid EPUBs, |app| is not
 for you.
 
 How do I use some of the advanced features of the conversion tools?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~J
 You can get help on any individual feature of the converters by mousing over
 it in the GUI or running ``ebook-convert dummy.html .epub -h`` at a terminal.
 A good place to start is to look at the following demo file that demonstrates
@@ -150,7 +150,7 @@ Device Integration
   :local:
 
 What devices does |app| support?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 |app| can directly connect to all the major (and most of the minor) ebook
 reading devices, smarthphones, tablets, etc.  In addition, using the
 :guilabel:`Connect to folder` function you can use it with any ebook reader
@@ -179,7 +179,7 @@ will appear in the next release of |app|. To send us the output, open a bug repo
 See `calibre bugs <http://calibre-ebook.com/bugs>`_.
 
 My device is not being detected by |app|?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Follow these steps to find the problem:
 
@@ -276,7 +276,7 @@ simplest is to simply re-name the executable file that launches the library prog
 `in the forums <http://www.mobileread.com/forums/showthread.php?t=65809>`_.
 
 How do I use |app| with my iPad/iPhone/iPod touch?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Over the air
 ^^^^^^^^^^^^^^
@@ -528,7 +528,7 @@ available `from here <http://www.mobileread.com/forums/showthread.php?t=244202>`
     above plugin useless, unless you root your Kindle and install custom firmware.
 
 I am getting an error when I try to use |app| with my Kobo Touch/Glo/etc.?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Kobo has very buggy firmware. Connecting to it has been known to fail at
 random. Certain combinations of motherboard, USB ports/cables/hubs can
diff --git a/manual/index.rst b/manual/index.rst
index 47d3b95a46..cec5b12278 100644
--- a/manual/index.rst
+++ b/manual/index.rst
@@ -1,7 +1,7 @@
 .. include:: simple_index.rst
 
 The main |app| user interface
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -9,7 +9,7 @@ The main |app| user interface
    gui
 
 Adding your favorite news website to |app|
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -17,7 +17,7 @@ Adding your favorite news website to |app|
    news
 
 The |app| ebook viewer
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -25,7 +25,7 @@ The |app| ebook viewer
    viewer
 
 Customizing |app|'s ebook conversion
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -33,7 +33,7 @@ Customizing |app|'s ebook conversion
    conversion
 
 Editing ebooks
-^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -41,7 +41,7 @@ Editing ebooks
    edit
 
 Comparing ebooks
-^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -57,7 +57,7 @@ Editing ebook metadata
    metadata
 
 Frequently Asked Questions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -81,7 +81,7 @@ Customizing |app|
    customize
 
 The Command Line Interface
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2
@@ -89,7 +89,7 @@ The Command Line Interface
    generated/|lang|/cli-index
 
 Setting up a |app| development environment
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. toctree::
    :maxdepth: 2