Update install instructions

Author: takluyver

_sources/install.txt

@@ -2,32 +2,32 @@
 Installing IPython
 ~~~~~~~~~~~~~~~~~~
 
-There are multiple ways of installing IPython, and our official documentation
-contains `detailed instructions
-<http://ipython.org/ipython-doc/stable/install/install.html>`_ for manual
-installs from source, targeted at advanced users and developers.
+There are multiple ways of installing IPython. This page contains simplified installation
+instructions that should work for most users. Our official documentation
+contains `detailed instructions <http://ipython.org/ipython-doc/stable/install/install.html>`_
+for manual installation targeted at advanced users and developers.
 
-If you already have Python all set up, you can get IPython with :command:`pip`::
+I already have Python
+---------------------
+
+If you already have Python installed and are familiar with installing packages, you can get IPython with :command:`pip`::
 
     pip install ipython
 
 Or if you want to also get the dependencies for the IPython notebook::
 
     pip install ipython[notebook]
 
+I am getting started with Python
+--------------------------------
 
-For new users who want to get a full scientific Python environment up and running, we suggest
-you follow the instructions on this page, which provide a setup based on Python
-2.7.  This includes all the dependencies to run the notebook and optionally the
-basic libraries for scientific computing and data analysis.
-
-**Mac or Windows**
+For new users who want to install a full Python environment for scientific computing and 
+data science, we suggest installing the Anaconda or Canopy Python distributions, which provide Python 2.7, IPython and all of its dependences as well as a complete set of open source packages
+for scientific computing and data science.
 
-1. Download and install `Anaconda <http://continuum.io/downloads.html>`_ or the
-free edition of `Enthought Canopy
-<https://www.enthought.com/products/epd_free.php>`_.
+1. Download and install Continuum's `Anaconda <http://continuum.io/downloads.html>`_ or the free edition of Enthought's `Canopy <https://www.enthought.com/downloads/>`_.
 
-2. Update IPython to the current version, using the Terminal/Command Prompt:
+2. Update IPython to the current version using the Terminal:
 
   Anaconda::
 
@@ -38,37 +38,14 @@ free edition of `Enthought Canopy
 
     enpkg ipython
 
-**Linux**
-
-On Linux, most distributions have everything you need in their package
-managers.
-
-* On Ubuntu or other Debian-based distributions, type at the shell::
-
-    sudo apt-get install ipython-notebook
-    
-    # Optional: Common Python libraries for scientific computing
-    sudo apt-get install python-matplotlib python-scipy python-pandas \
-                         python-sympy python-nose
-
-* On Fedora 18 and newer related distributions, use::
-
-    sudo yum install python-ipython-notebook
-    
-    # Optional: Common Python libraries for scientific computing
-    sudo yum install python-matplotlib scipy python-pandas sympy python-nose
-
-
 .. _downloads:
 
 Downloads
 ---------
 
-You can manually download IPython from either `Github
+You can manually download IPython from  `Github
 <http://github.com/ipython/ipython/releases>`_ or `PyPI
-<http://pypi.python.org/pypi/ipython>`_.  Those locations contain source
-distributions as well as binary Windows installers, which will be recognized by
-``easy_install`` and ``pip`` (for the source ones).
+<http://pypi.python.org/pypi/ipython>`_.  To install one of these versions, unpack it and run
+the following from the top-level source directory using the Terminal::
 
-Our `downloads archive <http://archive.ipython.org/release>`_ also contains all
-IPython releases, including old versions.
+    python setup.py install

install.html

@@ -218,26 +218,29 @@ <h4>Support IPython</h4>
 
   <div class="section" id="installing-ipython">
 <h1>Installing IPython<a class="headerlink" href="#installing-ipython" title="Permalink to this headline">¶</a></h1>
-<p>There are multiple ways of installing IPython, and our official documentation
-contains <a class="reference external" href="http://ipython.org/ipython-doc/stable/install/install.html">detailed instructions</a> for manual
-installs from source, targeted at advanced users and developers.</p>
-<p>If you already have Python all set up, you can get IPython with <strong class="command">pip</strong>:</p>
+<p>There are multiple ways of installing IPython. This page contains simplified installation
+instructions that should work for most users. Our official documentation
+contains <a class="reference external" href="http://ipython.org/ipython-doc/stable/install/install.html">detailed instructions</a>
+for manual installation targeted at advanced users and developers.</p>
+<div class="section" id="i-already-have-python">
+<h2>I already have Python<a class="headerlink" href="#i-already-have-python" title="Permalink to this headline">¶</a></h2>
+<p>If you already have Python installed and are familiar with installing packages, you can get IPython with <strong class="command">pip</strong>:</p>
 <div class="highlight-python"><div class="highlight"><pre>pip install ipython
 </pre></div>
 </div>
 <p>Or if you want to also get the dependencies for the IPython notebook:</p>
 <div class="highlight-python"><div class="highlight"><pre>pip install ipython[notebook]
 </pre></div>
 </div>
