summaryrefslogtreecommitdiff
path: root/docs/faq.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/faq.txt')
-rw-r--r--docs/faq.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/faq.txt b/docs/faq.txt
index c7f92d3580..eaccc6be43 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -227,9 +227,7 @@ 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. This should happen in a couple of
-months or so, although it's entirely possible that it could happen earlier.
-That translates into summer 2006.
+begin maintaining backwards compatibility.
The merging of Django's `magic-removal branch`_ went a long way toward Django
1.0.