Commit 441d379e authored by dnj@chromium.org's avatar dnj@chromium.org

Fixed ``smart'' quotes in code block.

This document generation round also includes additional generated content that
was not checked in from previous commits.

BUG=chromium:440844
TEST=local
  - Loaded HTML page in local browser, confirmed quotes were correct.

Review URL: https://codereview.chromium.org/788293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293620 0039d316-1c4b-4281-b951-d872f2087c98
parent f650d9e7
......@@ -902,7 +902,7 @@ autoupdate itself. You can use “Extract all…” from the context
bundle to <code>C:\workspace\depot_tools</code>:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
With Administrator access:
With Administrator access:
</dt>
<dd>
<p>
......@@ -911,7 +911,7 @@ With Administrator access:
<div class="paragraph"><p>Modify the PATH system variable to include <code>C:\workspace\depot_tools</code>.</p></div>
</dd>
<dt class="hdlist1">
Without Administrator access:
Without Administrator access:
</dt>
<dd>
<p>
......@@ -965,8 +965,8 @@ configurations; substitute your name and email address in the following
commands:</p></div>
<div class="listingblock">
<div class="content">
<pre><code><strong><span class="white">$ git config --global user.name &#8220;John Doe&#8221;</span></strong>
<strong><span class="white">$ git config --global user.email &#8220;jdoe@email.com&#8221;</span></strong>
<pre><code><strong><span class="white">$ git config --global user.name "John Doe"</span></strong>
<strong><span class="white">$ git config --global user.email "jdoe@email.com"</span></strong>
<strong><span class="white">$ git config --global core.autocrlf false</span></strong>
<strong><span class="white">$ git config --global core.filemode false</span></strong>
<strong><span class="white">$</span></strong> # and for fun!
......@@ -1238,9 +1238,9 @@ updating, and committing multiple CLs.</p></div>
</code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch fix_typo</span>
<span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt</span>
1503
1501
It was a Domo-Banana.
It was a Domo-Kuun.
1501
<span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible typo.'</span>
[fix_typo 615ffa7] Fix terrible typo.
1 file changed, 1 insertion(+), 1 deletion(-)
......@@ -1290,9 +1290,9 @@ Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
<span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span>
1501
1500
It was a Domo-Kuun.
It was a Domo-Kun.
1500
<span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</span>
<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
<span style="font-weight: bold">index 3eba355..57cdcee 100644</span>
......@@ -1342,14 +1342,14 @@ do so (now or later) by using -b with the checkout command again. Example:
HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
<span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
Please select a downstream branch
0. chap2
1. fix_typo
Selection (0-1)[0]: 0
Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
Switched to branch 'chap2'
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Please select a downstream branch
0. chap2
1. fix_typo
Selection (0-1)[0]: 0
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> chap2 *
......@@ -1581,7 +1581,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2014-05-09 17:43:43 PDT
Last updated 2015-01-13 15:27:56 PST
</div>
</div>
</body>
......
'\" t
.\" Title: depot_tools_tutorial
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 05/09/2014
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 01/13/2015
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 54dac93
.\" Source: depot_tools 379a889
.\" Language: English
.\"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "05/09/2014" "depot_tools 54dac93" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "01/13/2015" "depot_tools 379a889" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -41,7 +41,6 @@ The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to
.sp -1
.IP \(bu 2.3
.\}
Setting up
.RE
.sp
......@@ -53,7 +52,6 @@ Setting up
.sp -1
.IP \(bu 2.3
.\}
Getting the code
.RE
.sp
......@@ -65,7 +63,6 @@ Getting the code
.sp -1
.IP \(bu 2.3
.\}
TL;DR
.RE
.sp
......@@ -77,7 +74,6 @@ TL;DR
.sp -1
.IP \(bu 2.3
.\}
Creating / Uploading a CL
.RE
.sp
......@@ -89,7 +85,6 @@ Creating / Uploading a CL
.sp -1
.IP \(bu 2.3
.\}
Updating the code
.RE
.sp
......@@ -101,7 +96,6 @@ Updating the code
.sp -1
.IP \(bu 2.3
.\}
Managing multiple CLs
.RE
.sp
......@@ -113,7 +107,6 @@ Managing multiple CLs
.sp -1
.IP \(bu 2.3
.\}
Managing dependent CLs
.RE
.sp
......@@ -125,7 +118,6 @@ Managing dependent CLs
.sp -1
.IP \(bu 2.3
.\}
Example Walkthrough
.RE
.sp
......@@ -158,7 +150,6 @@ This tutorial assumes basic familiarity with git terminology and concepts\&. If
.sp -1
.IP \(bu 2.3
.\}
\m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1]\d\s+2
\- A lighthearted overview of git\&. If you\(cqre sorta\-familiar with git, but not
\fIcomfortable\fR
......@@ -173,7 +164,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2.3
.\}
\m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2]\d\s+2
\- An in\-depth git tutorial\&.
.RE
......@@ -186,7 +176,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2.3
.\}
\m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3]\d\s+2
\- An excellent interactive/graphical demo on how git handles commits, branches, and shows the operations git performs on them\&.
.RE
......@@ -199,7 +188,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2.3
.\}
\m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4]\d\s+2
\- \(lqThe\(rq book for learning git from basics to advanced concepts\&. A bit dry, but very through\&.
.RE
......@@ -254,8 +242,8 @@ If you have never used git before, you\(cqll need to set some global git configu
.RS 4
.\}
.nf
\fB$ git config \-\-global user\&.name \(lqJohn Doe\(rq\fR
\fB$ git config \-\-global user\&.email \(lqjdoe@email\&.com\(rq\fR
\fB$ git config \-\-global user\&.name "John Doe"\fR
\fB$ git config \-\-global user\&.email "jdoe@email\&.com"\fR
\fB$ git config \-\-global core\&.autocrlf false\fR
\fB$ git config \-\-global core\&.filemode false\fR
\fB$\fR # and for fun!
......@@ -485,6 +473,7 @@ origin/master
.RE
.\}
.sp
.PP
\fBgit-map\fR(1)
.RS 4
......@@ -578,9 +567,9 @@ Let\*(Aqs fix something!
\fB$ git new\-branch fix_typo\fR
\fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
1503
1501
It was a Domo\-Banana\&.
It was a Domo\-Kuun\&.
1501
\fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR
[fix_typo 615ffa7] Fix terrible typo\&.
1 file changed, 1 insertion(+), 1 deletion(\-)
......@@ -652,9 +641,9 @@ Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits)
\fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
1501
1500
It was a Domo\-Kuun\&.
It was a Domo\-Kun\&.
1500
\fB$ git upstream\-diff \-\-wordwise\fR
\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR
\fBindex 3eba355\&.\&.57cdcee 100644\fR
......@@ -726,14 +715,14 @@ do so (now or later) by using \-b with the checkout command again\&. Example:
HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
\fB$ git nav\-downstream\fR
Please select a downstream branch
0\&. chap2
1\&. fix_typo
Selection (0\-1)[0]: 0
Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
Switched to branch \*(Aqchap2\*(Aq
Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits)
Please select a downstream branch
0\&. chap2
1\&. fix_typo
Selection (0\-1)[0]: 0
\fB$ git map\-branches\fR
origin/master
\fB chap2 *
......
......@@ -136,8 +136,8 @@ commands:
[subs="quotes,attributes"]
----
[white]**$ git config --global user.name ``John Doe''**
[white]**$ git config --global user.email ``jdoe@email.com''**
[white]**$ git config --global user.name "John Doe"**
[white]**$ git config --global user.email "jdoe@email.com"**
[white]**$ git config --global core.autocrlf false**
[white]**$ git config --global core.filemode false**
[white]**$** # and for fun!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment