From de05b053f36e5eab0cea92420240b8af1a902de4 Mon Sep 17 00:00:00 2001
From: Jessica Lord <jessica.lord@github.com>
Date: Tue, 21 Jan 2014 12:36:59 -0800
Subject: [PATCH] update username bit fixes #8

---
 help.txt                            | 6 +++++-
 problems/merge_tada/problem.txt     | 2 +-
 problems/merge_tada/verify.js       | 2 +-
 problems/remote_control/problem.txt | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/help.txt b/help.txt
index a96bbb31de..42c8f52744 100644
--- a/help.txt
+++ b/help.txt
@@ -7,7 +7,11 @@
 
   {bold}Configure your username{/bold}
 
-  $ git config --global user.name "YourGitHubUserName"
+  $ git config --global user.name "Your Name"
+  
+  {bold}Configure your username{/bold}
+
+  $ git config --global user.username githubusername
 
   {bold}Configure your email{/bold}
 
diff --git a/problems/merge_tada/problem.txt b/problems/merge_tada/problem.txt
index 41984ce6e5..b5d9efbdf5 100644
--- a/problems/merge_tada/problem.txt
+++ b/problems/merge_tada/problem.txt
@@ -2,7 +2,7 @@
 
   --------------------------------------------------------------------
 
-  Your pull request is waiting for review, but meanwhile, since you
+  Your pull request is being mereged! But meanwhile, since you
   know that you definitely want those updates in your forked version, 
   and your branch is in good working order, merge it into the main,
   branch on your forked repository, in this case, `gh-pages`.
diff --git a/problems/merge_tada/verify.js b/problems/merge_tada/verify.js
index b122bda671..9427b8bed9 100644
--- a/problems/merge_tada/verify.js
+++ b/problems/merge_tada/verify.js
@@ -4,7 +4,7 @@ var spawn = require('child_process').spawn
 var concat = require('concat-stream')
 
 var ref = spawn('git', ['reflog', '-10'])
-var username = spawn('git', ['config', 'user.name'])
+var username = spawn('git', ['config', 'user.username'])
 
 var user = ""
 
diff --git a/problems/remote_control/problem.txt b/problems/remote_control/problem.txt
index 1416ccf7bb..df6a0b0ad2 100644
--- a/problems/remote_control/problem.txt
+++ b/problems/remote_control/problem.txt
@@ -25,11 +25,11 @@
 
   Open a new terminal {bold}(CMD + N){/bold} window and set your name:
 
-  $ git config --global user.name "My Name"
+  $ git config --global user.name "Your Name"
   
   Then add your GitHub username:
   
-  $ git config --global user.username myusername
+  $ git config --global user.username githubusername
 
   Now set your email: