Minor fixes

man/src/depot_tools_tutorial.txt

 depot_tools_tutorial(7)
 =======================
 
 NAME
 ----
 depot_tools_tutorial - A tutorial introduction to the Chromium depot_tools git
 extensions.
 
 DESCRIPTION
 -----------
@@ skipping 138 matching lines @@
 [postsubs="quotes"]
 ----
 [white]**$** # get the code
 [white]**$** # In an empty directory:
 [white]**$ fetch {chromium,blink,...}**
 
 [white]**$** # Update third_party repos and run pre-compile hooks
 [white]**$ gclient sync**
 
 [white]**$** # Make a new change and upload it for review
-[white]**$ git new-branch branchname**
+[white]**$ git new-branch <branch_name>**
 [white]**$** # repeat: [edit, git add, git commit]
 [white]**$ git cl upload**
 
 [white]**$** # After change is reviewed, commit with the CQ
 [white]**$ git cl set_commit**
 [white]**$** # Note that the committed hash which lands will /not/ match the
 [white]**$** # commit hashes of your local branch.
 ----
 
 
@@ skipping 11 matching lines @@
 
 When the `fetch` tool completes you should have the following in your working
 directory:
 
 [subs="quotes"]
 ----
 [white]**.gclient**   # A configuration file for you source checkout
 [white]**src/**       # Top-level Chromium source checkout.
 ----
 
-If you are on linux, then you'll need to run:
+If you are on linux and fetching the code for the first time, then you'll need
+to run:
 
 [subs="specialcharacters,quotes"]
 ----
 [white]**$ cd src && ./build/install-build-deps.sh**
 ----
 
 And finally:
 
 [postsubs="quotes"]
 ----
 [white]**$ gclient sync**
 ----
 
 This will pull all dependencies of the Chromium src checkout. You will need
-to run this any time you update the main src checkout.
+to run this any time you update the main src checkout, including when you
+switch branches.
 
 
 CREATING / UPLOADING A CL
 -------------------------
 NOTE: The remainder of the tutorial assumes that your current working directory
 is the `src/` folder mentioned in <<_getting_the_code,Getting the code>>.
 
 Each CL corresponds exactly with a single branch in git. Any time you want to
-begin a new CL, just:
+begin a new CL:
 
 [subs="specialcharacters,quotes"]
 ----
 [white]**$ git new-branch <branch_name>**
 ----
 
 This will create and checkout a new branch named `branch_name` which will track
-the default upstream (which is `origin/master`). See linkgit:git-new-branch[1]
-for more features, such as the ability to track 'LKGR'.
+the default upstream branch (`origin/master`). See
+linkgit:git-new-branch[1] for more features.
 
 Commit as many changes as you like to this branch. When you want to upload it
 for review, run:
 
 [subs="quotes"]
 ----
 [white]**$ git cl upload**
 ----
 
-This will take the diff of your branch against its upstream (`origin/master`),
-and will post it to the link:https://codereview.chromium.org[Chromium code
-review site].
+This will take the diff of your branch against its upstream branch (in that

[iannucci, 2014/05/08 07:24:57]

I think this would read more naturally as "in this case"

+case origin/master), and will post it to the
+link:https://codereview.chromium.org[Chromium code review site].
 
 
 UPDATING THE CODE
 -----------------
 Inevitably, you'll want to pull in changes from the main Chromium repo. This is
 pretty easy with 'depot_tools':
 
 [subs="quotes"]
 ----
 [white]**$ git rebase-update**
@@ skipping 32 matching lines @@
 
 [NOTE]
 Running `git rebase-update` will update all your branches, but it will not
 automatically run `gclient sync` to update your dependencies.
 
 
 MANAGING MULTIPLE CLS
 ---------------------
 Sometimes you want to work on more than one CL at once (say, you have a CL
 posted for review and want to work on something else). For each CL that you
-want to work on, just use `git new-branch <branchname>`.
+want to work on, just use `git new-branch <branch_name>`.
 
 Once you start to have more than one CL at a time, it can be easy to lose your
 bearings. Fortunately, 'depot_tools' has two tools to help you out:
 
 [subs="specialcharacters,quotes,attributes"]
 ----
 [white]**$ git map**
 [white blue-background]##*##{zwsp}[blue-background red]** 7dcfe47       ** [green]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed
 * [red]**4b0c180**        [yellow]##2014-03-12## \~ modfile
 * [red]**59a7cca**        [yellow]##2014-03-12## \~ a deleted file
@@ skipping 22 matching lines @@
   [green]#master#
 ----
 
 linkgit:git-map[1]::
   This tool shows you the history of all of your branches in a pseudo-graphical
   format. In particular, it will show you which commits all of your branches
   are on, which commit you currently have checked out, and more. Check out the
   doc for the full details.
 
 linkgit:git-map-branches[1]::
-  This tool just shows you which branches you have in your repo, and thier
+  This tool just shows you which branches you have in your repo, and their
   upstream relationship to each other (as well as which branch you have checked
   out at the moment).
 
 Additionally, sometimes you need to switch between branches, but you've got work
 in progress. You could use linkgit:git-stash[1], but that can be tricky to
 manage because you need to remember which branches you stashed what changes on.
 Helpfully 'depot_tools' includes two tools which can greatly assist in case:
 
 linkgit:git-freeze[1] allows you to put the current branch in \'suspended
 animation' by committing your changes to a specially-named commit on the top of
@@ skipping 79 matching lines @@
   dependencies to pull in. This file also contains 'hooks'.
 
 LKGR::
   Last Known Good Revision. This is a linkgit:git-tag[1] which tracks the last
   version of `origin/master` which has passed the full set of testing on the
   link:http://build.chromium.org[main Chromium waterfall].
 
 include::_footer.txt[]
 
 // vim: ft=asciidoc: