Merge remote-tracking branch 'origin/master' into github-chapter

Conflicts:
	book/10-git-internals/sections/plumbing-porcelain.asc

Author: schacon

atlas.json

@@ -14,8 +14,10 @@
     "book/07-git-tools/1-git-tools.asc",
     "book/08-customizing-git/1-customizing-git.asc",
     "book/09-git-and-other-scms/1-git-and-other-scms.asc",
-    "book/10-git-in-other-environments/1-git-other-environments.asc",
-    "book/11-git-internals/1-git-internals.asc",
+    "book/10-git-internals/1-git-internals.asc",
+    "book/A-git-in-other-environments/1-git-other-environments.asc",
+    "book/B-embedding-git/1-embedding-git.asc",
+    "book/C-git-commands/1-git-commands.asc",
     "book/index.asc"
   ],
   "formats": {
@@ -65,4 +67,4 @@
   },
   "theme": "oreillymedia/atlas_tech1c_theme",
   "title": "Pro Git"
-}
+}

book/01-introduction/sections/help.asc

@@ -1,3 +1,4 @@
+[[_setting_up_server]]
 === Setting Up the Server
 
 Let's walk through setting up SSH access on the server side.