Update for 1.11.12 release1.11.12

4 files changed, 10 insertions, 6 deletions

diff --git a/doc/dev/release_process.rst b/doc/dev/release_process.rst
index b7cc1655d..7f7f97abc 100644
--- a/doc/dev/release_process.rst
+++ b/doc/dev/release_process.rst
@@ -12,8 +12,9 @@ Pre Release Checks
 Confirm that the release notes under ``doc/relnotes`` are accurate and
 complete and that the version number in ``botan_version.py`` is
 correct. Update the release date in the release notes and change the
-entry for the appropriate branch in ``doc/download.rst`` to point to
-the new release. Add the new release to ``relnotes/index.rst``.
+entry for the appropriate branch in ``doc/website/download.rst`` to
+point to the new release. Add the new release to
+``doc/relnotes/index.rst``.
 
 Check in these changes (alone, with no other modifications) with a
 checkin message along the lines of "Update for X.Y.Z release", then
diff --git a/doc/relnotes/1_11_12.rst b/doc/relnotes/1_11_12.rst
index 294561a4e..cc304b824 100644
--- a/doc/relnotes/1_11_12.rst
+++ b/doc/relnotes/1_11_12.rst
@@ -1,4 +1,4 @@
-Version 1.11.12, Not Yet Released
+Version 1.11.12, 2015-01-02
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * Add Curve25519. The implementation is based on curve25519-donna-c64.c
@@ -8,7 +8,8 @@ Version 1.11.12, Not Yet Released
 
 * Add Poly1305, based on the implementation poly1305-donna by Andrew Moon.
 
-* Add the ChaCha20Poly1305 AEAD defined in draft-irtf-cfrg-chacha20-poly1305-03
+* Add the ChaCha20Poly1305 AEADs defined in draft-irtf-cfrg-chacha20-poly1305-03
+  and draft-agl-tls-chacha20poly1305-04.
 
 * Add ChaCha20Poly1305 ciphersuites for TLS compatible with Google's servers
   following draft-agl-tls-chacha20poly1305-04
@@ -17,3 +18,4 @@ Version 1.11.12, Not Yet Released
   private keys default to using AES-256/GCM instead of AES-256/CBC
 
 * Define OIDs for OCB mode with AES, Serpent and Twofish.
+
diff --git a/doc/relnotes/index.rst b/doc/relnotes/index.rst
index 0794c7430..e41cb57e9 100644
--- a/doc/relnotes/index.rst
+++ b/doc/relnotes/index.rst
@@ -8,6 +8,7 @@ Series 1.11
 .. toctree::
    :maxdepth: 1
 
+   1_11_12
    1_11_11
    1_11_10
    1_11_9
diff --git a/doc/website/download.rst b/doc/website/download.rst
index f35d0ddda..67f5e1c2f 100644
--- a/doc/website/download.rst
+++ b/doc/website/download.rst
@@ -14,8 +14,8 @@ Unsure which release you want? Check the :ref:`FAQ <devel_vs_stable>`.
 Current Development Series (1.11)
 ----------------------------------------
 
-The latest development release is :doc:`relnotes/1_11_11`:
-:tgz:`1.11.11` (:tgz_sig:`sig <1.11.11>`)
+The latest development release is :doc:`relnotes/1_11_12`:
+:tgz:`1.11.12` (:tgz_sig:`sig <1.11.12>`)
 
 To access the latest unreleased sources, see :doc:`vcs`. A script also
 creates regular snapshots of trunk, which are available `here