From 2456ffa42c33d63b54579eae0f5b9cf2a8cd3714 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 13 Jul 2013 13:29:11 -0400 Subject: Fixed #20746 -- Removed Python 2.6 specific code/docs --- docs/howto/deployment/checklist.txt | 6 +++--- docs/howto/jython.txt | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'docs/howto') diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt index 1a235673e8..7d382401a0 100644 --- a/docs/howto/deployment/checklist.txt +++ b/docs/howto/deployment/checklist.txt @@ -217,9 +217,9 @@ This setting is required if you're using the :ttag:`ssi` template tag. Python Options ============== -If you're using Python 2.6.8+, it's strongly recommended that you invoke the -Python process running your Django application using the `-R`_ option or with -the :envvar:`PYTHONHASHSEED` environment variable set to ``random``. +It's strongly recommended that you invoke the Python process running your +Django application using the `-R`_ option or with the +:envvar:`PYTHONHASHSEED` environment variable set to ``random``. These options help protect your site from denial-of-service (DoS) attacks triggered by carefully crafted inputs. Such an attack can diff --git a/docs/howto/jython.txt b/docs/howto/jython.txt index 461a5d3804..96a3d64251 100644 --- a/docs/howto/jython.txt +++ b/docs/howto/jython.txt @@ -4,13 +4,6 @@ Running Django on Jython .. index:: Jython, Java, JVM -.. admonition:: Python 2.6 support - - Django 1.5 has dropped support for Python 2.5. Therefore, you have to use - a Jython 2.7 alpha release if you want to use Django 1.5 with Jython. - Please use Django 1.4 if you want to keep using Django on a stable Jython - version. - Jython_ is an implementation of Python that runs on the Java platform (JVM). Django runs cleanly on Jython version 2.5 or later, which means you can deploy Django on any Java platform. @@ -22,7 +15,7 @@ This document will get you up and running with Django on top of Jython. Installing Jython ================= -Django works with Jython versions 2.5b3 and higher. Download Jython at +Django works with Jython versions 2.5b3 and higher. Download Jython at http://www.jython.org/. Creating a servlet container -- cgit v1.3