summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz N Tiram <oz.tiram@gmail.com>2016-08-05 11:56:44 +0200
committerMarcel Hellkamp <marc@gsites.de>2016-08-26 14:18:32 +0200
commitf994f2fe7a8c4278453821787a892eb9ca6aa210 (patch)
treec6939b1d237c0d6ebe3e606fedcc22a07e542e24
parent5611e6f1459cf681cbcc84b3c4e1d335079c4106 (diff)
downloadbottle-drop-python-26.tar.gz
Clean all mentions of Python 2.6 from the docsdrop-python-26
-rw-r--r--docs/_locale/_pot/api.pot2
-rw-r--r--docs/_locale/_pot/index.pot2
-rw-r--r--docs/_locale/_pot/tutorial.pot4
-rw-r--r--docs/_locale/de_DE/LC_MESSAGES/api.po2
-rw-r--r--docs/_locale/de_DE/LC_MESSAGES/index.po2
-rw-r--r--docs/_locale/de_DE/LC_MESSAGES/tutorial.po4
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/_pot/api.po2
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/_pot/tutorial.po2
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/api.po2
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/index.po4
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/tutorial.po6
-rw-r--r--docs/_locale/ru_RU/LC_MESSAGES/api.po2
-rw-r--r--docs/_locale/ru_RU/LC_MESSAGES/index.po2
-rw-r--r--docs/_locale/ru_RU/LC_MESSAGES/tutorial.po4
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/_pot/api.po2
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/_pot/tutorial.po2
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/api.po2
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/index.po2
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/tutorial.po6
-rwxr-xr-xdocs/index.rst2
-rwxr-xr-xdocs/tutorial.rst4
21 files changed, 30 insertions, 30 deletions
diff --git a/docs/_locale/_pot/api.pot b/docs/_locale/_pot/api.pot
index bb88450..42c2399 100644
--- a/docs/_locale/_pot/api.pot
+++ b/docs/_locale/_pot/api.pot
@@ -934,7 +934,7 @@ msgid "limit the cookie to HTTPS connections (default: off)."
msgstr ""
#: ../../../bottle.py:docstring of bottle.BaseResponse.set_cookie:17
-msgid "prevents client-side javascript to read this cookie (default: off, requires Python 2.6 or newer)."
+msgid "prevents client-side javascript to read this cookie (default: off, requires Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.py:docstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/_pot/index.pot b/docs/_locale/_pot/index.pot
index dc3b619..5c3d676 100644
--- a/docs/_locale/_pot/index.pot
+++ b/docs/_locale/_pot/index.pot
@@ -53,7 +53,7 @@ msgid "Download and Install"
msgstr ""
#: ../../index.rst:49
-msgid "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+**."
+msgid "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.7 and 3.2+**."
msgstr ""
#: ../../index.rst:52
diff --git a/docs/_locale/_pot/tutorial.pot b/docs/_locale/_pot/tutorial.pot
index fc26d0d..39d1bd9 100644
--- a/docs/_locale/_pot/tutorial.pot
+++ b/docs/_locale/_pot/tutorial.pot
@@ -37,7 +37,7 @@ msgid "This will get you the latest development snapshot that includes all the n
msgstr ""
#: ../../tutorial.rst:47
-msgid "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:"
+msgid "Either way, you'll need Python 2.7 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:"
msgstr ""
#: ../../tutorial.rst:55
@@ -410,7 +410,7 @@ msgid "**secure:** Limit the cookie to HTTPS connections (default: off)."
msgstr ""
#: ../../tutorial.rst:422
-msgid "**httponly:** Prevent client-side javascript to read this cookie (default: off, requires Python 2.6 or newer)."
+msgid "**httponly:** Prevent client-side javascript to read this cookie (default: off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:424
diff --git a/docs/_locale/de_DE/LC_MESSAGES/api.po b/docs/_locale/de_DE/LC_MESSAGES/api.po
index 87ba19e..3da8079 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/api.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/api.po
@@ -1213,7 +1213,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/de_DE/LC_MESSAGES/index.po b/docs/_locale/de_DE/LC_MESSAGES/index.po
index 8de2e62..5a51ae7 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/index.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
"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+**."
+" standard library. Bottle runs with **Python 2.7 and 3.2+**."
msgstr ""
#: ../../index.rst:52
diff --git a/docs/_locale/de_DE/LC_MESSAGES/tutorial.po b/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
index 19c7724..203abea 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr ""
#: ../../tutorial.rst:47
msgid ""
-"Either way, you'll need Python 2.6 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 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:"
@@ -656,7 +656,7 @@ msgstr ""
#: ../../tutorial.rst:422
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
+" off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:424
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/_pot/api.po b/docs/_locale/pt_BR/LC_MESSAGES/_pot/api.po
index 2f3d98a..5841109 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/_pot/api.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/_pot/api.po
@@ -1190,7 +1190,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/_pot/tutorial.po b/docs/_locale/pt_BR/LC_MESSAGES/_pot/tutorial.po
index 65a437a..c80a8be 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/_pot/tutorial.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/_pot/tutorial.po
@@ -704,7 +704,7 @@ msgstr ""
#: ../../tutorial.rst:439
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
+" off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:441
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/api.po b/docs/_locale/pt_BR/LC_MESSAGES/api.po
index 3e460f0..e586857 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/api.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/api.po
@@ -1212,7 +1212,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/index.po b/docs/_locale/pt_BR/LC_MESSAGES/index.po
index 9fc568c..43ed8cc 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/index.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/index.po
@@ -75,8 +75,8 @@ msgid ""
"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+**."
-msgstr "Instale a última versão estável com ``pip install bottle``, ``easy_install -U bottle`` ou faça o download do `bottle.py`__(instável) dentro do diretório do seu projeto. Não há depedências [1]_ além das bibliotecas padrões do Python. Bottle é compatível com **Python 2.6+ e 3.2+**."
+" standard library. Bottle runs with **Python 2.7 and 3.2+**."
+msgstr "Instale a última versão estável com ``pip install bottle``, ``easy_install -U bottle`` ou faça o download do `bottle.py`__(instável) dentro do diretório do seu projeto. Não há depedências [1]_ além das bibliotecas padrões do Python. Bottle é compatível com **Python 2.7 e 3.2+**."
#: ../../index.rst:52
msgid "User's Guide"
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po b/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
index b58b4bb..bda5587 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
@@ -58,11 +58,11 @@ msgstr "Isso vai te dar o último snapshot de desenvolvimento que inclui todos o
#: ../../tutorial.rst:47
msgid ""
-"Either way, you'll need Python 2.6 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 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:"
-msgstr "De qualquer maneira, você irá precisar do Python 2.6 ou mais recente (incluindo 3.2+) para executar aplicações bottle. Se você não tem permissões para instalar pacotes globalmente no sistema ou simplesmente não deseja fazer, crie uma `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ primeiro:"
+msgstr "De qualquer maneira, você irá precisar do Python 2.7 ou mais recente (incluindo 3.2+) para executar aplicações bottle. Se você não tem permissões para instalar pacotes globalmente no sistema ou simplesmente não deseja fazer, crie uma `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ primeiro:"
#: ../../tutorial.rst:55
msgid "Or, if virtualenv is not installed on your system:"
@@ -658,7 +658,7 @@ msgstr ""
#: ../../tutorial.rst:422
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
+" off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:424
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/api.po b/docs/_locale/ru_RU/LC_MESSAGES/api.po
index 2dab4dc..9ef5907 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/api.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/api.po
@@ -1211,7 +1211,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/index.po b/docs/_locale/ru_RU/LC_MESSAGES/index.po
index 8087402..83078e7 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/index.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
"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+**."
+" standard library. Bottle runs with **Python 2.7 or 3.2+**."
msgstr ""
#: ../../index.rst:52
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po b/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
index 28b9441..85a6806 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr ""
#: ../../tutorial.rst:47
msgid ""
-"Either way, you'll need Python 2.6 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 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:"
@@ -656,7 +656,7 @@ msgstr ""
#: ../../tutorial.rst:422
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
+" off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:424
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/_pot/api.po b/docs/_locale/zh_CN/LC_MESSAGES/_pot/api.po
index 2f3d98a..5841109 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/_pot/api.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/_pot/api.po
@@ -1190,7 +1190,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/_pot/tutorial.po b/docs/_locale/zh_CN/LC_MESSAGES/_pot/tutorial.po
index 65a437a..c80a8be 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/_pot/tutorial.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/_pot/tutorial.po
@@ -704,7 +704,7 @@ msgstr ""
#: ../../tutorial.rst:439
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
+" off, requires Python 2.7 or newer)."
msgstr ""
#: ../../tutorial.rst:441
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/api.po b/docs/_locale/zh_CN/LC_MESSAGES/api.po
index a21af2d..5ae8fd2 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/api.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/api.po
@@ -1211,7 +1211,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:17
msgid ""
"prevents client-side javascript to read this cookie (default: off, requires "
-"Python 2.6 or newer)."
+"Python 2.7 or newer)."
msgstr ""
#: ../../../bottle.pydocstring of bottle.BaseResponse.set_cookie:20
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/index.po b/docs/_locale/zh_CN/LC_MESSAGES/index.po
index b3ca12f..6b273e1 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/index.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
"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+**."
+" standard library. Bottle runs with **Python 2.7 and 3.2+**."
msgstr ""
#: ../../index.rst:52
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po b/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
index 02a5b96..0579c7c 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr "在终端运行以上命令,即可下载到Bottle的最新开发版,
#: ../../tutorial.rst:47
msgid ""
-"Either way, you'll need Python 2.6 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 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:"
@@ -656,8 +656,8 @@ msgstr "**secure:** 只允许在HTTPS链接中访问cookie (默认: off)"
#: ../../tutorial.rst:422
msgid ""
"**httponly:** Prevent client-side javascript to read this cookie (default:"
-" off, requires Python 2.6 or newer)."
-msgstr "**httponly:** 防止客户端的javascript读取cookie (默认: off, 要求python 2.6或以上版本)"
+" off, requires Python 2.7 or newer)."
+msgstr "**httponly:** 防止客户端的javascript读取cookie (默认: off, 要求python 2.7或以上版本)"
#: ../../tutorial.rst:424
msgid ""
diff --git a/docs/index.rst b/docs/index.rst
index 3b8abad..8af9216 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.6+ and 3.2+**.
+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.7 and 3.2+**.
User's Guide
===============
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 0fe978b..e6dc7c5 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.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:
+Either way, you'll need Python 2.7 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
@@ -419,7 +419,7 @@ The :meth:`Response.set_cookie` method accepts a number of additional keyword ar
* **domain:** The domain that is allowed to read the cookie. (default: current domain)
* **path:** Limit the cookie to a given path (default: ``/``)
* **secure:** Limit the cookie to HTTPS connections (default: off).
-* **httponly:** Prevent client-side javascript to read this cookie (default: off, requires Python 2.6 or newer).
+* **httponly:** Prevent client-side javascript to read this cookie (default: off, requires Python 2.7 or newer).
If neither `expires` nor `max_age` is set, the cookie expires at the end of the browser session or as soon as the browser window is closed. There are some other gotchas you should consider when using cookies: