Skip to content
This repository

updated old scipy.org links, other minor doc fixes #841

Merged
merged 2 commits into from over 2 years ago

3 participants

Paul Ivanov Thomas Kluyver Fernando Perez
Paul Ivanov
Collaborator

I updated the docs and moved some old ipython.scipy.org links to point to the relevant new places.

Also removed references to the defunct separate py3k repo, as per the recent mailing list thread.

docs/source/interactive/tips.txt
@@ -4,7 +4,7 @@
4 4
 IPython Tips & Tricks
5 5
 =====================
6 6
 
7  
-The `IPython cookbook <http://ipython.scipy.org/moin/Cookbook>`_ details more
  7
+The `IPython cookbook <http://wiki.ipython.org/index.php?title=Cookbook>`_ details more
1
Thomas Kluyver Collaborator

The wiki now offers slightly cleaner URLs like http://wiki.ipython.org/Cookbook

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
docs/source/install/install.txt
@@ -9,9 +9,8 @@ install all of its dependencies.
9 9
 
10 10
 
11 11
 Please let us know if you have problems installing IPython or any of its
12  
-dependencies. Officially, IPython requires Python version 2.6 or 2.7.  There
13  
-is an experimental port of IPython for Python3 `on GitHub 
14  
-<https://github.com/ipython/ipython-py3k>`_
  12
+dependencies. Officially, IPython requires Python versions 2.6 to 2.7 and 3.1
1
Thomas Kluyver Collaborator

Nitpick: we requite 2.6/2.7 or 3.1/3.2 (rather than 'and')

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Thomas Kluyver
Collaborator

Thanks for updating these, Paul - the changes look good to me.

Paul Ivanov
Collaborator

addressed Thomas' suggestions, also replaced a link to a github download page to the ipython.org one, and added a link for the releases archive for obtaining IPython versions which worked on Python <=2.5 inside the warning about how 2.6 is a hard dependency now

Fernando Perez fperez merged commit f09513e into from October 07, 2011
Fernando Perez fperez closed this October 07, 2011
Fernando Perez
Owner

Thanks a lot, @ivanov! Merged.

