summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-03-12 08:04:32 -0400
committerTim Graham <timograham@gmail.com>2013-03-12 08:08:01 -0400
commite5c57fe1b429b401d47ac7bf8f9056b707c5ec07 (patch)
tree0fe6ecb74e20c3f60b59a61801c146e758f9640d /docs
parent1ac7d4e345a06224d4805162192b038001f4d2af (diff)
[1.5.x] Fixed #19965 - Added a warning that the tutorial is written for Python 2.
Thanks itsallvoodoo for the patch. Backport of e1bafdbffa from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial01.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index b6c2451ce6..6deef2b739 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -19,10 +19,15 @@ tell Django is installed and which version by running the following command:
python -c "import django; print(django.get_version())"
-You should see either the version of your Django installation or an error
-telling "No module named django". Check also that the version number matches
-the version of this tutorial. If they don't match, you can refer to the
-tutorial for your version of Django or update Django to the newest version.
+If Django is installed, you should see the version of your installation. If it
+isn't, you'll get an error telling "No module named django".
+
+This tutorial is written for Django |version| and Python 2.x. If the Django
+version doesn't match, you can refer to the tutorial for your version of Django
+or update Django to the newest version. If you are using Python 3.x, be aware
+that your code may need to differ from what is in the tutorial and you should
+continue using the tutorial only if you know what you are doing with Python
+3.x.
See :doc:`How to install Django </topics/install>` for advice on how to remove
older versions of Django and install a newer one.