incorporated changes from @ataustin

Author: seankross

04-Working-with-Unix.Rmd

@@ -605,7 +605,7 @@ egrep "\s" small.txt
 ```
 
 As you can see in the example above, the `\w` metacharacter matches all letters,
-numbers, and even the underscore character (`_`). We can see the compliment of
+numbers, and even the underscore character (`_`). We can see the complement of
 this grep by adding the `-v` flag to the command:
 
 ```{r, engine='bash', eval=FALSE}
@@ -640,7 +640,7 @@ In addition to general character sets we can also create specific character
 sets using square brackets (`[ ]`) and then including the characters we wish to
 match in the square brackets. For example the regular expression for the set
 of vowels is `[aeiou]`. You can also create a regular expression for the
-compliment of a set by including a caret (`^`) in the beginning of a set. For
+complement of a set by including a caret (`^`) in the beginning of a set. For
 example the regular expression `[^aeiou]` matches all characters that are not
 vowels. Let's test both on small.txt:
 
@@ -888,8 +888,8 @@ a table with several of the metacharacters we've discussed in this chapter:
 |       ?       |       Zero or One of Previous        |
 |    |     | Either the Previous or the Following |
 |      {6}      |        Exactly 6 of Previous         |
-|    {4, 6}     |     Between 4 and 6 or Previous      |
-|     {4, }     |       More than 4 of Previous        |
+|    {4, 6}     |     Between 4 and 6 of Previous      |
+|     {4, }     |        4 or more of Previous         |
 
 If you want to experiment with writing regular expressions before you use them
 I highly recommend playing around with http://regexr.com/.
@@ -1033,7 +1033,7 @@ alias edbp='nano ~/.bash_profile'
 
 The first `alias` creates a new command `docs`. Now entering `docs` into the
 command line is the equivalent of entering `cd ~/Documents` into the comamnd
-line. Open let's edit our `~/.bash_profile` with `nano`. If there's anything
+line. Let's edit our `~/.bash_profile` with `nano`. If there's anything
 in your `~/.bash_profile` already then start adding lines at the end of the
 file. Add the line `alias docs='cd ~/Documents'`, then save the file and quit
 `nano`. In order to make the changes to our `~/.bash_profile` take effect we
@@ -1238,7 +1238,7 @@ British Columbia
 Notice that this is the same result we would get from `head -n 5 canada.txt`,
 we just used `cat` to illustrate how the pipe works. The general syntax of the
 pipe is 
-`[program that produces output] | [program uses pipe output as input instead of a file]`.
+`[program that produces output] | [program that uses pipe output as input instead of a file]`.
 
 A more common and useful example where we could use the pipe is answering the
 question: "How many US states end in a vowel?" We could use `grep` and regular
@@ -1256,7 +1256,7 @@ grep "[aeiou]$" states.txt | wc -l
 The pipe can also be used multiple times in one command in order to take
 the output from one piped command and use it as the input to yet another program!
 For example we could use three pipes with `ls`, `grep`, and `less` so that we
-could scroll through the files in out current directory were created in February:
+could scroll through the files in our current directory that were created in February:
 
 ```{r, engine='bash', eval=FALSE}
 ls -al | grep "Feb" | less
@@ -1313,7 +1313,7 @@ draft_journal_entry.txt:
   touch draft_journal_entry.txt
 ```
 
-The simple `makefile` above shows illustrates a **rule** which has the
+The simple `makefile` above illustrates a **rule** which has the
 following general format:
 
 ```
@@ -1508,7 +1508,7 @@ clean:
   rm readme.txt
 ```
 
-Let's save and close our `makefile` then let's test it out first let's clean up
+Let's save and close our `makefile` then let's test it out.  First let's clean up
 our repository:
 
 ```{r, engine='bash', eval=FALSE}

05-Bash-Programming.Rmd

@@ -825,7 +825,7 @@ bash simpleelif.sh 5
 ## 5 is a great number
 ```
 
-If first condition is false since 5 is not equal to 4, but then the next
+The first condition is false since 5 is not equal to 4, but then the next
 condition in the ELIF statement is true since 5 is greater than 3, so that
 echo command is executed and the rest of the statement is skipped. Try to guess
 what will happen if we use `2` as an argument:
@@ -934,7 +934,7 @@ expressions, and IF statements allow you to write more powerful Bash programs.
 - Conditional execution uses two operators: AND (`&&`) and OR (`||`) which you
 can use to control what command get executed based on their exit status.
 - Conditional expressions are always in double brackets (`[[ ]]`). They have
-exit an exit status of 0 if they contain a true assertion or 1 if they contain
+an exit status of 0 if they contain a true assertion or 1 if they contain
 a false assertion.
 - IF statements evaluate conditional expressions. If an expression is true then
 the code within an IF statement is executed, otherwise it is skipped.
@@ -1345,7 +1345,7 @@ done
 ```
 
 If the program is working, then `count` is being incremented very rapidly and
-you're watching number wiz by in your terminal! Don't fret, you can terminate
+you're watching numbers whiz by in your terminal! Don't fret, you can terminate
 any program that's stuck in an infinite loop using `Control` + `C`. Use
 `Control` + `C` to get the prompt back so that we can continue.
 

06-Git-and-GitHub.Rmd

@@ -844,8 +844,8 @@ git commit -m "added weather info"
 
 This is a small example of how to use Git branching, but you can see how you
 can make incremental edits to plain text (usually code files) without
-effecting the `master` branch (the tested and working copy of your software)
-and without effecting any other branches. You can imagine how
+affecting the `master` branch (the tested and working copy of your software)
+and without affecting any other branches. You can imagine how
 this system could be used for multiple people to work on the same codebase at
 the same time, or how you could develop and test multiple software features
 without them interfering with each other. Now that we've made a couple of
@@ -1227,7 +1227,7 @@ wrote has been rendered according to a few rules:
 - Pound signs (`#`, `##`) make headings.
 - A word surrounded by single asterisks (`*word*`) makes that word *italicized*.
 - A word surrounded by double asterisks (`**word**`) makes that word **bold**.
-- You can create lists with hyphens (`-`) or numbers (`1., 2., 3.`).
+- You can create lists with hyphens (`-`) or numbers (`1.`, `2.`, `3.`).
 - Code can be placed in the middle of a line with single backticks (`` `code` ``).
 - A code block can be created by putting code in between a set of triple
 backticks (`` ``` ``).
@@ -1645,7 +1645,7 @@ be merged into the upstream repository!
 1. Create a new repository on GitHub. Clone your repository and add a
 `README.md` file. Push this file to GitHub and create a GitHub Pages website
 for this repository.
-2. Fork an existing repository (try one of mine https://github.com/seankross)
+2. Fork an existing repository (try one of mine: https://github.com/seankross)
 and try to identify something valuable you could contribute. Make changes or
 additions to that repository, then open a pull request.
 3. Read through [GitHub's Guides](https://guides.github.com/).