Fix small problems - can't use colon within description

kbroman · kbroman · commit 8cfc44299159 · 2015-01-15T21:29:50.000-06:00
diff --git a/index.md b/index.md
@@ -2,7 +2,7 @@
 layout: page
 title: git/github guide
 tagline: a minimal tutorial
-description: Git/GitHub Guide: a minimal tutorial
+description: Git/GitHub Guide - a minimal tutorial
 ---
 
 All statistical/computational scientists should use
diff --git a/pages/amend_commit_msg.md b/pages/amend_commit_msg.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Amend the last commit message
-description: Git/GitHub Guide: amend the last commit message
+description: How to amend the last git commit message
 ---
 
 &ldquo;Oops!  That last commit message was screwed up.
@@ -14,8 +14,8 @@ that I hadn't mentioned in the commit message.
 It's easy to fix just the message for the last commit:
 
     $ git commit --amend -m "New commit message"
-    
+
 Or leave off the `-m "New commit message"` and type the message in the
-text editor that opens.    
+text editor that opens.
 
 **Next**: [Exploring code and its history](exploring_code.html)
diff --git a/pages/branching.md b/pages/branching.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Branching and merging
-description: Git/GitHub Guide: branching and merging
+description: Git branching and merging
 ---
 
 I touched on just a few things about git.  Get yourself going with git and
@@ -22,13 +22,13 @@ To create a branch called `new_feature`:
 Then &ldquo;check it out&rdquo;:
 
     $ git checkout new_feature
-    
+
 Make various modifications, and then add and commit.
 
 To go back to the master branch, check it out:
 
     $ git checkout master
-    
+
 To push the branch to github, use this:
 
     $ git push origin new_feature
@@ -38,13 +38,13 @@ into your exploratory one:
 
     $ git checkout new_feature
     $ git merge master
-    
+
 If you're satisfied with your changes in the exploratory branch, merge
 them into the master:
 
     $ git checkout master
     $ git merge new_feature
-    
+
 If you're done with the branch and want to delete it:
 
     $ git branch -d new_feature
@@ -53,12 +53,12 @@ But if you pushed it to github, it will still exist there.  This is
 how to delete the branch from github:
 
     $ git push origin --delete new_feature
-    
+
 After pulling from github, use the following to get access to a branch
 that is only on github:
 
     $ git checkout -b new_feature origin/new_feature
-    
+
 If you want to pull a particular branch from a collaborator's
 repository, do this:
 
