Merge.

doc/basic_tutorial/adding.txt

@@ -69,7 +69,7 @@ the :ref:`advtutorial` and in :ref:`graphstructures`.
 By calling ``T.dscalar`` with a string argument, you create a
 :term:`Variable` representing a floating-point scalar quantity with the
 given name. If you provide no argument, the symbol will be unnamed. Names
-are not require, but they can aid debugging.
+are not required, but they can help debugging.
 
 -------------------------------------------
 
@@ -147,9 +147,9 @@ with numpy arrays may be found :ref:`here <predefinedtypes>`.
 
 .. note::
 
-   You the user---not the system architecture---choose whether your
-   program will use 32- or 64-bit integers (i prefix vs the l prefix)
-   and floats (f prefix vs the d prefix).
+   You, the user---not the system architecture---have to choose whether your
+   program will use 32- or 64-bit integers (``i`` prefix vs. the ``l`` prefix)
+   and floats (``f`` prefix vs. the ``d`` prefix).
 
 
 **Next:** `More examples`_

doc/install.txt

@@ -113,7 +113,7 @@ All tests should pass. If some test fails on your machine, you are
 encouraged to tell us what went wrong on the :ref:`theano-users` mailing
 list.
 
-To update your library to the latest revision, change directory (`cd`)
+To update your library to the latest revision, change directory (``cd``)
 to your `Theano` folder and execute the following command:
 
 .. code-block:: bash
@@ -135,11 +135,11 @@ automatic code generation, but that way is much, much slower.
 - `THEANO_BLAS_LDFLAGS`:
     A space-separated list of options (flags) that will be passed to the
     compiler. It should include library names to link against for BLAS
-    functions. Default: `-lblas`.
+    functions. Default: ``-lblas``.
 
 - `THEANO_COMPILEDIR`:
     A directory with read/write access permissions where theano will store
-    autogenerated code and C modules. Default: `$HOME/.theano`. If this
+    autogenerated code and C modules. Default: ``$HOME/.theano``. If this
     directory does not exist or does not have the correct permissions,
     theano will try to create it with the correct permissions. If that fails,
     an exception will be raised and no C code will be compiled.
@@ -149,9 +149,11 @@ automatic code generation, but that way is much, much slower.
     graphs. This can be one of the strings defined in
     :api:`theano.compile.mode`.
     Possible values so far are:
+
     - FAST_COMPILE,
     - FAST_RUN and
     - DEBUG_MODE.
+
     Omitting this variable defaults the mode to FAST_RUN.
 
 - `THEANO_UNITTEST_SEED`:

doc/scripts/docgen.py

@@ -97,6 +97,11 @@ if __name__ == '__main__':
     mkdir("doc")
     mkdir("api")
 
+    # Make sure the appropriate 'theano' directory is in the PYTHONPATH
+    pythonpath = os.environ['PYTHONPATH']
+    pythonpath = throot + ':' + pythonpath
+    os.environ['PYTHONPATH'] = pythonpath
+
     if options['--all'] or options['--epydoc']:
         from epydoc.cli import cli
         sys.path[0:0] = [throot]