diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2014-01-18 16:34:47 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2014-01-18 16:34:47 +0900 |
| commit | 39287f95535866e2d4d1544f8688ce22fd19a69a (patch) | |
| tree | a9986764ecd8124fd1c93c6185ea3488e71e2b20 /doc | |
| parent | caf7fccc80bc2fb485599113bb4e977de0729169 (diff) | |
| parent | 80a0712b8190ca3d55531a9d1fe3205e364437d1 (diff) | |
| download | sphinx-39287f95535866e2d4d1544f8688ce22fd19a69a.tar.gz | |
merge heads
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install.rst | 6 | ||||
| -rw-r--r-- | doc/intro.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/install.rst b/doc/install.rst index bf653872..71e37e9c 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -4,7 +4,7 @@ Installing Sphinx ================= Since Sphinx is written in the Python language, you need to install Python -(the required version is at least 2.5) and Sphinx. +(the required version is at least 2.6) and Sphinx. Sphinx packages are available on the `Python Package Index <https://pypi.python.org/pypi/Sphinx>`_. @@ -79,8 +79,8 @@ sidebar and under "Quick Links", click "Windows Installer" to download. .. note:: - Currently, Python offers two major versions, 2.x and 3.x. Sphinx 1.2 can run - under Python 2.5 to 2.7 and 3.1 to 3.3, with the recommended version being + Currently, Python offers two major versions, 2.x and 3.x. Sphinx 1.3 can run + under Python 2.6, 2.7, 3.2, 3.3, with the recommended version being 2.7. This chapter assumes you have installed Python 2.7. Follow the Windows installer for Python. diff --git a/doc/intro.rst b/doc/intro.rst index 66d0c58d..dd541bf1 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -54,7 +54,7 @@ See the :ref:`pertinent section in the FAQ list <usingwith>`. Prerequisites ------------- -Sphinx needs at least **Python 2.5** or **Python 3.1** to run, as well as the +Sphinx needs at least **Python 2.6** or **Python 3.2** to run, as well as the docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.7 or some (not broken) SVN trunk snapshot. If you like to have source code highlighting support, you must also install the Pygments_ library. |