Move the roadmap into the handbook so end-users can find it.

3 files changed, 14 insertions, 9 deletions

diff --git a/doc/manual/contents.rst b/doc/manual/contents.rst
index 8fff76550..6b97f7a02 100644
--- a/doc/manual/contents.rst
+++ b/doc/manual/contents.rst
@@ -43,3 +43,4 @@ Contents
    fuzzing
    deprecated
    abi
+   roadmap
diff --git a/doc/roadmap.rst b/doc/manual/roadmap.rst
index e2bd9f869..03461da20 100644
--- a/doc/roadmap.rst
+++ b/doc/manual/roadmap.rst
@@ -1,5 +1,5 @@
 
-Botan Development Roadmap
+Development Roadmap
 ========================================
 
 Near Term Plans
@@ -31,6 +31,7 @@ ECC Refactoring
 
 Refactoring how elliptic curve groups are stored, sharing representation and
 allowing better precomputations (eg precomputing base point multiples).
+[Completed in 2.5.0]
 
 Performance Improvements
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -38,6 +39,9 @@ Performance Improvements
 The eventual goal would be performance parity with OpenSSL, but initial
 target is probably more like "no worse than 30% slower for any algorithm".
 
+[Major improvements were made in ECC and RSA performance were made
+between 2.4.0 and 2.7.0, measurement and optimization work is ongoing.]
+
 Elliptic Curve Pairings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -58,15 +62,15 @@ Initial work is focused on features which are included in TLS v1.3 but also
 available for TLS v1.2 (such as PSS signatures and FFDHE) as well as
 refactorings which will make the eventual implementation of v1.3 simpler.
 Assuming no source of dedicated funding appears, a full v1.3 implementation will
-likely not available until late in 2018.
+likely not available until sometime in 2019.
 
 ASN.1 Redesign
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. note::
 
-   This project has been deferred to 3.x as constexpr will likely make it
-   much easier to implement.
+   This project has been deferred to 3.x as C++14 extended constexpr
+   will likely make it much easier to implement.
 
 The current ASN.1 library (DER_Encoder/BER_Decoder) does make it
 roughly possible to write C++ code matching the ASN.1 structures. But
diff --git a/doc/manual/support.rst b/doc/manual/support.rst
index 209f0d6c7..ca1351736 100644
--- a/doc/manual/support.rst
+++ b/doc/manual/support.rst
@@ -50,17 +50,17 @@ properly.
 Branch Support Status
 -------------------------
 
-Following table provides the support status for Botan branches. Any branch not
-listed here (including 1.11) is no longer supported. Dates in the future are
-approximate.
+Following table provides the support status for Botan branches as of May 2018.
+Any branch not listed here (including 1.11) is no longer supported.
+Dates in the future are approximate.
 
 ============== ============== ========================== ============
 Branch         First Release  End of Active Development  End of Life
 ============== ============== ========================== ============
 1.8            2008-12-08     2010-08-31                 2016-02-13
 1.10           2011-06-20     2012-07-10                 2018-12-31
-2              2017-01-06     2019-01-01                 2021-12-31
-3 (planned)    2019-04-01     2022-01-01                 2023-12-31
+2.x            2017-01-06     2019-01-01                 2021-12-31
+3.x (planned)  2019-07-01     2022-01-01                 2023-12-31
 ============== ============== ========================== ============
 
 "Active development" refers to adding new features and optimizations. At the