summaryrefslogtreecommitdiff
path: root/docs/faq.txt
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-08-05 17:15:33 +0000
committerJustin Bronn <jbronn@gmail.com>2008-08-05 17:15:33 +0000
commitaa239e3e5405933af6a29dac3cf587b59a099927 (patch)
treeea2cbd139c9a8cf84c09e0b2008bff70e05927ef /docs/faq.txt
parent45b73c9a4685809236f84046cc7ffd32a50db958 (diff)
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/faq.txt')
-rw-r--r--docs/faq.txt17
1 files changed, 4 insertions, 13 deletions
diff --git a/docs/faq.txt b/docs/faq.txt
index 6d12a95cba..2c1ffa72db 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?
---------------------------------------------------------------
@@ -434,7 +425,7 @@ Using a ``FileField`` or an ``ImageField`` in a model takes a few steps:
of ``MEDIA_ROOT`` it should upload files.
#. All that will be stored in your database is a path to the file
- (relative to ``MEDIA_ROOT``). You'll must likely want to use the
+ (relative to ``MEDIA_ROOT``). You'll most likely want to use the
convenience ``get_<fieldname>_url`` function provided by Django. For
example, if your ``ImageField`` is called ``mug_shot``, you can get the
absolute URL to your image in a template with