diff --git a/pages/exploring_code.md b/pages/exploring_code.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Exploring code and its history
-description: Git/GitHub Guide: exploring code and its history
+description: Exploring code and its history with git and GitHub
 ---
 
 For my own repositories, I like to use [gitx](http://gitx.frim.nl/) on
@@ -80,7 +80,7 @@ And again you can use this for a particular file:
 `git diff` has a ton of options; see the manual page:
 
     git diff --help
-    
+
 For example, you can get a brief summary of which files were changed with `--stat`:
 
     git diff 1.22-21 1.23-16 --stat
diff --git a/pages/first_time.md b/pages/first_time.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Your first time with git and github
-description: Git/GitHub Guide: initial setup
+description: Initial setup for git and GitHub
 ---
 
 If you've never used git or github before, there are a bunch of things
@@ -14,18 +14,18 @@ but repeated here for completeness.
 - Set up git with your user name and email.
 
   - Open a terminal/shell and type:
-  
+
         $ git config --global user.name "Your name here"
         $ git config --global user.email "your_email@example.com"
 
     (Don't type the `$`; that just indicates that you're doing this at
     the command line.)
 
     I also do:
-    
+
         $ git config --global color.ui true
         $ git config --global core.editor emacs
-                
+
     The first of these will enable colored output in the terminal; the
     second tells git that you want to use emacs.
 
@@ -37,12 +37,12 @@ but repeated here for completeness.
   - Look to see if you have files `~/.ssh/id_rsa` and
   `~/.ssh/id_rsa.pub`.
   - If not, create such public/private keys: Open a terminal/shell and type:
-  
+
         $ ssh-keygen -t rsa -C "your_email@example.com"
 
   - Copy your public key (the contents of the newly-created
     `id_rsa.pub` file) into your clipboard.  **On a Mac**, in the terminal/shell, type:
-  
+
         $ pbcopy < ~/.ssh/id_rsa.pub
 
 - Paste your ssh public key into your github account settings.
@@ -53,11 +53,11 @@ but repeated here for completeness.
   - Add a label (like &ldquo;My laptop&rdquo;) and paste the public
     key into the big text box.
   - In a terminal/shell, type the following to test it:
-  
+
         $ ssh -T git@github.com
-    
+
   - If it says something like the following, it worked:
-  
+
         Hi username! You've successfully authenticated, but Github does
         not provide shell access.
 
diff --git a/pages/fork.md b/pages/fork.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Contribute to someone's repository
-description: Git/GitHub Guide: contributing to someone's repository
+description: Contributing to someone's GitHub repository
 ---
 
 Say you want to contribute changes to someone else's repository (eg,
@@ -104,10 +104,10 @@ Once they do that, you'll get an email about it.  How to handle it?
 
 - If you want them to make further changes before you merge
   the changes into your repository, add a comment.
-  
+
 - If you hate the whole idea, just click the &ldquo;Close&rdquo;
   button.
-  
+
 - If you want to merge the changes into your repository, click the
   &ldquo;Merge pull request&rdquo; button.
 
@@ -128,13 +128,13 @@ You don't have to use the github website for this.
 
 - Add a connection to your friend's version of the github repository,
   if you haven't already.
-  
+
       $ git remote add myfriend git://github.com/myfriend/the_repo
-    
+
 - Pull his/her changes.
 
       $ git pull myfriend master
-    
+
 - Push them back to your github repository.
 
       $ git push
diff --git a/pages/init.md b/pages/init.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Start a new git repository
-description: Git/GitHub Guide: creating a new git repository
+description: Creating a new git repository
 ---
 
 Your first instinct, when you start to do something new, should be
@@ -25,7 +25,7 @@ start exploring it.
 The first file to create (and add and commit) is probably a ReadMe
 file, either as plain text or with
 [Markdown](http://daringfireball.net/projects/markdown/), describing
-the project. 
+the project.
 
 Markdown allows you to add a bit of text markup, like
 [hyperlinks](http://en.wikipedia.org/wiki/Hyperlink),
@@ -71,7 +71,7 @@ repository...&rdquo;
 Actually, the first line of the instructions will say
 
     $ git remote add origin https://github.com/username/new_repo
-    
+
 But I use `git@github.com:username/new_repo` rather than `https://github.com/username/new_repo`, as the
 former is for use with
 [ssh](http://en.wikipedia.org/wiki/Secure_Shell) (if you set up ssh as
@@ -81,6 +81,3 @@ you use the latter construction, you'll have to type your github
 password every time you push to github.
 
 **Next**: [Contribute to someone's repository](fork.html)
-
-
-
diff --git a/pages/merge_conflicts.md b/pages/merge_conflicts.md
@@ -1,16 +1,16 @@
 ---
 layout: page
 title: Handling merge conflicts
-description: Git/GitHub Guide: handling merge conflicts
+description: Handling git merge conflicts
 ---
 
 One of the best features of [git](http://git-scm.com) is its ability
-to easily merge multiple changes by different people.  
+to easily merge multiple changes by different people.
 
 Say you and a
-friend have both made changes to the same file at the same time.  
+friend have both made changes to the same file at the same time.
 When you pull your friend's changes, git will often be able to combine
-them without any problem.  
+them without any problem.
 
 Sometimes, though, after you do
 
diff --git a/pages/resources.md b/pages/resources.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: git/github resources
-description: Git/GitHub Guide: resources page
+description: git/GitHub resources page
 ---
 
 This tutorial is minimal.  It's probably considerably less than
@@ -17,7 +17,7 @@ Here are some examples.
 
 - The O'Reilly
   [Version Control with Git book](http://shop.oreilly.com/product/9780596520137.do)
-  
+
 - The [github help pages](https://help.github.com/)
 
 - [Git tutorials on github](http://learn.github.com/); you can even
@@ -33,15 +33,15 @@ Here are some examples.
   by [Kevin Markham](http://www.dataschool.io/about/)
 
 - Using GitHub with [RStudio](http://www.rstudio.com):
-  
+
   - [Using GitHub with R and Rstudio](http://markrchristie.wordpress.com/2013/11/26/using-github-with-r-and-rstudio/)
     by [Mark Christie](http://markrchristie.wordpress.com/)
 
   - [Getting started with GitHub](http://jennybc.github.io/2014-05-12-ubc/ubc-r/session2.4_github.html)
     from materials for a
     [software carpentry](http://software-carpentry.org/)
     [course at UBC](http://jennybc.github.io/2014-05-12-ubc/)
-    
+
 - [Google](http://bit.ly/13lFEmG)
 
 - [Stackoverflow](http://stackoverflow.com/questions/tagged/git)
diff --git a/pages/routine.md b/pages/routine.md
@@ -1,12 +1,12 @@
 ---
 layout: page
 title: Routine use of git and github
-description: Git/GitHub Guide: day-to-day use
+description: Day-to-day use of git and GitHub
 ---
 
 The routine use of [git](http://git-scm.com) involves just a few commands:
 principally `add`, `commit`, and `push`, but also `status` and
-`diff`. 
+`diff`.
 
 You can deal with git and github via a [GUI](http://mac.github.com/),
 but I prefer the command line, and so that's all I'll discuss.
@@ -15,7 +15,7 @@ but I prefer the command line, and so that's all I'll discuss.
 
 After you've made some small modifications to your project and
 checked that they work, use `git add` to indicate that they're ready.
-  
+
     $ git add R/modified.R man/modified.Rd
 
 Then use `git commit` to add the modifications to the repository.
@@ -29,7 +29,7 @@ To abandon your commit, exit the editor without adding text.
 
 Note that `git add` is used to add completely new files as well as to
 &ldquo;add&rdquo; modifications to files that already exist in the
-repository.  
+repository.
 
 The commit message should be short (40 or 60 characters) so it's easy
 to read in a list.  For a more complex commit, write an initial line
@@ -79,7 +79,7 @@ changes, they may not get to github for months.
 You've made some changes to a project, but you're not sure what.  Type
 
     git status
-    
+
 It'll give you a list of files that have been changed, plus new
 files that haven't been formally added.
 
@@ -89,7 +89,7 @@ files that haven't been formally added.
 Exactly what changes have you made?  Type
 
     git diff
-    
+
 Or to see your changes to a particular file, type
 
     git diff R/modified.R
@@ -143,7 +143,7 @@ in git should be indicated in a `.gitignore` file.
 You don't _have_ to have a `.gitignore` file, but if you don't, those
 files will show up every time you type `git status`.
 
-Each subdirectory can have its own `.gitignore` file, too.  
+Each subdirectory can have its own `.gitignore` file, too.
 
 Also, you can have a global such in your home directory; I use
 `~/.gitignore_global`, which contains:
diff --git a/pages/rstudio.md b/pages/rstudio.md
@@ -1,11 +1,11 @@
 ---
 layout: page
 title: git/github with RStudio
-description: Git/GitHub Guide: use of git/github in RStudio
+description: Use of git/GitHub in RStudio
 ---
 
 [RStudio](http://www.rstudio.com/ide) is a popular development
-environment for [R](http://www.r-project.org). 
+environment for [R](http://www.r-project.org).
 
 RStudio has built-in facilities for [knitr](http://yihui.name/knitr/)
 (the superb successor to [Sweave](http://www.stat.uni-muenchen.de/~leisch/Sweave/)) and [R Markdown](http://www.rstudio.com/ide/docs/r_markdown) (a
diff --git a/pages/why.md b/pages/why.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Why git and github?
-description: Git/GitHub Guide: why use git and github?
+description: Why use git and GitHub?
 ---
 
 ### Why use [git](http://git-scm.com)?
@@ -52,16 +52,16 @@ example:
 - [Hadley Wickham](http://had.co.nz)'s
   [bigvis](https://github.com/hadley/bigvis),
   [ggplot2](https://github.com/hadley/ggplot2),
-  [lubridate](https://github.com/hadley/lubridate), 
-  [dplyr](https://github.com/hadley/dplyr) 
-  
+  [lubridate](https://github.com/hadley/lubridate),
+  [dplyr](https://github.com/hadley/dplyr)
+
 - [Yihui Xie](http://yihui.name)'s [knitr](https://github.com/yihui/knitr)
 
 - [Ramnath Vaidyanathan](https://github.com/ramnathv)'s [rCharts](https://github.com/ramnathv/rCharts), [rMaps](https://github.com/ramnathv/rMaps), [slidify](https://github.com/ramnathv/slidify)
 
 - My own [R/qtl](http://github.com/kbroman/qtl)
 
-Poke around in the files, and also the commits: 
+Poke around in the files, and also the commits:
 Click the &ldquo;Commits&rdquo; tab and then click on a given commit
 to see what changes were made.
 
