Merge branch 'master' of https://github.com/jrjohansson/scientific-python-lectures

Author: jrjohansson

Lecture-0-Scientific-Computing-with-Python.ipynb

@@ -312,7 +312,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "[IPython notebook](http://ipython.org/notebook.html) is an HTML-based notebook environment for Python, similar to Mathematica or Maple. It is based the IPython shell, but provides a cell-based environment with great interactivity, where calculations can be organized documented in a structured way.\n",
+      "[IPython notebook](http://ipython.org/notebook.html) is an HTML-based notebook environment for Python, similar to Mathematica or Maple. It is based on the IPython shell, but provides a cell-based environment with great interactivity, where calculations can be organized documented in a structured way.\n",
       "\n",
       "<!-- <img src=\"files/images/ipython-notebook-screenshot.jpg\" width=\"800\"> -->\n",
       "<img src=\"https://raw.github.com/jrjohansson/scientific-python-lectures/master/images/ipython-notebook-screenshot.jpg\" width=\"800\">\n",
@@ -574,4 +574,4 @@
    "metadata": {}
   }
  ]
-}
+}

Lecture-1-Introduction-to-Python-Programming.ipynb

@@ -2338,16 +2338,17 @@
       "# Bad indentation!\n",
       "if statement1:\n",
       "    if statement2:\n",
-      "        print(\"both statement1 and statement2 are True\")  # this line is not properly indented"
+      "    print(\"both statement1 and statement2 are True\")  # this line is not properly indented"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "both statement1 and statement2 are True\n"
+       "ename": "IndentationError",
+       "evalue": "expected an indented block (<ipython-input-88-78979cdecf37>, line 4)",
+       "output_type": "pyerr",
+       "traceback": [
+        "\u001b[1;36m  File \u001b[1;32m\"<ipython-input-88-78979cdecf37>\"\u001b[1;36m, line \u001b[1;32m4\u001b[0m\n\u001b[1;33m    print(\"both statement1 and statement2 are True\")  # this line is not properly indented\u001b[0m\n\u001b[1;37m        ^\u001b[0m\n\u001b[1;31mIndentationError\u001b[0m\u001b[1;31m:\u001b[0m expected an indented block\n"
        ]
       }
      ],
@@ -2653,7 +2654,7 @@
      "source": [
       "## Functions\n",
       "\n",
-      "A function in Python is defined using the keyword `def`, followed by a function name, a signature within parenthises `()`, and a colon `:`. The following code, with one additional level of indentation, is the function body."
+      "A function in Python is defined using the keyword `def`, followed by a function name, a signature within parentheses `()`, and a colon `:`. The following code, with one additional level of indentation, is the function body."
      ]
     },
     {
@@ -3017,7 +3018,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "This technique is useful for exmample when we want to pass a simple function as an argument to another function, like this:"
+      "This technique is useful for example when we want to pass a simple function as an argument to another function, like this:"
      ]
     },
     {
@@ -3072,15 +3073,15 @@
       "\n",
       "In Python a class can contain *attributes* (variables) and *methods* (functions).\n",
       "\n",
-      "In python a class is defined almost like a function, but using the `class` keyword, and the class definition usually contains a number of class method definitions (a function in a class).\n",
+      "A class is defined almost like a function, but using the `class` keyword, and the class definition usually contains a number of class method definitions (a function in a class).\n",
       "\n",
-      "* Each class method should have an argurment `self` as it first argument. This object is a self-reference.\n",
+      "* Each class method should have an argument `self` as it first argument. This object is a self-reference.\n",
       "\n",
       "* Some class method names have special meaning, for example:\n",
       "\n",
-      " * `__init__`: The name of the method that is invoked when the object is first created.\n",
-      " * `__str__` : A method that is invoked when a simple string representation of the class is needed, as for example when printed.\n",
-      " * There are many more, see http://docs.python.org/2/reference/datamodel.html#special-method-names"
+      "    * `__init__`: The name of the method that is invoked when the object is first created.\n",
+      "    * `__str__` : A method that is invoked when a simple string representation of the class is needed, as for example when printed.\n",
+      "    * There are many more, see http://docs.python.org/2/reference/datamodel.html#special-method-names"
      ]
     },
     {
@@ -3127,7 +3128,7 @@
      "input": [
       "p1 = Point(0, 0) # this will invoke the __init__ method in the Point class\n",
       "\n",
-      "print(p1)         # this will invode the __str__ method"
+      "print(p1)         # this will invoke the __str__ method"
      ],
      "language": "python",
      "metadata": {},
@@ -3419,7 +3420,7 @@
      "source": [
       "## Exceptions\n",
       "\n",
-      "In Python errors are managed with a special language construct called \"Exceptions\". When errors occur exceptions can be raised, which interrupts the normal program flow and fallback to somewhere else in the code where the closest try-except statements is defined.\n"
+      "In Python errors are managed with a special language construct called \"Exceptions\". When errors occur exceptions can be raised, which interrupts the normal program flow and fallback to somewhere else in the code where the closest try-except statement is defined.\n"
      ]
     },
     {