summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-09 08:37:33 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-09 08:37:33 +0000
commitf9ec6bd3df8b4754d0539e479e1ade5f02e30b72 (patch)
tree16b7188cc0aa790d35e2700216e2bd9c5f04b165 /docs/ref
parent175e6d77df526dea1ade94661e487072e7c7cd88 (diff)
Documented the new version numbering scheme introduced in r17357.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/django-admin.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 41f9bf649d..4c83bf0ad0 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -72,11 +72,11 @@ Determining the version
Run ``django-admin.py version`` to display the current Django version.
-Examples of output::
+The output follows the schema described in :pep:`386`::
- 0.95
- 0.96
- 0.97-pre-SVN-6069
+ 1.4.dev17026
+ 1.4a1
+ 1.4
Displaying debug output
-----------------------