diff --git a/docs/source/conf.py b/docs/source/conf.py index eda465c..33440a2 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -98,17 +98,20 @@ else: rst_prolog += """ .. warning:: - This documentation is for a development version of IPython. There may be - significant differences from the latest stable release. + This documentation covers a development version of IPython. The development + version may differ significantly from the latest stable release. """ rst_prolog += """ .. important:: - This is the documentation for IPython version > 6.0 which is had - stopped compatibility for python version lower than 3.3. If you are - looking for a version of IPython compatible with python 2.7 please see - the documentation for the IPython 5.x LTS (Long term support branch) + This documentation covers IPython versions 6.0 and higher. Beginning with + version 6.0, IPython stopped supporting compatibility with Python versions + lower than 3.3 including all versions of Python 2.7. + + If you are looking for an IPython version compatible with Python 2.7, + please use the IPython 5.x LTS release and refer to its documentation (LTS + is the long term support release). """ diff --git a/docs/source/coredev/release_process.rst b/docs/source/coredev/release_process.rst index dda8299..c8255ac 100644 --- a/docs/source/coredev/release_process.rst +++ b/docs/source/coredev/release_process.rst @@ -172,9 +172,9 @@ Get a fresh clone of the tag for building the release:: .. important:: - Following releases instructions have information to release IPython 5.x and - 6.x both on python 2 and python 3. When reasing IPython 6+, ignore the step - for python2. + These steps cover instructions for creating releases of IPython 5.x LTS and + IPython 6.x. Ignore release steps for Python 2 when releasing IPython 6.x + which no longer supports Python 2. Run the ``release`` script, this step requires having a current wheel, Python >=3.4 and Python 2.7.:: diff --git a/docs/source/overview.rst b/docs/source/overview.rst index 65eb60c..b3a4aab 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -239,8 +239,8 @@ This functionality is optional and now part of the `ipyparallel Portability and Python requirements ----------------------------------- -Version 6.0 of IPython work with python 3.3 and above. -Version 2.0 to 5 works with Python 2.7 and 3.3 or above. +Version 6.0+ supports compatibility with Python 3.3 and higher. +Versions 2.0 to 5.x work with Python 2.7.x releases and Python 3.3 and higher. Version 1.0 additionally worked with Python 2.6 and 3.2. Version 0.12 was the first version to fully support Python 3.