Merge pull request #107 from kfrn/master

Fix typo
dev-academy-programme · Sep 30, 2016 · 288f81f · 288f81f
2 parents a8a72f6 + f4d4ed7
commit 288f81f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/resources/css-fundamentals-ARTICLE/README.md b/resources/css-fundamentals-ARTICLE/README.md
@@ -40,7 +40,7 @@ For the purposes of testing these ideas, we'll add our stylesheet right into our
 
 ### Selectors
 
-Before we can apply styling rules to our HTML elements, we need some way for our stylsheet to get hold of them. We do this by using a "selector".
+Before we can apply styling rules to our HTML elements, we need some way for our stylesheet to get hold of them. We do this by using a "selector".
 
 There are many types of selectors and combinations of selectors, but for this sprint, we'll focus on just two of them.
 

diff --git a/resources/git-merge-message-ARTICLE/README.md b/resources/git-merge-message-ARTICLE/README.md
@@ -15,7 +15,7 @@ If you:
 2. Git will open the automatic commit message in the default Git text editor. You don't need to add anything.  
 3. Closing the file will trigger the commit with the merge to be executed, which is what we want.  
 
-**Close the file** - If the default editor is nano, close the file with 'ctrl+x'. If the default editor is sublime, 'cmd+w'[OSX], 'ctrl+w'[Linux/Windows]
+**Close the file** - If the default editor is nano, close the file with 'ctrl+x'. If the default editor is sublime, 'cmd+w'[OSX], 'ctrl+w'[Linux/Windows]. If the default editor is Vim, press Esc, type `:q` and then hit enter.
 
 
 ## Topics Covered / Key words:
@@ -25,4 +25,3 @@ If you:
 
 ## Type:
 - Article
-
diff --git a/resources/html-css-CHEATSHEETS/README.md b/resources/html-css-CHEATSHEETS/README.md
@@ -1,6 +1,6 @@
 # A collection of HTML and HTML5 Cheatsheets (External)
 [Skillcrush's HTML4 cheatsheet](http://skillcrush.com/wp-content/uploads/2012/06/HTML-Cheatsheet-Skillcrush.pdf)  
-[Infograpic city HTML5 cheatsheet](http://infographic.city/html5-cheatsheet/)  
+[Infographic city HTML5 cheatsheet](http://infographic.city/html5-cheatsheet/)  
 [HTML5 cheatsheet](http://adactio.com/extras/pocketbooks/html5/)  
 [HTML tags and attributes + CSS cheetsheet](https://www.bluehost.com/blog/website-design/html-css-cheat-sheet-infographic-4181/)  
 
@@ -14,4 +14,3 @@ A collection of quick references for HTML and CSS
 ## Type:
 - Cheatsheet
 - infographics
-
diff --git a/resources/html5-structure-outlines-ARTICLE/REAMDE.md b/resources/html5-structure-outlines-ARTICLE/REAMDE.md
@@ -2,7 +2,7 @@
 [developer.mozilla.org](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Sections_and_Outlines_of_an_HTML5_document)
 
 ## Overview
-Good explination of HTML5 by comparsion to HTML4
+Good explanation of HTML5 by comparison to HTML4
 
 ## Topics Covered / Key words:
 - Structure of a Document in HTML 4
@@ -18,4 +18,4 @@ Good explination of HTML5 by comparsion to HTML4
 - Using HTML5 Elements in Non-HTML5 Browsers
 
 ## Type
-- Article
+- Article