5 files changed, 34 insertions, 26 deletions
diff --git a/doc/relnotes/contents.rst b/doc/relnotes/contents.rst
index 15f3ff948..73a3d270d 100644
--- a/doc/relnotes/contents.rst
+++ b/doc/relnotes/contents.rst
@@ -1,5 +1,5 @@
 
-Contents
+Release Notes
 ========================================
 
 .. toctree::
diff --git a/doc/website/contents.rst b/doc/website/contents.rst
index 55c302d01..56454e990 100644
--- a/doc/website/contents.rst
+++ b/doc/website/contents.rst
@@ -7,9 +7,10 @@ Contents
    index
    license
    faq
+   manual
    download
+   vcs
    pgpkey
    credits
    users
-   vcs
-   relnotes/index
+   relnotes/contents
diff --git a/doc/website/download.rst b/doc/website/download.rst
index 733a5c316..62fbc77fe 100644
--- a/doc/website/download.rst
+++ b/doc/website/download.rst
@@ -11,22 +11,6 @@ Unsure which release you want? Check the :ref:`FAQ <devel_vs_stable>`.
    If you are planning on developing an application using TLS, using
    the latest 1.11 release instead of 1.10 is highly recommended.
 
-Current Stable Series (1.10)
-----------------------------------------
-
-The latest stable branch release is :doc:`relnotes/1_10_7`:
-:tgz:`1.10.7` (:tgz_sig:`sig <1.10.7>`),
-:tbz:`1.10.7` (:tbz_sig:`sig <1.10.7>`)
-
-Windows Installer
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Windows installers for use with Visual C++ 2010
-:installer_x86_32:`1.10.5` (:installer_sig_x86_32:`sig <1.10.5>`)
-and
-:installer_x86_64:`1.10.5` (:installer_sig_x86_64:`sig <1.10.5>`)
-are also available.
-
 Current Development Series (1.11)
 ----------------------------------------
 
@@ -42,4 +26,20 @@ creates regular snapshots of trunk, which are available `here
 
    Versions 1.11.0 and later require a mostly-compliant C++11 compiler
    such as Clang 3.1 or GCC 4.7.
- 
+
+Current Stable Series (1.10)
+----------------------------------------
+
+The latest stable branch release is :doc:`relnotes/1_10_7`:
+:tgz:`1.10.7` (:tgz_sig:`sig <1.10.7>`),
+:tbz:`1.10.7` (:tbz_sig:`sig <1.10.7>`)
+
+..
+  Windows Installer
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  Windows installers for use with Visual C++ 2010
+  :installer_x86_32:`1.10.5` (:installer_sig_x86_32:`sig <1.10.5>`)
+  and
+  :installer_x86_64:`1.10.5` (:installer_sig_x86_64:`sig <1.10.5>`)
+  are also available.
diff --git a/doc/website/index.rst b/doc/website/index.rst
index 8fc5118c8..62d322c52 100644
--- a/doc/website/index.rst
+++ b/doc/website/index.rst
@@ -13,8 +13,9 @@ available. In addition to C++ you can use botan from Python or Perl
 (both included in tree), or with `Node.js
 <https://github.com/justinfreitag/node-botan>`_.
 
-See the :doc:`faq` for a list of common questions and answers and
-:doc:`download` for information about getting the latest release.
+See the :doc:`faq` for a list of common questions and answers,
+:doc:`download` for information about getting the latest release,
+and :doc:`manual` for the documentation.
 
 If you need help or have questions, send a mail to the `development
 mailing list
@@ -24,7 +25,3 @@ the library, and related topics are also welcome. If you find what you
 believe to be a bug, please file a ticket in `Bugzilla
 <http://bugs.randombit.net/>`_.
 
-The `manual <http://botan.randombit.net/manual>`_ and
-`Doxygen reference <http://botan.randombit.net/doxygen>`_ for
-the most recent revision is available online.
-
diff --git a/doc/website/manual.rst b/doc/website/manual.rst
new file mode 100644
index 000000000..4253561b4
--- /dev/null
+++ b/doc/website/manual.rst
@@ -0,0 +1,10 @@
+
+Reference Manual
+========================================
+
+The documentation is all under ``doc`` in your source tree, stored as ``.rst``
+(RestructedText) files. They can be processed by Sphinx to produce HTML or
+PDF output.
+
+The `manual </manual>`_ and `Doxygen reference </doxygen>`_ for the
+latest development release is available online.