Merge.

doc/index.txt

@@ -20,13 +20,23 @@ since 2007.  But it is also approachable enough to be used in the classroom
 Download
 ========
 
-We recommend the latest development version, available via::
+Theano is now `available on PyPI`_, and can be installed via ``easy_install
+Theano``, or by downloading and unpacking the tarball and typing ``python
+setup.py install``.
+
+Those interested in bleeding-edge features should obtain the latest development 
+version, available via::
 
     hg clone http://hg.assembla.com/theano Theano
 
-The theano subfolder should be on your ``$PYTHONPATH``.  For more information about
+You can then place the checkout directory on your ``$PYTHONPATH`` or use
+``python setup.py develop`` to install a ``.pth`` into your ``site-packages``
+directory, so that when you pull updates via Mercurial they will be
+automatically reflected the "installed" version. For more information about
 installation and configuration, see :ref:`installing Theano <install>`.
 
+.. _available on PyPI: http://pypi.python.org/pypi/Theano
+
 Documentation
 =============
 

setup.py

@@ -24,7 +24,8 @@ Operating System :: MacOS
 NAME                = 'Theano'
 MAINTAINER          = "LISA laboratory, University of Montreal"
 MAINTAINER_EMAIL    = "theano-dev@googlegroups.com"
-DESCRIPTION         = 'Optimizing compiler for mathematical expressions'
+DESCRIPTION         = ('Optimizing compiler for evaluating mathematical ' +
+                       'expressions on CPUs and GPUs.')
 LONG_DESCRIPTION    = ""
 URL                 = "http://deeplearning.net/software/theano/"
 DOWNLOAD_URL        = ""
@@ -39,12 +40,7 @@ MICRO               = 0
 SUFFIX              = "rc3"  # Should be blank except for rc's, betas, etc.
 ISRELEASED          = False
 
-if MICRO > 0:
-    VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
-else:
-    VERSION             = "%d.%d" % (MAJOR, MINOR)
-
-VERSION += SUFFIX
+VERSION             = '%d.%d.%d%s' % (MAJOR, MINOR, MICRO, SUFFIX)
 
 # Return the hg revision as a string -- borrowed from hg_version in NumPy's
 # setup.py file