Merge pull request #1307 from delallea/minor

doc/dev_start_guide.txt

@@ -366,12 +366,12 @@ Then in your ``~/.emacs`` file, add this:
 
 .. note::
 
-   The script highlight problematic lines. This can make part of the
-   line not readable depending of the background. To replace the line
+   The script highlights problematic lines. This can make part of the
+   line not readable depending on the background. To replace the line
    highlight by an underline, add this to your emacs configuration
-   file.
+   file:
 
-   ;; Make thing readable when there is an warning [optional]
+   ;; Make lines readable when there is an warning [optional]
    (custom-set-faces
    '(flymake-errline ((((class color)) (:underline "red"))))
    '(flymake-warnline ((((class color)) (:underline "yellow")))))

doc/tutorial/examples.txt

@@ -489,7 +489,7 @@ The preceding elements are featured in this more realistic example.  It will be
   train = theano.function(
             inputs=[x,y],
             outputs=[prediction, xent],
-            updates={w: w - 0.1 * gw, b: b - 0.1 * gb})
+            updates=((w, w - 0.1 * gw), (b, b - 0.1 * gb)))
   predict = theano.function(inputs=[x], outputs=prediction)
 
   # Train

theano/compile/function.py

@@ -141,18 +141,19 @@ def function(inputs, outputs=None, mode=None, updates=None, givens=None,
 
 
          4. Linker
-               The linker uses a python loop to execute the code associated
+               The linker uses a Python loop to execute the code associated
                with all the Apply nodes in the graph in the correct order.
-               the cvm is a linker that replaces this python loop with a c
-               loop to avoid continuously changing between python and c.
+               The CVM is a linker that replaces this Python loop with a C
+               loop to avoid continuously changing between Python and C.
                The CVM is faster for 2 reasons:
-                 1) Its internal logic in C, so no Python interpreter overhead.
+                 1) Its internal logic is in C, so no Python interpreter
+                    overhead.
                  2) It makes native calls from the VM logic into thunks that
-                 have been compiled using the CLinker.
-               the vm is a linker that was developed to prototype the cvm. it
-        was easier to develop the vm in python then translate it to c instead
-        of just writing it in c from scratch
-               cvm stands for c virtual machine.
+                    have been compiled using the CLinker.
+               The VM is a linker that was developed to prototype the CVM. it
+        was easier to develop the VM in Python then translate it to C instead
+        of just writing it in C from scratch.
+               CVM stands for C Virtual Machine.