##// END OF EJS Templates
Update phrasing with Carol suggestions.
Matthias Bussonnier -
Show More
@@ -98,17 +98,20 else:
98 98 rst_prolog += """
99 99 .. warning::
100 100
101 This documentation is for a development version of IPython. There may be
102 significant differences from the latest stable release.
101 This documentation covers a development version of IPython. The development
102 version may differ significantly from the latest stable release.
103 103 """
104 104
105 105 rst_prolog += """
106 106 .. important::
107 107
108 This is the documentation for IPython version > 6.0 which is had
109 stopped compatibility for python version lower than 3.3. If you are
110 looking for a version of IPython compatible with python 2.7 please see
111 the documentation for the IPython 5.x LTS (Long term support branch)
108 This documentation covers IPython versions 6.0 and higher. Beginning with
109 version 6.0, IPython stopped supporting compatibility with Python versions
110 lower than 3.3 including all versions of Python 2.7.
111
112 If you are looking for an IPython version compatible with Python 2.7,
113 please use the IPython 5.x LTS release and refer to its documentation (LTS
114 is the long term support release).
112 115
113 116 """
114 117
@@ -172,9 +172,9 Get a fresh clone of the tag for building the release::
172 172
173 173 .. important::
174 174
175 Following releases instructions have information to release IPython 5.x and
176 6.x both on python 2 and python 3. When reasing IPython 6+, ignore the step
177 for python2.
175 These steps cover instructions for creating releases of IPython 5.x LTS and
176 IPython 6.x. Ignore release steps for Python 2 when releasing IPython 6.x
177 which no longer supports Python 2.
178 178
179 179 Run the ``release`` script, this step requires having a current wheel, Python
180 180 >=3.4 and Python 2.7.::
@@ -239,8 +239,8 This functionality is optional and now part of the `ipyparallel
239 239 Portability and Python requirements
240 240 -----------------------------------
241 241
242 Version 6.0 of IPython work with python 3.3 and above.
243 Version 2.0 to 5 works with Python 2.7 and 3.3 or above.
242 Version 6.0+ supports compatibility with Python 3.3 and higher.
243 Versions 2.0 to 5.x work with Python 2.7.x releases and Python 3.3 and higher.
244 244 Version 1.0 additionally worked with Python 2.6 and 3.2.
245 245 Version 0.12 was the first version to fully support Python 3.
246 246
General Comments 0
You need to be logged in to leave comments. Login now