Commits

Joseph Tate committed 5f77168 Merge

Merged in teddymcw/cherrypy (pull request #34)

add instructions for pip and easy_install to the Docs

Comments (0)

Files changed (1)

sphinx/source/intro/install.rst

 
 All you need is a working version of Python-2.3 or later on your computer.
 
-Get Python on Debian::
+If you need Python on Debian::
 
     $ apt-get install python python-dev
 
 
 .. _stableversions:
 
-Stable versions
-===============
+Download Stable Versions 
+========================
 
-Download
+Using `pip` or `easy_install`
+-----------------------------
+
+Using pip::
+
+    $ pip install CherryPy
+
+or with easy_install::
+
+    $ easy_install CherryPy
+
+It is recommended to use `pip` instead of `easy_install`.
+If you want to download and install CherryPy for yourself proceed to the 
+next instructions depending on your platform. 
+
+Unix/Mac
 --------
 
-You may download this version from `here <http://download.cherrypy.org/cherrypy/3.2.3/>`_ 
+You may download the most current version from `PyPI <https://pypi.python.org/pypi/CherryPy/3.2.3>`_  
 
 For other releases, browse our
 `download index <http://download.cherrypy.org/cherrypy>`_.
 
-Windows Installation
---------------------
+* Unzip/untar the files
+* Enter the directory created by the file extraction.
+* Type "python setup.py install" to install the CherryPy module
 
-* Download the latest CherryPy release from the
-  `repository <http://download.cherrypy.org/cherrypy/>`_.
-  Select the file ending in ".exe"
+
+Windows
+-------
+
+You may download the most current version from `PyPI <https://pypi.python.org/pypi/CherryPy/3.2.3>`_. 
+
+For other releases, browse our `download index <http://download.cherrypy.org/cherrypy>`_.  
+
+* Select the file ending in ".exe".
 * Run the downloaded file.
 
-Unix/Mac Installation
----------------------
-
-* Download the latest CherryPy release from the
-  `repository <http://download.cherrypy.org/cherrypy/>`_.
-* Unzip/untar the files
-* Go to the directory created by the file extraction.
-* Type "python setup.py install" to install the CherryPy module
 
 Next Steps
-----------
+==========
 
 * To run your first sample website, go to cherrypy/tutorial/ and type
   "python tut01_helloworld.py", and you'll have a running website on port 8080.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.