-<p>For new users who want to get a full scientific Python environment up and running, we suggest
-you follow the instructions on this page, which provide a setup based on Python
-2.7.  This includes all the dependencies to run the notebook and optionally the
-basic libraries for scientific computing and data analysis.</p>
-<p><strong>Mac or Windows</strong></p>
-<p>1. Download and install <a class="reference external" href="http://continuum.io/downloads.html">Anaconda</a> or the
-free edition of <a class="reference external" href="https://www.enthought.com/products/epd_free.php">Enthought Canopy</a>.</p>
-<ol class="arabic simple" start="2">
-<li>Update IPython to the current version, using the Terminal/Command Prompt:</li>
+</div>
+<div class="section" id="i-am-getting-started-with-python">
+<h2>I am getting started with Python<a class="headerlink" href="#i-am-getting-started-with-python" title="Permalink to this headline">¶</a></h2>
+<p>For new users who want to install a full Python environment for scientific computing and
+data science, we suggest installing the Anaconda or Canopy Python distributions, which provide Python 2.7, IPython and all of its dependences as well as a complete set of open source packages
+for scientific computing and data science.</p>
+<ol class="arabic simple">
+<li>Download and install Continuum&#8217;s <a class="reference external" href="http://continuum.io/downloads.html">Anaconda</a> or the free edition of Enthought&#8217;s <a class="reference external" href="https://www.enthought.com/downloads/">Canopy</a>.</li>
+<li>Update IPython to the current version using the Terminal:</li>
 </ol>
 <blockquote>
 <div><p>Anaconda:</p>
@@ -250,35 +253,14 @@ <h1>Installing IPython<a class="headerlink" href="#installing-ipython" title="Pe
 </pre></div>
 </div>
 </div></blockquote>
-<p><strong>Linux</strong></p>
-<p>On Linux, most distributions have everything you need in their package
-managers.</p>
-<ul>
-<li><p class="first">On Ubuntu or other Debian-based distributions, type at the shell:</p>
-<div class="highlight-python"><div class="highlight"><pre>sudo apt-get install ipython-notebook
-
-# Optional: Common Python libraries for scientific computing
-sudo apt-get install python-matplotlib python-scipy python-pandas \
-                     python-sympy python-nose
-</pre></div>
 </div>
-</li>
-<li><p class="first">On Fedora 18 and newer related distributions, use:</p>
-<div class="highlight-python"><div class="highlight"><pre>sudo yum install python-ipython-notebook
-
-# Optional: Common Python libraries for scientific computing
-sudo yum install python-matplotlib scipy python-pandas sympy python-nose
-</pre></div>
-</div>
-</li>
-</ul>
 <div class="section" id="downloads">
 <span id="id1"></span><h2>Downloads<a class="headerlink" href="#downloads" title="Permalink to this headline">¶</a></h2>
-<p>You can manually download IPython from either <a class="reference external" href="http://github.com/ipython/ipython/releases">Github</a> or <a class="reference external" href="http://pypi.python.org/pypi/ipython">PyPI</a>.  Those locations contain source
-distributions as well as binary Windows installers, which will be recognized by
-<tt class="docutils literal"><span class="pre">easy_install</span></tt> and <tt class="docutils literal"><span class="pre">pip</span></tt> (for the source ones).</p>
-<p>Our <a class="reference external" href="http://archive.ipython.org/release">downloads archive</a> also contains all
-IPython releases, including old versions.</p>
+<p>You can manually download IPython from  <a class="reference external" href="http://github.com/ipython/ipython/releases">Github</a> or <a class="reference external" href="http://pypi.python.org/pypi/ipython">PyPI</a>.  To install one of these versions, unpack it and run
+the following from the top-level source directory using the Terminal:</p>
+<div class="highlight-python"><div class="highlight"><pre>python setup.py install
+</pre></div>
+</div>
 </div>
 </div>
 

kbase.md

@@ -232,7 +232,7 @@ <h2>Countries<a class="headerlink" href="#countries" title="Permalink to this he
 Vietnam, Croatia, Switzerland, Portugal, China, Taiwan, Maldives, Ecuador,
 Israel, El Salvador, Slovenia, Thailand, Poland, Finland, Belarus, Estonia,
 Egypt, South Africa, Peru, Greece, Japan</p>
-<a class="reference internal image-reference" href="_images/countries1.png"><img alt="_images/countries1.png" src="_images/countries1.png" /></a>
+<a class="reference internal image-reference" href="_images/countries1.png"><img alt="_images/countries1.png" src="_images/countries1.png" style="width: 697.5px; height: 459.0px;" /></a>
 <p>See the &#8216;Countries&#8217; sheet of the results spreadsheet for the cleaned data.</p>
 </div>
 <div class="section" id="ipython-versions">