Rephrasing and typo fixes

bin/theano-nose

@@ -106,7 +106,7 @@ def main():
                 'Use --without-knownfailure to disable this warning.')
     else:
         sys.argv.remove('--without-knownfailure')
-        
+
     # When 'theano-nose' is called-back under the time-profile option, an
     # instance of the custom Nosetests plugin class 'DisabDocString' (see
     # below) is loaded. The latter ensures that the test name will not be
@@ -122,7 +122,7 @@ def main():
         return ret
     except TypeError, e:
         if "got an unexpected keyword argument 'addplugins'" in e.message:
-            # This mean nose is too old and don't support plugins
+            # This means nose is too old and does not support plugins
             _logger.warn(
                 'KnownFailure plugin from NumPy can\'t'
                 ' be used as nosetests is too old. '

doc/install.txt

@@ -807,16 +807,19 @@ Another software from Enthought that install all Theano dependancy.
 If you are affiliated with a university (as student or employee), you
 can download the installation for free.
 
-- Install Canopy x64 (and update it as older Canopy version had problem when installing pip).
-- Then install pip from Canopy Package Manager.
-- "pip install theano" in the Windows shell: "In the Windows start menu execute the `cmd` command".
-- in Canopy Package Manager, search and install packages "mingw 4.5.2" and "libpython 1.2"
-- (Needed only for Theano 0.6rc3 or older) The "libpython 1.2" package installs files "libpython27.a" and "libmsvcr90.a" to "C:\Users\<USER>\AppData\Local\Enthought\Canopy\User\libs" (on my computer)
-  copy the two files to "C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\libs"
-
-  When doing "import theano" g++ links to directory "C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\libs"
-  and "C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64". Not where "libpython27.a" is installed.
-- (Needed only for Theano 0.6rc3 or older) Set the Theano flags ``blas.ldflags=C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\Scripts -lmk2_core -lmk2_intel_thread -lmk2_rt``.
+- Install Canopy x64, and update it to the latest version (`Help /
+  Software updates...`), as older Canopy versions have trouble installing
+  `pip`.
+- Then install `pip` from Canopy Package Manager.
+- In the Windows shell (type `cmd` in the Windows start menu to bring it up),
+  type `pip install theano`.
+- In Canopy Package Manager, search and install packages "mingw 4.5.2" and "libpython 1.2"
+- (Needed only for Theano 0.6rc3 or earlier)
+  The "libpython 1.2" package installs files `libpython27.a` and `libmsvcr90.a` to
+  `C:\Users\<USER>\AppData\Local\Enthought\Canopy\User\libs`. Copy the two files to
+  `C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\libs`.
+- (Needed only for Theano 0.6rc3 or earlier) Set the Theano flags
+  ``blas.ldflags=-LC:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\Scripts -lmk2_core -lmk2_intel_thread -lmk2_rt``.
 
 
 

doc/install_ubuntu.txt

@@ -62,13 +62,13 @@ Test the newly installed packages
  2) SciPy (~1m): ``python -c "import scipy; scipy.test()"``
  3) Theano (~30m): ``python -c "import theano; theano.test()"``
 
-NumPy 1.6.2, 1.7.0 and 1.7.1, have a bug where it mark an ndarray as
-not aligned. Theano do not support unaligned array and verify
-that. This cause one test to fail with an unaligned error with those
-version of NumPy. You can ignore that test error as at worst, your
-code will crash. If this happen, install another NumPy version to fix
-this problem. NumPy 1.6.2 is used in Ubuntu 12.10 and NumPy 1.7.1 is
-used in Ubuntu 13.04.
+NumPy 1.6.2, 1.7.0 and 1.7.1, have a bug where it marks some ndarrays
+as not aligned. Theano does not support unaligned arrays, and raises
+an Exception when that happens.  This can cause one test to fail with
+an unaligned error with those versions of NumPy. You can ignore that
+test error as at worst, your code will crash. If this happens, you can
+install another NumPy version to fix this problem. NumPy 1.6.2 is used
+in Ubuntu 12.10 and NumPy 1.7.1 is used in Ubuntu 13.04.
 
 Speed test Theano/BLAS
 ~~~~~~~~~~~~~~~~~~~~~~

theano/sandbox/linalg/kron.py

@@ -8,7 +8,7 @@ def kron(a, b):
 
     :param a: array_like
     :param b: array_like
-    :return: array_like with a.ndim + b.ndim - 2 dimensinos.
+    :return: array_like with a.ndim + b.ndim - 2 dimensions.
 
     """
     a = tensor.as_tensor_variable(a)

theano/tensor/blas.py

@@ -201,18 +201,18 @@ def default_blas_ldflags():
         if "Canopy" in sys.prefix:
             p = os.path.join(sys.prefix, "..", "..", "..",
                              "Canopy", "appdata")
-            assert os.path.exists(p), "Canopy changed where is MKL"
+            assert os.path.exists(p), "Canopy changed the location of MKL"
             p2 = os.listdir(p)
-            assert len(p2) == 1, "Canopy changed where is install MKL"
+            assert len(p2) == 1, "Canopy changed the location of MKL"
             if sys.platform == "linux2":
                 p2 = os.path.join(p, p2[0], "lib")
-                assert os.path.exists(p2), "Canopy changed where is MKL"
+                assert os.path.exists(p2), "Canopy changed the location of MKL"
                 return ' '.join(
                     ['-L%s' % p2] +
                     ['-l%s' % l for l in blas_info['libraries']])
             elif sys.platform == 'win32':
                 p2 = os.path.join(p, p2[0], "Scripts")
-                assert os.path.exists(p2), "Canopy changed where is MKL"
+                assert os.path.exists(p2), "Canopy changed the location of MKL"
                 return ' '.join(
                     ['-L%s' % p2] +
                     # Why on Windows, the library used are not the