Fernando Perez fperez referenced this pull request from a commit January 10, 2012
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
2  IPython/core/magic.py
@@ -2509,7 +2509,7 @@ def color_switch_err(name):
2509 2509
             msg = """\
2510 2510
 Proper color support under MS Windows requires the pyreadline library.
2511 2511
 You can find it at:
2512  
-http://ipython.scipy.org/moin/PyReadline/Intro
  2512
+http://ipython.org/pyreadline.html
2513 2513
 Gary's readline needs the ctypes module, from:
2514 2514
 http://starship.python.net/crew/theller/ctypes
2515 2515
 (Note that ctypes is already part of Python versions 2.5 and newer).
2  IPython/utils/autoattr.py
@@ -21,7 +21,7 @@
21 21
 Notes
22 22
 -----
23 23
 This module is taken from the NiPy project
24  
-(http://neuroimaging.scipy.org/site/index.html), and is BSD licensed.
  24
+(http://nipy.sourceforge.net/nipy/stable/index.html), and is BSD licensed.
25 25
 
26 26
 Authors
27 27
 -------
4  docs/source/development/doc_guide.txt
@@ -162,6 +162,6 @@ they're automatically exposed as a website. It works like this:
162 162
 .. [Sphinx] Sphinx. http://sphinx.pocoo.org/
163 163
 .. [MatplotlibDocGuide] http://matplotlib.sourceforge.net/devel/documenting_mpl.html
164 164
 .. [PEP257] PEP 257.  http://www.python.org/peps/pep-0257.html
165  
-.. [NumPyDocGuide] NumPy documentation guide.  http://projects.scipy.org/numpy/wiki/CodingStyleGuidelines
166  
-.. [NumPyExampleDocstring] NumPy example docstring. http://projects.scipy.org/numpy/browser/trunk/doc/EXAMPLE_DOCSTRING.txt
  165
+.. [NumPyDocGuide] NumPy documentation guide. https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
  166
+.. [NumPyExampleDocstring] NumPy example docstring.  https://raw.github.com/numpy/numpy/master/doc/HOWTO_BUILD_DOCS.rst.txt
167 167
 
14  docs/source/install/install.txt
@@ -9,16 +9,15 @@ install all of its dependencies.
9 9
 
10 10
 
11 11
 Please let us know if you have problems installing IPython or any of its
12  
-dependencies. Officially, IPython requires Python version 2.6 or 2.7.  There
13  
-is an experimental port of IPython for Python3 `on GitHub 
14  
-<https://github.com/ipython/ipython-py3k>`_
  12
+dependencies. Officially, IPython requires Python 2.6, 2.7, 3.1, or 3.2.
15 13
 
16 14
 .. warning::
17 15
 
18 16
     Officially, IPython supports Python versions 2.6 and 2.7.
19 17
 
20 18
     IPython 0.11 has a hard syntax dependency on 2.6, and will no longer work
21  
-    on Python <= 2.5.
  19
+    on Python <= 2.5. You can find older versions of IPython which supported
  20
+    Python <= 2.5 `here <http://archive.ipython.org/release/>`_
22 21
 
23 22
 Some of the installation approaches use the :mod:`setuptools` package and its
24 23
 :command:`easy_install` command line program.  In many scenarios, this provides
@@ -89,7 +88,7 @@ Installation from source
89 88
 
90 89
 If you don't want to use :command:`easy_install`, or don't have it installed,
91 90
 just grab the latest stable build of IPython from `here
92  
-<https://github.com/ipython/ipython/downloads>`_.  Then do the following:
  91
+<http://ipython.org/download.html>`_.  Then do the following:
93 92
 
94 93
 .. code-block:: bash
95 94
 
@@ -117,7 +116,7 @@ use any of the following alternatives:
117 116
 1. Install using :command:`easy_install`.
118 117
 
119 118
 2. Install using our binary ``.exe`` Windows installer, which can be found
120  
-   `here <http://ipython.scipy.org/dist/>`_
  119
+   `here <http://ipython.org/download.html>`_
121 120
 
122 121
 3. Install from source, but using :mod:`setuptools` (``python setupegg.py
123 122
    install``).
@@ -228,7 +227,8 @@ installed):
228 227
     have to do this step.
229 228
 
230 229
 If needed, the readline egg can be build and installed from source (see the
231  
-wiki page at http://ipython.scipy.org/moin/InstallationOSXLeopard).
  230
+wiki page at
  231
+http://web.archive.org/web/20090614162410/ipython.scipy.org/moin/InstallationOSXLeopard).
232 232
 
233 233
 On Windows, you will need the PyReadline module. PyReadline is a separate,
234 234
 Windows only implementation of readline that uses native Windows calls through
9  docs/source/interactive/htmlnotebook.txt
@@ -122,8 +122,9 @@ you'll work on a problem in pieces, organizing related pieces into cells and
122 122
 moving forward as previous parts work correctly.  This is much more convenient
123 123
 for interactive exploration than breaking up a computation into scripts that
124 124
 must be executed together, especially if parts of them take a long time to run
125  
-(you can use tricks with namespaces and ``%run -i``, but we think the notebook
126  
-is a more natural solution for  that kind of problem).
  125
+(In the traditional terminal-based IPython, you can use tricks with namespaces
  126
+and ``%run -i`` to achieve this capability, but we think the notebook is a more
  127
+natural solution for  that kind of problem).
127 128
 
128 129
 The only significant limitation the notebook currently has, compared to the qt
129 130
 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::
145 146
 Text input
146 147
 ----------
147 148
 
148  
-In addition to code cells and the output they procude (such as figures), you
  149
+In addition to code cells and the output they produce (such as figures), you
149 150
 can also type text not meant for execution.  To type text, change the type of a
150 151
 cell from ``Code`` to ``Markdown`` by using the button or the :kbd:`Ctrl-m m`
151 152
 keybinding (see below).  You can then type any text in Markdown_ syntax, as
@@ -200,7 +201,7 @@ key bindings you need to remember are:
200 201
   Selected`` button).
201 202
 
202 203
 * :kbd:`Ctrl-Enter`: execute the current cell in "terminal mode", where any
203  
-  output is shown but the cursor cursor stays in the current cell, whose input
  204
+  output is shown but the cursor stays in the current cell, whose input
204 205
   area is flushed empty.  This is convenient to do quick in-place experiments
205 206
   or query things like filesystem content without creating additional cells you
206 207
   may not want saved in your notebook.
4  docs/source/interactive/tips.txt
@@ -4,8 +4,8 @@
4 4
 IPython Tips & Tricks
5 5
 =====================
6 6
 
7  
-The `IPython cookbook <http://ipython.scipy.org/moin/Cookbook>`_ details more
8  
-things you can do with IPython.
  7
+The `IPython cookbook <http://wiki.ipython.org/Cookbook>`_ details more things
  8
+you can do with IPython.
9 9
 
10 10
 .. This is not in the current version:
11 11
 
2  docs/source/interactive/tutorial.txt
@@ -8,7 +8,7 @@ You don't need to know anything beyond Python to start using IPython – just ty
8 8
 commands as you would at the standard Python prompt. But IPython can do much
9 9
 more than the standard prompt. Some key features are described here. For more
10 10
 information, check the :ref:`tips page <tips>`, or look at examples in the
11  
-`IPython cookbook <http://ipython.scipy.org/moin/Cookbook>`_.
  11
+`IPython cookbook <http://wiki.ipython.org/index.php?title=Cookbook>`_.
12 12
 
13 13
 If you've never used Python before, you might want to look at `the official
14 14
 tutorial <http://docs.python.org/tutorial/>`_ or an alternative, `Dive into
4  docs/source/links.rst
Source Rendered
@@ -21,7 +21,7 @@
@@ -35,7 +35,7 @@
2  docs/source/whatsnew/version0.10.txt
@@ -275,7 +275,7 @@ New features
275 275
 * %edit: If you do '%edit pasted_block', pasted_block variable gets updated
276 276
   with new data (so repeated editing makes sense)
277 277
 
278  
-.. _Numpy Documentation Standard: http://projects.scipy.org/numpy/wiki/CodingStyleGuidelines#docstring-standard
  278
+.. _Numpy Documentation Standard: https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt#docstring-standard
279 279
 
280 280
 .. _argparse: http://code.google.com/p/argparse/
281 281
 
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.