Finishing off the Setup tutorial and tidy up of linked pages

Author: MarkCBJSS

version-control/command-line/tutorial.md

@@ -500,5 +500,9 @@ After typing a couple of commands in the terminal to generate some history, try
 
 > You can see the entire history by running `history`
 
----
+## The next step
+
+Get learning JavaScript, HTML, CSS, Ruby and more on [Codebar](http://tutorials.codebar.io/).
+
+-----
 This ends **Introduction to the Git command line** tutorial. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback, or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.

version-control/introduction/tutorial.md

@@ -97,9 +97,9 @@ As with any technology and related tool, there's a lot of terminology realted to
 
 - **Pull**: Get the latest version of code from a reposity
 
-- **Push**: Send your code changes to the repository
+- **Push**: Send your code changes to the remote repository
 
-- **Add**: Adds your chosen changes to the local Stage area, ready for a commit
+- **Add**: Adds your chosen changes to the local Stage area, ready for a commit and push
 
 - **Stage**: An index of changes you are preparing to commit to the repository
 
@@ -127,61 +127,10 @@ Try using messages such as _repositioned image to look better on page_ or _resol
 When you come back to coding, be sure to `pull` any changes into your local repository that others may have committed to the repository since you last worked on the code. If there are changes you don't pull in you can get **Merge Conflicts**, where two sets of changes, the ones from other people and yours, need to be worked through to decide which change is kept. Resolving merge conflicts is notoriously tricky - small, frequent commits followed by a pull are a great way to avoid merge conflicts.
 
 
-
 ## The next step
 
 Get set-up with [Git and GitHub](../set-up/tutorial.html).
 
-
----------- REMOVE FROM HERE ONWARDS -----------
-
-## Now what?
-
-Now that you have the Github client setup on your machine, we will spend some time adding what you have created in the HTML and CSS lessons to an internet repository! Before you start make sure the Github client is running and you are signed in.
-
-1. Create a new repository by clicking the `Create New Repository` button
-
-	![Create a new Repository](images/create-new-repository.png)
-
-2. In your text editor, open the directory you just created and create a README.md file with the following content:
-
-	_This is where I store the work I have done at codebar._
-
-3. Go back to the Github client and commit the file by filling out the `Summary` field and hitting the `Commit to master` button
-	
-	![Add a Readme File](images/add-readme.png)
-
-4. Now, create a new branch called **gh-pages**
-
-	![Create a New Branch](images/create-new-branch.png)
-
-5. In the directory, create a subdirectory **lesson1** and move the **html** file you created at the first session and all the other relevant files and directories (e.g. /images)
-
-6. Now, link the file from the root of your project by creating an `index.html` file and adding a link to the page
-
-	```
-	<a href='lesson1/index.html'>Lesson 1 - Introduction to HTML </a>
-	```
-	> Don't forget to rename index to whatever you have named your file!
-
-7. Commit your changes to the gh-pages branch
-
-	![Commit Changes](images/commit-changes.png)
-
-8. Once you committed your changes publish your work by clicking the `Publish repository` button
-
-	![Publish Repository](images/publish-repository.png)
-
-9. View your work on the web!
-
-	To access your work, go to `http://<username>.github.io/codebar`
-
-10. Repeat the process to list the rest of the tutorials you have worked on on the page as well.
-
-## Bonus
-
-This is your personal page. Use what you learned in the previous lessons to style it, make it look pretty, and what we learned today to commit and publish your changes.
-
 -----
 
-This ends our _Introduction to version control and git_ lesson. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback, or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.
+This ends our **Introduction to version control with Git** lesson. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback, or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.

version-control/set-up/images/git-and-github-logo.png

@@ -3,6 +3,9 @@ layout: page
 title: Set-up Git and GitHub
 ---
 
+**PREREQUISITES:** 
+- Understanding of version control ([Introduction to Version Control and Git](../introduction/tutorial.html))
+
 ## Introduction to Git and GitHub
 -----
 Now that we know what Version Control is, let's get set-up with Git and Github. By the end of this tutorial we'll have installed Git, set-up a Github account, created SSH keys that we can use to authenticate between the two, then finally created and cloned a repository for us to start working on our own projects and contributing to others.
@@ -17,8 +20,6 @@ $ git --version
 ```
 This will return the version of Git you've installed and prove it's up and running correctly.
 
-> Later in the tutorial we'll download [Github Desktop](https://desktop.github.com/).
-
 ### Create an empty Git repository
 Now create a directory where you will be storing all your projects, by typing the following lines and hitting enter after each. You can call the directory whatever you prefer, such as `code` or `projects`.
 
@@ -134,17 +135,31 @@ ssh -T [email protected]
 
 ![Authentication success](images/setup-success-authenticating.png)
 
-### Create a Github Repository
+## Create a Github Repository
+
+Now that we're all set-up with Git and Github, and we've set-up a folder on our local system that's been initiliased as a Git repository - we just need to add a remote repository on Github that we can commit our local files to.
+
+In your home page on Github, click on `Repository` and then `New` to start adding a new repository.
+
+![Add a respository](images/setup-add-a-repository.png)
 
-Now that we're all set-up, we just need to add a repository on Github that we can add files to once we've crerated them on our local system.
+On the next page complete the details for the `Respository name` and a `Description`. Set the visibility to `Public` and initialise with a README file so you can easily add a description and notes about the repository. It's recommended that you choose a license type too, MIT License is fairly common for open source work. When you're done, hit the `Create Respository` button.
 
-![Create a respository](setup-create-a-repository.png)
+![Set up new Respository details](images/setup-new-repository-details.png)
 
-### Clone a Github Respository
+The respository will now be set-up with your readme and license files. It will also have a Github URL available to copy and use in Git when making a commit.
 
-One last thing we can do for our set-up is to Clone a remote repository on Github, down to our local system.
+![Copy a respository URL](images/setup-copy-a-repository-url.png)
 
-![Clone a respository](setup-clone-a-repository.png)
+For Git to know where we want files to go when we do a `git push` of items in our local respository, we need to add a reference to that repository. Enter the following command in a console window and be sure to add the URL you copied from Github.
 
+```bash
+$ git remote add origin <repository-url>
+```
+## The next step
+
+Learn more about the [Git Command Line](../command-line/tutorial.html).
+
+-----
 
-This ends our _Set-up Git and GitHub_ lesson. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.
+This ends our **Set-up Git and GitHub** lesson. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.