Improvements and bugfixes to the depot_tools doc generation process.

docs/man7/depot_tools_tutorial.7

 '\" t
 .\"     Title: depot_tools_tutorial
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
 .\"      Date: 04/10/2014
 .\"    Manual: Chromium depot_tools Manual
 .\"    Source: depot_tools bec7be9
 .\"  Language: English
 .\"
 .TH "DEPOT_TOOLS_TUTORIAL" "7" "04/10/2014" "depot_tools bec7be9" "Chromium depot_tools Manual"
@@ skipping 358 matching lines @@
 \fB$ git map\fR
 \fB* 615ffa7    \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix terrible typo\&.
 * \fBbeec6f4    \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(fix_typo)\fR
 * \fB41290e0    \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7    \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a71    \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
 * \fB073b0c2    \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
 * \fB2250f53    \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
 * \fB33a7a74    \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
 \fB$ git status\fR
-On branch fix_typo
-Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
-  (use "git push" to publish your local commits)
-
+# On branch fix_typo
+# Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
+#   (use "git push" to publish your local commits)
+#
 nothing to commit, working directory clean
 \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
 \&.\&.\&. truncated output \&.\&.\&.
 .fi
 .if n \{\
 .RE
 .\}
 .sp
 While we wait for feedback, let\*(Aqs do something else\&.
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 \fB$ git new\-branch chap2\fR
 \fB$ git map\-branches\fR
 \fBorigin/master
   chap2 *
 \fR  fix_typo
 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
 
 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
 overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
 when the fan was last cleaned\&.
 EOF
 \fB$ git status\fR
-On branch chap2
-Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
-
-Changes not staged for commit:
-  (use "git add <file>\&.\&.\&." to update what will be committed)
-  (use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
-
-        modified:   build/whitespace_file\&.txt
-
+# On branch chap2
+# Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
+#
+# Changes not staged for commit:
+#   (use "git add <file>\&.\&.\&." to update what will be committed)
+#   (use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
+#
+#       modified:   build/whitespace_file\&.txt
+#
 no changes added to commit (use "git add" and/or "git commit \-a")
 .fi
 .if n \{\
 .RE
 .\}
 .sp
 Someone on the code review pointed out that our typo\-fix has a typo :( We\*(Aqre still working on \*(Aqchap2\*(Aq but we really want to land \*(Aqfix_typo\*(Aq, so let\*(Aqs switch over and fix it\&.
 .sp
 .if n \{\
 .RS 4
@@ skipping 205 matching lines @@
 .\}
 .sp
 We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&.
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 \fB$ git rebase\-update\fR
 Fetching origin
-From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
+From https://upstream
    beec6f4\&.\&.59cdb73  master     \-> origin/master
 Rebasing: chap2
 Rebasing: fix_typo
 Failed! Attempting to squash fix_typo \&.\&.\&. Success!
 Rebasing: chap3
 Deleted branch fix_typo (was 5d26fec)\&.
 Reparented chap3 to track origin/master (was tracking chap2)
 Deleted branch chap2 (was 5d26fec)\&.
 .fi
 .if n \{\
@@ skipping 29 matching lines @@
 .\}
 .sp
 Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing\&. Brace for a code conflict!
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 \fB$ git rebase\-update\fR
 Fetching origin
-From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
+From https://upstream
    5d26fec\&.\&.59cdb73  master     \-> origin/master
 Rebasing: chap2
 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
 \fB$ git diff\fR
 \fBdiff \-\-cc build/whitespace_file\&.txt\fR
 \fBindex 1293282,f903ea2\&.\&.0000000\fR
 \fB\-\-\- a/build/whitespace_file\&.txt\fR
 \fB+++ b/build/whitespace_file\&.txt\fR
 @@@ \-42,4 \-42,5 +42,9 @@@ when the fan was last cleaned
   There was an poignant pause\&.
@@ skipping 311 matching lines @@
 .IP " 6." 4
 main Chromium waterfall
 .RS 4
 \%http://build.chromium.org
 .RE
 .IP " 7." 4
 here
 .RS 4
 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
 .RE