Merge pull request #12 from willingc/Carreau-more-docs

Edits based on review of PR

docs/source/interactive/magics.rst

@@ -4,12 +4,13 b' Built-in magic commands'
 
 .. note::
 
-    To Jupyter users: Magics are specifit to the IPython kernel. Other kernels
-    may be implementing magics but this decision is a per-kernel one. To be able
-    to work, Magics need to use a syntax which is not valid in the language they
-    are implemented. IPython choosed the `%` as it is not a valid unary operator
-    in Python. It is in other languages. 
-
+    To Jupyter users: Magics are specific to and provided by the IPython kernel.
+    Whether magics are available on a kernel is a decision that is made by
+    the kernel developer on a per-kernel basis. To work properly, Magics must
+    use a syntax element which is not valid in the underlying language. For
+    example, the IPython kernel uses the `%` syntax element for magics as `%`
+    is not a valid unary operator in Python. While, the syntax element has
+    meaning in other languages.
 
 Here is the help auto generated from the docstrings of all the available magics
 function that IPython ships with. 

docs/source/interactive/reference.rst

@@ -12,7 +12,7 b' You start IPython with the command::'
     $ ipython [options] files
 
 If invoked with no options, it executes all the files listed in sequence and
-exit. If you add the ``-i`` flag, it drops you into the interpreter while still
+exits. If you add the ``-i`` flag, it drops you into the interpreter while still
 acknowledging any options you may have set in your ``ipython_config.py``. This
 behavior is different from standard Python, which when called as python ``-i``
 will only execute one file and ignore your configuration setup.

docs/source/interactive/tutorial.rst

@@ -55,7 +55,7 b' command line style syntax. There are two kinds of magics, line-oriented and'
 cell-oriented.  **Line magics** are prefixed with the ``%`` character and work
 much like OS command-line calls: they get as an argument the rest of the line,
 where arguments are passed without parentheses or quotes. **Lines magics** can
-return results and can be use in the right and side of an assignment.  **Cell
+return results and can be used in the right hand side of an assignment.  **Cell
 magics** are prefixed with a double ``%%``, and they are functions that get as
 an argument not only the rest of the line, but also the lines below it in a
 separate argument.
@@ -123,8 +123,8 b' profiler (-p).'
 The :magic:`edit` command gives a reasonable approximation of multiline editing,
 by invoking your favorite editor on the spot. IPython will execute the
 code you type in there as if it were typed interactively. Note that for
-:magic:`edit` to work, the call to startup your editor have to be a blocking
-call. In a GUI environment, your editor likely have such an option. 
+:magic:`edit` to work, the call to startup your editor has to be a blocking
+call. In a GUI environment, your editor likely will have such an option.
 
 Debugging
 ---------