summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/faq.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/docs/faq.txt b/docs/faq.txt
index 6d12a95cba..978106f432 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -224,19 +224,10 @@ means!).
When will you release Django 1.0?
---------------------------------
-Short answer: When we're comfortable with Django's APIs, have added all
-features that we feel are necessary to earn a "1.0" status, and are ready to
-begin maintaining backwards compatibility.
+See our `version one roadmap`_ for the detailed timeline. We're aiming for
+September 2, 2008.
-The merging of Django's `Queryset Refactor branch`_ went a long way toward Django
-1.0. Merging the `Newforms Admin branch` will be another important step.
-
-Of course, you should note that `quite a few production sites`_ use Django in
-its current status. Don't let the lack of a 1.0 turn you off.
-
-.. _Queryset Refactor branch: http://code.djangoproject.com/wiki/QuerysetRefactorBranch
-.. _Newforms Admin branch: http://code.djangoproject.com/wiki/NewformsAdminBranch
-.. _quite a few production sites: http://code.djangoproject.com/wiki/DjangoPoweredSites
+.. _version one roadmap: http://code.djangoproject.com/wiki/VersionOneRoadmap
How can I download the Django documentation to read it offline?
---------------------------------------------------------------