Updated website (automated commit)

Author: minrk

_images/components.png

@@ -17,8 +17,8 @@ language-agnostic way to facilitate interactive computing in any language.  An
 interactive kernel speaks to clients such as the terminal or web notebook via a
 well-specified protocol_, and all features of a kernel are available to all
 clients.  We ship the official IPython kernel, but kernels for other languages
-are being currently developed, with prototypes in Ruby and JavaScript already
-existing.  Additionally, the IPython kernel supports multi-language
+such as `Julia`_ and `Haskell`_ are actively developed and used.
+Additionally, the IPython kernel supports multi-language
 integration, letting you for example mix Python code with Cython_, R_, Octave_,
 and scripting in `Bash, Perl or Ruby`_.
 
@@ -34,6 +34,10 @@ and scripting in `Bash, Perl or Ruby`_.
 
 .. _parallel computing: http://ipython.org/ipython-doc/stable/parallel/parallel_intro.html
 
+.. _Julia: https://github.com/JuliaLang/IJulia.jl
+
+.. _Haskell: https://github.com/gibiansky/IHaskell
+
 .. _cython: http://nbviewer.ipython.org/url/github.com/ipython/ipython/raw/master/examples/notebooks/Cython%20Magics.ipynb
 
 .. _R: http://nbviewer.ipython.org/url/github.com/ipython/ipython/raw/master/examples/notebooks/R%20Magics.ipynb

_images/countries1.png

@@ -18,21 +18,7 @@ basic libraries for scientific computing and data analysis.
 free edition of `Enthought Canopy
 <https://www.enthought.com/products/epd_free.php>`_.
 
-2. Update IPython to the current version:
-
-* On a Mac, using the Terminal application:
-
-  Anaconda::
-
-    conda update conda
-    conda update ipython
-
-  Enthought Canopy::
-
-    sudo enpkg enstaller
-    sudo enpkg ipython
-
-* On Windows, at the Command Prompt (``cmd.exe`` application):
+2. Update IPython to the current version, using the Terminal/Command Prompt:
 
   Anaconda::
 
@@ -41,7 +27,6 @@ free edition of `Enthought Canopy
 
   Enthought Canopy::
 
-    enpkg enstaller
     enpkg ipython
 
 **Linux**