Merge pull request #3517 from lamblin/fix_pdf_generation

doc/scripts/docgen.py

@@ -131,7 +131,7 @@ if __name__ == '__main__':
         inopt = [docpath, workdir]
         if files is not None:
             inopt.extend(files)
-        sphinx.main(['', '-b', builder] + extraopts + inopt)
+        sphinx.build_main(['', '-b', builder] + extraopts + inopt)
 
     if options['--all'] or options['--rst']:
         mkdir("doc")

theano/tensor/nnet/neighbours.py

@@ -67,7 +67,8 @@ class Images2Neibs(Op):
         Returns
         -------
         matrix
-            A 2D matrix, written using the following pattern
+            A 2D matrix, written using the following pattern::
+
                 idx = 0
                 for i in xrange(list 1 dim)
                     for j in xrange(list 2 dim)
@@ -76,6 +77,7 @@ class Images2Neibs(Op):
                                 output[idx,:]
                                      = flattened version of ten4[i,j,l:l+r,k:k+c]
                                 idx += 1
+
             .. note:: The op isn't necessarily implemented internally with these
                 for loops, they're just the easiest way to describe the output
                 pattern.
@@ -456,7 +458,7 @@ def images2neibs(ten4, neib_shape, neib_step=None, mode='valid'):
         .. note:: Currently the step size should be chosen in the way that the
             corresponding dimension :math:`i` (width or height) is equal to
             :math:`n * step\_size_i + neib\_shape_i` for some :math:`n`
-    mode : {'valid', 'ignore_borders', 'wrap_centered}
+    mode : {'valid', 'ignore_borders', 'wrap_centered'}
         ``valid``
             Requires an input that is a multiple of the
             pooling factor (in each direction).