From 971c16329e1cd02b212d99bd270b4708993e0530 2011-06-23 10:59:07
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-06-23 10:59:07
Subject: [PATCH] Update various references to IPython's homepage.

---

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0f7d422..1b4d9b2 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -114,7 +114,7 @@ author = 'The IPython Development Team'
 
 author_email = 'ipython-dev@scipy.org'
 
-url = 'http://ipython.scipy.org'
+url = 'http://ipython.org'
 
 download_url = 'http://ipython.scipy.org/dist'
 
diff --git a/IPython/core/usage.py b/IPython/core/usage.py
index b2237f6..3e3714f 100644
--- a/IPython/core/usage.py
+++ b/IPython/core/usage.py
@@ -40,7 +40,7 @@ IPython: an enhanced interactive Python shell.
     environment variable.
 
     For more information, see the manual available in HTML and PDF in your
-    installation, or online at http://ipython.scipy.org.
+    installation, or online at http://ipython.org/documentation.html.
 """
 
 interactive_usage = """
diff --git a/docs/emacs/ipython.el b/docs/emacs/ipython.el
index 795cba2..4ace500 100644
--- a/docs/emacs/ipython.el
+++ b/docs/emacs/ipython.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2003, 2004, 2005 Alexander Schmolck
 ;; Author:        Alexander Schmolck
 ;; Keywords:      ipython python languages oop
-;; URL:           http://ipython.scipy.org
+;; URL:           http://ipython.org
 ;; Compatibility: Emacs21, XEmacs21
 ;; FIXME: #$@! INPUT RING
 (defconst ipython-version "0.11"
diff --git a/docs/source/development/gitwash/git_links.txt b/docs/source/development/gitwash/git_links.txt
index bcf41b5..16e27d2 100644
--- a/docs/source/development/gitwash/git_links.txt
+++ b/docs/source/development/gitwash/git_links.txt
@@ -19,7 +19,7 @@
 .. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
 
 .. ipython
-.. _ipython: http://ipython.scipy.org
+.. _ipython: http://ipython.org
 .. _`ipython github`: http://github.com/ipython/ipython
 .. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev
 
diff --git a/docs/source/links.rst b/docs/source/links.rst
index ce0b5ab..7fc0d0b 100644
--- a/docs/source/links.rst
+++ b/docs/source/links.rst
@@ -17,8 +17,8 @@
    NOTE: Some of these were taken from the nipy links compendium.
 
 .. Main IPython links
-.. _ipython: http://ipython.scipy.org
-.. _`ipython manual`: http://ipython.scipy.org/doc/manual/html
+.. _ipython: http://ipython.org
+.. _`ipython manual`: http://ipython.org/documentation.html
 .. _ipython_github: http://github.com/ipython/ipython/
 .. _ipython_github_repo: http://github.com/ipython/ipython/
 .. _ipython_downloads: http://ipython.scipy.org/dist
diff --git a/docs/source/parallel/parallel_winhpc.txt b/docs/source/parallel/parallel_winhpc.txt
index 7e04639..cade1c4 100644
--- a/docs/source/parallel/parallel_winhpc.txt
+++ b/docs/source/parallel/parallel_winhpc.txt
@@ -42,7 +42,7 @@ content and emphasis here is practical: installing IPython, configuring
 IPython to use the Windows job scheduler and running example parallel programs
 interactively. A more complete description of IPython's parallel computing
 capabilities can be found in IPython's online documentation
-(http://ipython.scipy.org/moin/Documentation).
+(http://ipython.org/documentation.html).
 
 Setting up your Windows cluster
 ===============================
@@ -84,7 +84,7 @@ IPython on Windows:
 * pywin32 (http://sourceforge.net/projects/pywin32/)
 * PyReadline (https://launchpad.net/pyreadline)
 * pyzmq (http://github.com/zeromq/pyzmq/downloads)
-* IPython (http://ipython.scipy.org)
+* IPython (http://ipython.org)
 
 In addition, the following dependencies are needed to run the demos described
 in this document.
@@ -111,10 +111,10 @@ need to follow:
 
 3. Install the latest development version of IPython. This can be done by
    downloading the the development version from the IPython website
-   (http://ipython.scipy.org) and following the installation instructions.
+   (http://ipython.org) and following the installation instructions.
 
 Further details about installing IPython or its dependencies can be found in
-the online IPython documentation (http://ipython.scipy.org/moin/Documentation)
+the online IPython documentation (http://ipython.org/documentation.html)
 Once you are finished with the installation, you can try IPython out by
 opening a Windows Command Prompt and typing ``ipython``. This will
 start IPython's interactive shell and you should see something like the