Browse files

Merge pull request #841 from ivanov/scipy-links

updated old links, other minor doc fixes

Also removed references to the defunct separate py3k repo, as per the recent mailing list thread.
  • Loading branch information...
2 parents 651e49e + a1dfa6e commit f09513eafcad067fb2e4c7e28a4919e409743191 @fperez fperez committed Oct 7, 2011
@@ -2509,7 +2509,7 @@ def color_switch_err(name):
msg = """\
Proper color support under MS Windows requires the pyreadline library.
You can find it at:
Gary's readline needs the ctypes module, from:
(Note that ctypes is already part of Python versions 2.5 and newer).
@@ -21,7 +21,7 @@
This module is taken from the NiPy project
-(, and is BSD licensed.
+(, and is BSD licensed.
@@ -162,6 +162,6 @@ they're automatically exposed as a website. It works like this:
.. [Sphinx] Sphinx.
.. [MatplotlibDocGuide]
.. [PEP257] PEP 257.
-.. [NumPyDocGuide] NumPy documentation guide.
-.. [NumPyExampleDocstring] NumPy example docstring.
+.. [NumPyDocGuide] NumPy documentation guide.
+.. [NumPyExampleDocstring] NumPy example docstring.
@@ -9,16 +9,15 @@ install all of its dependencies.
Please let us know if you have problems installing IPython or any of its
-dependencies. Officially, IPython requires Python version 2.6 or 2.7. There
-is an experimental port of IPython for Python3 `on GitHub
+dependencies. Officially, IPython requires Python 2.6, 2.7, 3.1, or 3.2.
.. warning::
Officially, IPython supports Python versions 2.6 and 2.7.
IPython 0.11 has a hard syntax dependency on 2.6, and will no longer work
- on Python <= 2.5.
+ on Python <= 2.5. You can find older versions of IPython which supported
+ Python <= 2.5 `here <>`_
Some of the installation approaches use the :mod:`setuptools` package and its
:command:`easy_install` command line program. In many scenarios, this provides
@@ -89,7 +88,7 @@ Installation from source
If you don't want to use :command:`easy_install`, or don't have it installed,
just grab the latest stable build of IPython from `here
-<>`_. Then do the following:
+<>`_. Then do the following:
.. code-block:: bash
@@ -117,7 +116,7 @@ use any of the following alternatives:
1. Install using :command:`easy_install`.
2. Install using our binary ``.exe`` Windows installer, which can be found
- `here <>`_
+ `here <>`_
3. Install from source, but using :mod:`setuptools` (``python
@@ -228,7 +227,8 @@ installed):
have to do this step.
If needed, the readline egg can be build and installed from source (see the
-wiki page at
+wiki page at
On Windows, you will need the PyReadline module. PyReadline is a separate,
Windows only implementation of readline that uses native Windows calls through
@@ -122,8 +122,9 @@ you'll work on a problem in pieces, organizing related pieces into cells and
moving forward as previous parts work correctly. This is much more convenient
for interactive exploration than breaking up a computation into scripts that
must be executed together, especially if parts of them take a long time to run
-(you can use tricks with namespaces and ``%run -i``, but we think the notebook
-is a more natural solution for that kind of problem).
+(In the traditional terminal-based IPython, you can use tricks with namespaces
+and ``%run -i`` to achieve this capability, but we think the notebook is a more
+natural solution for that kind of problem).
The only significant limitation the notebook currently has, compared to the qt
console, is that it can not run any code that expects input from the kernel
@@ -145,7 +146,7 @@ and then start a qt console pointing to that kernel::
Text input
-In addition to code cells and the output they procude (such as figures), you
+In addition to code cells and the output they produce (such as figures), you
can also type text not meant for execution. To type text, change the type of a
cell from ``Code`` to ``Markdown`` by using the button or the :kbd:`Ctrl-m m`
keybinding (see below). You can then type any text in Markdown_ syntax, as
@@ -200,7 +201,7 @@ key bindings you need to remember are:
Selected`` button).
* :kbd:`Ctrl-Enter`: execute the current cell in "terminal mode", where any
- output is shown but the cursor cursor stays in the current cell, whose input
+ output is shown but the cursor stays in the current cell, whose input
area is flushed empty. This is convenient to do quick in-place experiments
or query things like filesystem content without creating additional cells you
may not want saved in your notebook.
@@ -4,8 +4,8 @@
IPython Tips & Tricks
-The `IPython cookbook <>`_ details more
-things you can do with IPython.
+The `IPython cookbook <>`_ details more things
+you can do with IPython.
.. This is not in the current version:
@@ -8,7 +8,7 @@ You don't need to know anything beyond Python to start using IPython – just ty
commands as you would at the standard Python prompt. But IPython can do much
more than the standard prompt. Some key features are described here. For more
information, check the :ref:`tips page <tips>`, or look at examples in the
-`IPython cookbook <>`_.
+`IPython cookbook <>`_.
If you've never used Python before, you might want to look at `the official
tutorial <>`_ or an alternative, `Dive into
@@ -21,7 +21,7 @@
.. _`ipython manual`:
.. _ipython_github:
.. _ipython_github_repo:
-.. _ipython_downloads:
+.. _ipython_downloads:
.. _ipython_pypi:
.. _ZeroMQ:
@@ -35,7 +35,7 @@
.. _docutils:
.. _lyx:
.. _pep8:
-.. _numpy_coding_guide:
+.. _numpy_coding_guide:
.. Licenses
.. _GPL:
@@ -275,7 +275,7 @@ New features
* %edit: If you do '%edit pasted_block', pasted_block variable gets updated
with new data (so repeated editing makes sense)
-.. _Numpy Documentation Standard:
+.. _Numpy Documentation Standard:
.. _argparse:

0 comments on commit f09513e

Please sign in to comment.