typos Lec 7

Author: 5trobl

Lecture-7-Revision-Control-Software.ipynb

@@ -56,7 +56,7 @@
     "    * Allow reverting back to an older revision if something goes wrong.\n",
     "    * Work on several \"branches\" of the software concurrently.\n",
     "    * Tags revisions to keep track of which version of the software that was used for what (for example, \"release-1.0\", \"paper-A-final\", ...)\n",
-    "2. Make it possible for serveral people to collaboratively work on the same code base simultaneously.\n",
+    "2. Make it possible for several people to collaboratively work on the same code base simultaneously.\n",
     "    * Allow many authors to make changes to the code.\n",
     "    * Clearly communicating and visualizing changes in the code base to everyone involved."
    ]
@@ -1128,7 +1128,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Tags are named revisions. They are useful for marking particular revisions for later references. For example, we can tag our code with the tag \"paper-1-final\" when when simulations for \"paper-1\" are finished and the paper submitted. Then we can always retreive the exactly the code used for that paper even if we continue to work on and develop the code for future projects and papers."
+    "Tags are named revisions. They are useful for marking particular revisions for later references. For example, we can tag our code with the tag \"paper-1-final\" when when simulations for \"paper-1\" are finished and the paper submitted. Then we can always retrieve exactly the code used for that paper even if we continue to work on and develop the code for future projects and papers."
    ]
   },
   {
@@ -1251,7 +1251,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To retreive the code in the state corresponding to a particular tag, we can use the `git checkout tagname` command:\n",
+    "To retrieve the code in the state corresponding to a particular tag, we can use the `git checkout tagname` command:\n",
     "\n",
     "    $ git checkout demotag1"
    ]
@@ -1267,7 +1267,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "With branches we can create diverging code bases in the same repository. They are for example useful for experimental development that requires a lot of code changes that could break the functionality in the master branch. Once the development of a branch has reached a stable state it can always be merged back into the trunk. Branching-development-merging is a good development strategy when serveral people are involved in working on the same code base. But even in single author repositories it can often be useful to always keep the master branch in a working state, and always branch/fork before implementing a new feature, and later merge it back into the main trunk.\n",
+    "With branches we can create diverging code bases in the same repository. They are for example useful for experimental development that requires a lot of code changes that could break the functionality in the master branch. Once the development of a branch has reached a stable state it can always be merged back into the trunk. Branching-development-merging is a good development strategy when several people are involved in working on the same code base. But even in single author repositories it can often be useful to always keep the master branch in a working state, and always branch/fork before implementing a new feature, and later merge it back into the main trunk.\n",
     "\n",
     "In GIT, we can create a new branch like this:"
    ]
@@ -1597,7 +1597,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "If the respository has been cloned from another repository, for example on github.com, it automatically remembers the address of the parant repository (called origin):"
+    "If the respository has been cloned from another repository, for example on github.com, it automatically remembers the address of the parent repository (called origin):"
    ]
   },
   {
@@ -1795,7 +1795,7 @@
    "source": [
     "Github.com is a git repository hosting site that is very popular with both open source projects (for which it is free) and private repositories (for which a subscription might be needed).\n",
     "\n",
-    "With a hosted repository it easy to collaborate with colleagues on the same code base, and you get a graphical user interface where you can browse the code and look at commit logs, track issues etc. \n",
+    "With a hosted repository it is easy to collaborate with colleagues on the same code base, and you get a graphical user interface where you can browse the code and look at commit logs, track issues etc. \n",
     "\n",
     "Some good hosted repositories are\n",
     "\n",