Updated website (automated commit)

Author: takluyver

_sources/install.txt

@@ -7,7 +7,16 @@ contains `detailed instructions
 <http://ipython.org/ipython-doc/stable/install/install.html>`_ for manual
 installs from source, targeted at advanced users and developers.
 
-For new users who want to get up and running with minimal effort, we suggest
+If you already have Python all set up, 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]
+
+
+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.
@@ -34,31 +43,24 @@ free edition of `Enthought Canopy
 On Linux, most distributions have everything you need in their package
 managers.
 
-1. Install IPython and its dependencies:
-
 * 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
-
-2. Optionally install additional tools for scientific computing:
-
-* On Ubuntu or other Debian-based distributions, type at the shell::
-
-    sudo apt-get install python-matplotlib python-scipy \
-                         python-pandas python-sympy python-nose
-
-* On Fedora 18 and newer related distributions, use::
-
+    
+    # Optional: Common Python libraries for scientific computing
     sudo yum install python-matplotlib scipy python-pandas sympy python-nose
 
 
 .. _downloads:
 
-
 Downloads
 ---------
 

install.html

@@ -221,7 +221,15 @@ <h1>Installing IPython<a class="headerlink" href="#installing-ipython" title="Pe
 <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>For new users who want to get up and running with minimal effort, we suggest
+<p>If you already have Python all set up, 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>
@@ -245,33 +253,21 @@ <h1>Installing IPython<a class="headerlink" href="#installing-ipython" title="Pe
 <p><strong>Linux</strong></p>
 <p>On Linux, most distributions have everything you need in their package
 managers.</p>
-<ol class="arabic simple">
-<li>Install IPython and its dependencies:</li>
-</ol>
 <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
-</pre></div>
-</div>
-</li>
-</ul>
-<ol class="arabic simple" start="2">
-<li>Optionally install additional tools for scientific computing:</li>
-</ol>
-<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 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-matplotlib scipy python-pandas sympy python-nose
+
+# Optional: Common Python libraries for scientific computing
+sudo yum install python-matplotlib scipy python-pandas sympy python-nose
 </pre></div>
 </div>
 </li>