summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2006-10-23 23:53:24 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2006-10-23 23:53:24 +0000
commitc65cd1be99d493b28d6ca48c27d69fed9ca80ecc (patch)
tree76f84c62e3ac5cd5172d43dd73a651bb8574e2d1
parent025980be53b424a036d940baca773a0bdd74e712 (diff)
Fixes #2950 -- Removed reference to a 'Summer 2006' release of v1.0
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-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.