upstream/ipython Commit - r3345:ebe563dc

7

8

Welcome to IPython. Our full documentation can be found in the ``docs/dist``

8

Welcome to IPython. Our full documentation can be found in the ``docs/dist``

9

subdirectory in ``.html`` and ``.pdf`` formats, also available online at our

9

subdirectory in ``.html`` and ``.pdf`` formats, also available online at our

10

`~~website~~ <http://ipython.~~scipy.org~~>`_. The ``docs/source`` directory ~~contains~~

10

`docs repo <http://ipython.github.com/ipython-doc>`_. The ``docs/source`` directory

11

the plaintext version of these manuals.

11

contains the plaintext version of these manuals.

12

13

14

Dependencies and supported Python versions

14

Dependencies and supported Python versions

19

functionality requires extra packages.

19

functionality requires extra packages.

20

21

Officially, IPython requires Python version 2.6 or 2.7. An experimental port

21

Officially, IPython requires Python version 2.6 or 2.7. An experimental port

22

of IPython to Python 3.x has been sarted, and is available at

22

of IPython to Python 3.x has been started, and is available at

23

http://github.com/takowl/ipython/tree/ipython-py3k.

23

http://github.com/takowl/ipython/tree/ipython-py3k.

24

25

27

===============

27

===============

28

29

You can run IPython from this directory without even installing it system-wide

29

You can run IPython from this directory without even installing it system-wide

30

by typing at the terminal:

30

by typing at the terminal::

31

32

.. code-block:: bash

32

$ python ipython.py

33

34

python ipython.py

35

33

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             Welcome to IPython. Our full documentation can be found in the ``docs/dist``
             subdirectory in ``.html`` and ``.pdf`` formats, also available online at our
-            `website <http://ipython.scipy.org>`_.  The ``docs/source`` directory contains
+            `docs repo <http://ipython.github.com/ipython-doc>`_.  The ``docs/source`` directory
-            the plaintext version of these manuals.
+            contains the plaintext version of these manuals.
             Dependencies and supported Python versions
             functionality requires extra packages.
             Officially, IPython requires Python version 2.6 or 2.7.  An experimental port
-            of IPython to Python 3.x has been sarted, and is available at
+            of IPython to Python 3.x has been started, and is available at
             http://github.com/takowl/ipython/tree/ipython-py3k.
             ===============
             You can run IPython from this directory without even installing it system-wide
-            by typing at the terminal:
+            by typing at the terminal::
-            .. code-block:: bash
+               $ python ipython.py
-               python ipython.py