Update roadmap and other docs

4 files changed, 16 insertions, 27 deletions

diff --git a/www/conf.py b/www/conf.py
index 9a55e8f..e9ae69b 100644
--- a/www/conf.py
+++ b/www/conf.py
@@ -24,7 +24,7 @@ import sys, os
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'github.tools.sphinx',
+    #'github.tools.sphinx',
     ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/www/documentation.rst b/www/documentation.rst
index fd7c086..af5cc44 100644
--- a/www/documentation.rst
+++ b/www/documentation.rst
@@ -1,8 +1,6 @@
-User Documentation
+Cheetah Recipes
 ==================
 
-Simple Recipes
---------------
 .. toctree::
    :maxdepth: 2
 
diff --git a/www/download.rst b/www/download.rst
index 36009c1..fd4a9fb 100644
--- a/www/download.rst
+++ b/www/download.rst
@@ -1,13 +1,13 @@
 Downloading Cheetah
 ===================
 
-The most recent stable release of Cheetah **v2.2.1** which was released on
-June 1st, 2009.
+The most recent stable release of Cheetah **v2.4.0** which was released on
+Oct 24th, 2009.
 
-Download v2.2.1
+Download v2.4.0
 ^^^^^^^^^^^^^^^
-* `v2.2.1 tarball <http://github.com/cheetahtemplate/cheetah/tarball/v2.2.1>`_
-* `v2.2.1 zip <http://github.com/cheetahtemplate/cheetah/zipball/v2.2.1>`_
+* `v2.4.0 tarball <http://github.com/cheetahtemplate/cheetah/tarball/v2.4.0>`_
+* `v2.4.0 zip <http://github.com/cheetahtemplate/cheetah/zipball/v2.4.0>`_
 
 You can keep up to date with release candidates or other downloads of Cheetah by 
 visiting the `cheetahtemplate GitHub page <http://github.com/cheetahtemplate/cheetah/downloads>`_
diff --git a/www/roadmap.rst b/www/roadmap.rst
index 48fe964..2251471 100644
--- a/www/roadmap.rst
+++ b/www/roadmap.rst
@@ -1,27 +1,18 @@
 Cheetah Roadmap
 ===============
 
-Cheetah v2.2
-------------
-The first release in the v2.2 series (*v2.2.0*) introduced an overhaul of 
-Cheetah's string handling to convert everything internally to use `unicode()`
-objects instead of encoded string buffers. 
-
-The subsequent releases in the v2.2 series are planned to have a number of 
-important upgrades to Cheetah's infrastructure:
-
-* Built-in Django support
-* Cleaner code generation 
-* Finish and document #defmacro support
-
 Cheetah v2.3
-------------
-*still in planning*
+^^^^^^^^^^^^^
+The Cheetah v2.3 is maintenance only for Python 2.3 support
 
-The third major series in the Cheetah 2 line of releases will have one focal point, **performance**
+Cheetah v2.4
+^^^^^^^^^^^^^
+Primary development and improvements towards Cheetah will go into 
+Cheetah v2.4 which will support Python v2.4 to v2.6.
 
 Cheetah v3.0
-------------
+^^^^^^^^^^^^^
 *still in planning*
 
-Cheetah 3000 will be the seminal milestone for running Cheetah on Python 3.0
+Cheetah v3.0 is for support for Python 3.xx
+