summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2015-12-07 15:16:34 +0100
committerMarcel Hellkamp <marc@gsites.de>2015-12-07 15:16:34 +0100
commitd567af487ee0ef8a4c669f23b0bc8432302294b9 (patch)
tree19e81b91d2bc3287f3257837292e57c7a6d0af33
parent901f04962b19e5bd009c38d0716d5f65e4ebf323 (diff)
downloadbottle-d567af487ee0ef8a4c669f23b0bc8432302294b9.tar.gz
Move to 2.6/3.2 in documentation
-rwxr-xr-xdocs/index.rst2
-rwxr-xr-xdocs/tutorial.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 7b26fb5..3b8abad 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,7 +46,7 @@ Run this script or paste it into a Python console, then point your browser to `<
.. __: https://github.com/bottlepy/bottle/raw/master/bottle.py
-Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle runs with **Python 2.5+ and 3.x**.
+Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle runs with **Python 2.6+ and 3.2+**.
User's Guide
===============
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 6c0140f..0fe978b 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -44,7 +44,7 @@ This will get you the latest development snapshot that includes all the new feat
$ sudo easy_install bottle # alternative without pip
$ sudo apt-get install python-bottle # works for debian, ubuntu, ...
-Either way, you'll need Python 2.5 or newer (including 3.x) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:
+Either way, you'll need Python 2.6 or newer (including 3.2+) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:
.. code-block:: bash