Regig session 2

Author: tomclose

_sessions/c1s2/1_recap.md

@@ -0,0 +1,34 @@
+---
+title:  "Recap from last time"
+---
+
+### HTML/CSS
+
+* Webpage is just a collection of files: HTML, CSS & Javascript.
+* We can edit these files locally.
+* We can create them locally (using a text editor) and view then in a
+browser.
+
+### Command line
+
+* `ls`
+* `cd coding_course`
+* `cd ..`
+
+{% exercise %}
+1. Open the command line ('Terminal' on a mac, 'Command prompt with Ruby
+   on Rails' on windows)
+2. Use `cd` and `ls` to navigate to your `coding_course` folder.
+{% endexercise %}
+
+### Something new
+
+{% exercise %}
+1. Make sure you're in your `coding_course` folder.
+2. Do an `ls`.
+3. Type `git clone https://github.com/code61/html2.git`
+4. Do an `ls`.
+{% endexercise %}
+
+You just used git to get the code for the next exercise onto your
+laptop!

_sessions/c1s2/6_homework.md

@@ -20,41 +20,4 @@ Finish off both CSS exercises from class. Check your solutions online:
 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.
 {% endexercise %}
 
-### Get 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 %}

_sessions/c1s2/1_using_git.md renamed to _sessions/c1s2/_1_using_git.md

@@ -0,0 +1,15 @@
+---
+title: "Pushing to GitHub"
+---
+
+Git is a version control system. It allows you to keep the entire history of your code, and makes it easy to share and collaborate with others.
+
+### Using git on a folder
+
+Git works on a folder level: 
+
+On your laptop, a git repository is just a **special type of folder**. Any folder can be made into a git repository (but not all folders should - e.g. don't make your entire documents directory into a git repository, you'll run into problems). You'll normally make a new git repository for each coding project you work on.
+
+If you look inside the folder, you won't see all the different versions stored there (they are actually there - just stored inside a hidden folder called `.git`) - you'll only see the files that are in your **working copy**. Normally this working copy will contain the files from the last commit on the master branch, along with any changes you've made.
+
+### Making a commit