summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-08-26 15:52:21 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-08-26 15:52:21 +0000
commit30de7331d4f5be03116c681609bf2f7f5ee2354e (patch)
treee6b2d62a8f62c8acb7d487200a21665efdd8d1cc /docs/intro
parentc5c61b261ed495f0ce3ecd646dce6af4dfbe39b7 (diff)
Fixed #8326: added documentation about running Django on Jython. Docs originally written by Leo Soto, and then cleaned up a bit by me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/install.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/intro/install.txt b/docs/intro/install.txt
index bb361d52b6..c3c6733ba8 100644
--- a/docs/intro/install.txt
+++ b/docs/intro/install.txt
@@ -19,6 +19,13 @@ version 2.3 and higher, but we recommend installing Python 2.5 or later. If you
Get Python at http://www.python.org. If you're running Linux or Mac OS X, you
probably already have it installed.
+.. admonition:: Django on Jython
+
+ If you use Jython_ (a Python implementation for the Java platform), you'll
+ need to follow a few additional steps. See :ref:`howto-jython` for details.
+
+.. _jython: http://jython.org/
+
You can verify that Python's installed py typing ``python`` from your shell; you should see something like::
Python 2.5.1 (r251:54863, Jan 17 2008, 19:35:17)