Merge pull request #1121 from delallea/minor

doc/install.txt

@@ -770,9 +770,9 @@ Alternative: Anaconda 0.8.3 (Linux VM on Windows)
 #################################################
 
 ContinuumIO_ was providing a free VM with Theano installed. Now they
-provide a new installation system that install itself on Windows. We
-don't have the time now to update the docs, so we remove the old
-documentations that don't work.
+provide a new installation system that installs itself on Windows.
+Since we lack time to update this part of the documentation, it has been
+removed for now. Check back later!
 
 .. _ContinuumIO: http://continuum.io
 

doc/library/config.txt

@@ -199,7 +199,7 @@ import theano and print the config variable, as in:
     Bool value: either True or False
 
     Default: True if the environment variable OMP_NUM_THREADS!=1 or
-             if we detect more then 1 CPU core. Otherwise False.
+             if we detect more than 1 CPU core. Otherwise False.
 
     Enable or not parallel computation on the CPU with OpenMP.
     It is the default value used when creating an Op that support it.

doc/sandbox/sparse.txt

@@ -15,7 +15,7 @@ Note that you want SciPy >= 0.7.2
     dimensions. There may be more bugs. It also has inconsistent
     implementation of sparse matrices.
 
-    We do not test against version bellow SciPy 0.7.2.
+    We do not test against SciPy versions below 0.7.2.
 
 We describe the details of the compressed sparse matrix types.
     ``scipy.sparse.csc_matrix``

theano/sandbox/cuda/basic_ops.py

@@ -2304,7 +2304,7 @@ class GpuAdvancedSubtensor1(tensor.AdvancedSubtensor1, GpuOp):
         x, idx = inp
         out, = out_
         x_orig = x
-        #TODO: if more then 3 dims, reshape the inputs even if not all
+        #TODO: if more than 3 dims, reshape the inputs even if not all
         #dimensions are c contiguous
         if x.ndim > 3 and x.is_c_contiguous():
             x = x.reshape((x.shape[0], numpy.prod(x.shape[1:])))

theano/sandbox/cuda/tests/test_conv_cuda_ndarray.py

@@ -395,7 +395,7 @@ def get_valid_shapes():
             , ((20, 16, 32, 32), (1, 16, 28, 28), (1, 1), (1, 1), (1, 1)) # layer 1 backprop to weights
             , ((60,20,28,28), (10,20,5,5), (1, 1), (2,2), (1, 1))#added a test case that fail from test_nnet.py.test_conv_nnet2
             , ((10,5,28,28), (10,5,5,5), (1, 1), (2,2), (1, 1))#test precedent but reduced that triger the error
-            #Test more then maxThreadsDim0
+            #Test more than maxThreadsDim0
             , ((2,4,13,1050), (3,4,10, 11), (1, 1), (1, 1), (1, 1))
             , ((2,4,1050,13), (3,4,10, 11), (1, 1), (1, 1), (1, 1))
             ]
@@ -667,7 +667,7 @@ def test_full():
             , ((10,30,23,23),(20,30,7,7), (1, 1), (1, 1), (1, 1))#test_lenet_64 full
 #            , ((20,10,29,29),(30,10,23,23), (1, 1), (1, 1), (1, 1))#test_lenet_64 bprop 1
 #            , ((1,10,64,64),(20,10,58,58), (1, 1), (1, 1), (1, 1))#test_lenet_64 bprop 2
-            #Test more then maxThreadsDim0
+            #Test more than maxThreadsDim0
             , ((2,4,13,1050), (3,4,10, 11), (1, 1), (1, 1), (1, 1))
             , ((2,4,1050,13), (3,4,10, 11), (1, 1), (1, 1), (1, 1))
             ]

theano/tensor/basic.py

@@ -2377,8 +2377,8 @@ class SpecifyShape(Op):
 
     def c_code(self, node, nodename, inp, out, sub):
         if not isinstance(node.inputs[0], TensorVariable):
-            # The c code bellow support only Tensor.  super.c_code
-            # will raise an exception to tell that there isn't c code
+            # The C code below supports only Tensor.  super.c_code
+            # will raise an exception to tell that there is no C code
             # for the other cases.
             return super(SpecifyShape, self).c_code(node, nodename,
                                                     inp, out, sub)
@@ -2389,8 +2389,8 @@ class SpecifyShape(Op):
         return """
         if (PyArray_NDIM(%(iname)s) != PyArray_DIMS(%(shape)s)[0]) {
             PyErr_Format(PyExc_AssertionError,
-                         "SpecifyShape: vector of shape have %%d element,"
-                         " but the input have %%d dimensions.",
+                         "SpecifyShape: vector of shape has %%d elements,"
+                         " but the input has %%d dimensions.",
                          PyArray_NDIM(%(iname)s),
                          PyArray_DIMS(%(shape)s)[0]);
             %(fail)s;
@@ -2400,7 +2400,7 @@ class SpecifyShape(Op):
                                                                      i))[0];
             if (PyArray_DIMS(%(iname)s)[i] != shp) {
                 PyErr_Format(PyExc_AssertionError,
-                             "SpecifyShape: dim %%d of input have shape %%d,"
+                             "SpecifyShape: dim %%d of input has shape %%d,"
                              " expected %%d.",
                              i, PyArray_DIMS(%(iname)s)[i],
                              shp);

theano/tensor/extra_ops.py

@@ -491,7 +491,7 @@ def fill_diagonal(a, val):
         2, the main diagonal is the list of locations a[i, i, ..., i]
         (i.e. with indices all identical).)
 
-    Support rectangular matrix and tensor with more then 2 dimensions
+    Support rectangular matrix and tensor with more than 2 dimensions
     if the later have all dimensions are equals.
 
     .. versionadded:: 0.6