Update session 4

Author: tomclose

_sessions/c1s2/2_css.md

@@ -47,7 +47,9 @@ h3 {
 Note that you can specify multiple properties on one element. When you do this it's nice to lay them out on multiple lines as done above.
 
 {% exercise %}
-2. Open `exercise1.html` in Sublime Text and in Chrome.
-3. Add some css in the `head` to make the `h1` turn red.
-5. Continue with the exercise until `exercise1.html` looks like `exercise1_solution.png`.
+<ol>
+<li>Open `exercise1.html` in Sublime Text and in Chrome.</li>
+<li>Add some css in the `head` to make the `h1` turn red.</li>
+<li>Continue with the exercise until `exercise1.html` looks like `exercise1_solution.png`.</li>
+</ol>
 {% endexercise %}

_sessions/c1s2/6_homework.md

@@ -6,18 +6,22 @@ title: Homework
 
 {% exercise %}
 Finish off both CSS exercises from class. Check your solutions online:
-* Find the HTML2 repository on Code61's github page.
-* In the `branch` dropdown (just above the list of files) select the `solution` branch.
-* Click on the files below to see the solution
+<ul>
+<li>Find the HTML2 repository on Code61's github page.</li>
+<li>In the `branch` dropdown (just above the list of files) select the `solution` branch.</li>
+<li>Click on the files below to see the solution</li>
+</ul>
 {% endexercise %}
 
 ### More HTML/CSS
 
 {% exercise %}
-1. Complete the whole of Project 3 on the [General Assembly Dash](https://dash.generalassemb.ly/projects) site.
-2. Make some changes to your `first_site` based on what you've learnt. Make sure you add them to git, push them to github and check you can see them online.
-3. (Optional) Do the projects from the [Codecademy Web Track](http://www.codecademy.com/tracks/web) Sections 7, 8 &amp; 9.
-4. (Optional) Read [this article](https://www.inkling.com/read/dreamweaver-cs6-missing-manual-david-sawyer-mcfarland-1st/chapter-4/understanding-links) about absolute vs. relative links.
+<ol>
+<li>Complete the whole of Project 3 on the [General Assembly Dash](https://dash.generalassemb.ly/projects) site.</li>
+<li>Make some changes to your `first_site` based on what you've learnt. Make sure you add them to git, push them to github and check you can see them online.</li>
+<li>(Optional) Do the projects from the [Codecademy Web Track](http://www.codecademy.com/tracks/web) Sections 7, 8 &amp; 9.</li>
+<li>(Optional) Read [this article](https://www.inkling.com/read/dreamweaver-cs6-missing-manual-david-sawyer-mcfarland-1st/chapter-4/understanding-links) about absolute vs. relative links.</li>
+</ol>
 {% endexercise %}
 
 

_sessions/c1s3/0_recap.md

@@ -0,0 +1,70 @@
+---
+title: Recap from last time
+---
+
+### Before you start: updating gitgit
+
+There have been some updates and improvements to gitgit! To get these
+improvements open the command line and run:
+
+    gem update gitgit
+
+To check it worked run
+
+    gitgit version
+
+it should say '0.0.5' (or higher).
+
+### Before you start: verifying github email address
+
+Today we're going to be putting up your first site using [GitHub
+Pages](https://pages.github.com/) - a free hosting solution provided by
+GitHub.
+
+In order for this to work you need to have **verified your email address
+with GitHub**.
+
+{% exercise %}
+<ol>
+  <li>Log into GitHub.</li>
+  <li>If you see a warning at the top that you haven't verified your
+email address, follow the instructions to do that now.</li>
+  <li>If not, you're good to go!</li>
+</ol>
+{% endexercise %}
+
+### Review exercise
+
+{% exercise %}
+<ol>
+  <li>Open the comand line</li>
+  <li>Navigate to your 'first_site' folder (cd/ls)</li>
+  <li>Open 'first_site/index.html' in Sublime Text</li>
+  <li>Make a change to the file</li>
+  <li>Save the changes and push to github ("gitgit save", "gitgit
+push")</li>
+  <li>Log into github and check you can see your changes</li>
+</ol>
+
+{% endexercise %}
+
+### Something new: publishing site using GitHub pages
+
+You're now going to publish your 'first_site' using [GitHub Pages](https://pages.github.com/).
+
+To do this you need to push your website up to a branch called
+'gh-pages'. You don't know about branches yet, but you can see them on
+github. Right now you'll just see a single branch called 'master'.
+
+You don't actually need to understand anything about branches at the
+moment, as gitgit makes it really easy to publish as a github page. Just
+run
+
+    gitgit publish
+
+When you go to github you should now see a 'gh-pages' option in the
+branches dropdown.
+
+The 'gh-pages' branch is a signal to github that you want your code to
+be deployed as a website. You can find the url of your website by
+looking in your repository settings on GitHub.

_sessions/c1s3/2_twitter_bootstrap.md

@@ -71,7 +71,10 @@ The aim of the rest of this session will be to create the website for ["Sam's Sa
 
 <ol markdown="1">
 <li markdown="1">
-Clone down the repository for the bootstrap exercise: [https://github.com/code61/bootstrap_exercise.git](https://github.com/code61/bootstrap_exercise.git)
+Clone down the repository for the [bootstrap exercise](https://github.com/code61/bootstrap_exercise.git) **into your coding_course folder**:
+
+    git clone https://github.com/code61/bootstrap_exercise.git
+
 </li>
 <li markdown="1">
 Open `bootstrap_exercise/index.html` in your browser.
@@ -106,4 +109,4 @@ Add the following line to the `head` section:
 as suggested in the `CSS / Overview` section of the [Bootstrap docs](http://getbootstrap.com/css/#overview-mobile).
 </li>
 </ol>
-{% endexercise %}
+{% endexercise %}

_sessions/c1s3/6_homework.md

@@ -14,15 +14,9 @@ Finish off the bootstrap_exercise from class
 Continue work on your personal site. You might want to think about using Twitter Bootstrap!
 {% endexercise %}
 
-### Get a Google Account
-
-{% exercise %}
-If you don't already have a google account (e.g. via a gmail address), you need to sign up for one: [https://accounts.google.com/SignUp](https://accounts.google.com/SignUp). You'll need it in class next week!
-{% endexercise %}
-
 ### Further reading on CSS
 
 {% exercise %}
 1. (Optional) Read [this article](http://coding.smashingmagazine.com/2009/08/17/taming-advanced-css-selectors/) which explains about CSS Specificity (and more).
 2. (Optional) Read [this article](http://css-tricks.com/attribute-selectors/) on CSS selectors.
-{% endexercise %}
+{% endexercise %}

_sessions/c1s4/1_recap.md

@@ -0,0 +1,26 @@
+---
+title: Recap
+---
+
+{% exercise %}
+1. Open the command line.
+2. Navigate to your `first_site` folder.
+3. Make a change to index.html.
+4. Save the change.
+5. Push it to github.
+6. Deploy it to github pages.
+{% endexercise %}
+
+### CSS
+
+We're now going to add a separate CSS file to your first_site. (If you
+already have one, that's fine - just add another one.)
+
+{% exercise %}
+1. Create a new file in sublime text and save it as `main.css` in your
+   first_site folder.
+2. Put a CSS rule in that file (e.g. 'h1 {color: red}')
+3. Put a link to the file from the head section of your index.html file.
+4. Make sure you can see the style when you open index.html in chrome.
+5. Save, push and deploy your changes.
+{% endexercise %}

_sessions/c1s4/2_domain_name.md

@@ -0,0 +1,42 @@
+---
+title: Wiring up your domain
+---
+
+### Getting your domain name to point to your GitHub Page
+
+The point of this exercise is to set up your domain name to point towards your new GitHub pages site.
+
+As GitHub hosts many different pages at their IP address, it isn't quite as simple as pointing your domain address towards that IP address. There are two things you need to do to get your domain name working with your GitHub pages site:
+
+1. Tell your domain registrar (e.g 123-reg or godaddy) to point your domain name towards GitHub's IP address.
+2. Tell GitHub that requests to your domain name should come to your site.
+
+Github explains this [here](https://help.github.com/articles/setting-up-a-custom-domain-with-pages).
+
+### Pointing your domain name towards GitHub
+
+For the first bit you need to log in to your domain registrar and change the DNS settings. You want an *A-record* pointing to `204.232.175.78` (which is github.com). Note that it can take up to a couple of days for DNS changes to propagate.
+
+If you're using 123-reg, your should log in, select your domain from the list, and click "Manage". You should then go to "Manage DNS".
+
+![123-reg DNS Settings](/assets/dns_settings.png)
+
+(The @ dns entry stands for the root or bare domain.)
+
+{% exercise %}
+Log in to your domain registrar and set an A-record to point towards GitHub.
+{% endexercise %}
+
+Your changes won't take effect immediately.
+
+### Tell github to expect requests for your domain name
+
+{% exercise %}
+1. Open Sublime Text and create a new file.
+2. Write your domain name on the first line of the new file e.g:
+
+         mydomain.com
+
+3. Save that file as `CNAME` (uppercase, with no extension) in your `first_site` folder
+4. Commit your change and then push to github.
+{% endexercise %}