bring roadmap up to date

i2p2www/pages/site/docs/index.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Index to Technical Documentation{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}December 2015{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.23{% endblock %}
+{% block accuratefor %}0.9.24{% endblock %}
 {% block content %}
 <p>{% trans -%}
 Following is an index to the technical documentation for I2P.
@@ -243,9 +243,7 @@ Traditionally used only by Java applications and higher-level APIs.
 </li><li>
 <a href="https://www.transifex.net/projects/p/I2P/">{{ _('Source translation at Transifex') }}</a>
 </li><li>
-<a href="https://trac.i2p2.de/wiki/Roadmaps/1.0">{{ _('Roadmap wiki') }}</a>
+<a href="{{ site_url('get-involved/roadmap') }}">{{ _('Roadmap') }}</a>
-</li><li>
-<a href="{{ site_url('get-involved/roadmap') }}">{{ _('Old roadmap') }}</a> ({{ _('not current') }})
 </li><li>
 <a href="{{ site_url('get-involved/todo') }}">{{ _('To Do List') }}</a> ({{ _('not current') }})
 </li><li>

i2p2www/pages/site/get-involved/roadmap.html

@@ -1,37 +1,184 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Roadmap') }}{% endblock %}
+{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
 {% block content %}
 
-<h2 id="v0.9">0.9</h2>
+<p>
+This is the official project roadmap for the desktop and Android Java I2P releases only.
+</p><p>
+For details and discussion on specific items, search on trac or zzz.i2p.
+For contents of past releases, see the release notes.
+For other project goals, see the meeting notes.
+</p><p>
+Note that we do not have a particular target for numbering a release as "1.0".
+We plan to continue numbering releases as 0.9.x for now.
+We do not maintain separate unstable and stable branches or releases.
+We have a single, stable release path.
+Our normal release cycle is 6-10 weeks.
+</p>
+
+
+
+<h2 id="v0.9.24">0.9.24</h2>
+<p><b>Target release date: Week of January 25, 2016</b></p>
+<ul><li>
+SAM v3.2
+</li><li>
+Require Java 7
+</li><li>
+NetDB Family
+</li><li>
+Remove commons-logging
+</li><li>
+Use SSU Extended options to request introduction
+</li><li>
+Experimental Sybil analysis tool
+</li><li>
+Unit test improvements
+</li><li>
+Complete transition to Ed25519 signatures for most routers
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+
+
+<h2 id="v0.9.25">0.9.25</h2>
+<p><b>Target release date: March 2016</b></p>
+<ul><li>
+Wrapper 3.5.27
+</li><li>
+GMP 6.0
+</li><li>
+SAM v3.3
+</li><li>
+Sybil tool enhancements
+</li><li>
+</li><li>
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+
+
+<h2 id="v0.9.26">0.9.26</h2>
+<p><b>Target release date: May 2016</b></p>
+<ul><li>
+New subscription protocol, addressbook support
+</li><li>
+Sybil tool migration to automatic?
+</li><li>
+Streaming improvements
+</li><li>
+</li><li>
+</li><li>
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+
+
+
+<h2 id="v0.9.27">0.9.27 - 0.9.29</h2>
+<p><b>Time frame: 2nd Half 2016</b></p>
+<ul><li>
+Pluggable transports?
+</li><li>
+Crypto migration for existing hidden services
+</li><li>
+Initial work on NTCP2
+</li><li>
+Initial work on New DH
+</li><li>
+Initial work on new crypto
+</li><li>
+Initial work on LS2 with multi-destination support
+</li><li>
+GMP 6.1
+</li><li>
+Initial work on new netdb ("next backend")
+</li><li>
+Console redesign phase 1
+</li><li>
+Initial work on new naming system with Grothoff
+</li><li>
+Jetty 9.2
+</li><li>
+Bundle i2pcontrol? (un-pluginize)
+</li><li>
+SQLite address book for Android
+</li><li>
+Android UI enhancements
+</li><li>
+Unit test improvements
+</li><li>
+Private test net setup improvements
+</li><li>
+Integrated chat client?
+</li><li>
+Streaming improvements
+</li><li>
+Performance improvements
+</li><li>
+Capacity improvements
+</li><li>
+NTCP Pumper redesign
+</li><li>
+I2PTunnel socket-side NIO
+</li><li>
+</li><li>
+</li><li>
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+
+<h2 id="2017">2017</h2>
 <ul>
-<li>{% trans -%}
+<li>
-Include some seed data in the distribution so a central reseed location isn't required?
+New crypto
-{%- endtrans %}</li>
+</li><li>
+NTCP2
+</li><li>
+LS2 with multi-destination support
+</li><li>
+New netdb
+</li><li>
+New DH
+</li><li>
+Full support for massively popular hidden services
+</li><li>
+Initial work on new naming system
+</li><li>
+Console redesign phase 2
+</li><li>
+Streaming improvements
+</li><li>
+Performance improvements
+</li><li>
+Capacity improvements
+</li>
 <li>{% trans todo=site_url('get-involved/todo') -%}
 Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
 {%- endtrans %}</li>
-<li>{% trans %}Improve help pages and website{% endtrans %}</li>
-<li>{% trans %}More translations{% endtrans %}</li>
-<li>{% trans %}SSU disconnect message{% endtrans %}</li>
-<li>{% trans %}Iterative floodfill lookups{% endtrans %}</li>
-</ul>
-
-<h2 id="v1.0">1.0</h2>
-<ul>
-<li>{% trans %}Full review of anonymity issues and other vulnerabilities{% endtrans %}</li>
-<li>{% trans -%}
-Reduce memory usage, remove debugging overhead, make it run better on slow and embedded machines
-{%- endtrans %}</li>
-<li>{{ _('Docs') }}</li>
-</ul>
-
-<h2 id="v2.0">2.0</h2>
-<ul>
 <li>{% trans %}Full restricted routes{% endtrans %}</li>
+<li>{% trans %}Tunnel mixing and padding{% endtrans %}</li>
+<li>{% trans %}User defined message delays{% endtrans %}</li>
 </ul>
 
-<h2 id="v3.0">3.0</h2>
+
+
+
+<h2 id="2018">2018</h2>
 <ul>
+<li>{% trans todo=site_url('get-involved/todo') -%}
+Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
+{%- endtrans %}</li>
+<li>{% trans %}Full restricted routes{% endtrans %}</li>
 <li>{% trans %}Tunnel mixing and padding{% endtrans %}</li>
 <li>{% trans %}User defined message delays{% endtrans %}</li>
 </ul>

i2p2www/pages/site/get-involved/todo.html

@@ -28,6 +28,11 @@ Stop & go mix w/ garlics & tunnels
 {% endblock %}
 
 {% block content %}
+<p>{% trans roadmap=site_url('get-involved/roadmap') -%}
+Note: This page is not up-to-date.
+See <a href="{{ roadmap }}">the roadmap</a> for current plans.
+{%- endtrans %}</p>
+
 <p>{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
 Below is a more detailed (yet still incomplete) discussion of the major areas
 of future development on the core I2P network, spanning the plausibly planned