From fac10e1c9a6e6cbf0031a9b4a04c3316803607c4 Mon Sep 17 00:00:00 2001 From: jbroman Date: Wed, 20 Jul 2016 12:43:08 -0700 Subject: [PATCH] [Docs] Remove mention of the 'blink' fetch recipe, and re-run asciidoc. That recipe no longer exists, as of https://chromium.googlesource.com/chromium/tools/depot_tools/+/e0cc9e494929d2fd821a3542096f533001e7d67d Referring to it in the tutorial is misleading. It seems that the docs scripts haven't been run in awhile, so there are some unrelated changes as well. Review-Url: https://codereview.chromium.org/2162223003 --- man/html/depot_tools_tutorial.html | 27 +++++++++++++-------------- man/man7/depot_tools_tutorial.7 | 27 +++++++++++++-------------- man/src/depot_tools_tutorial.txt | 3 +-- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 97bc8ffba..8df073172 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -902,7 +902,7 @@ autoupdate itself. You can use “Extract all…” from the context bundle to C:\workspace\depot_tools:

-With Administrator access: +With Administrator access:

@@ -911,7 +911,7 @@ With Administrator access:

Modify the PATH system variable to include C:\workspace\depot_tools.

-Without Administrator access: +Without Administrator access:

@@ -982,7 +982,7 @@ commands:

$ # get the code
 $ # In an empty directory:
-$ fetch {chromium,blink,...}
+$ fetch {chromium,...}
 
 $ # Update third_party repos and run pre-compile hooks
 $ gclient sync
@@ -1006,7 +1006,6 @@ commands:
$ fetch chromium  # Basic checkout for desktop Chromium
-$ fetch blink     # Chromium code with Blink checked out to tip-of-tree
 $ fetch android   # Chromium checkout for Android platform
 $ fetch ios       # Chromium checkout for iOS platform
@@ -1245,7 +1244,7 @@ It was a Domo-Kuun. [fix_typo 615ffa7] Fix terrible typo. 1 file changed, 1 insertion(+), 1 deletion(-) $ git map -* 615ffa7 (fix_typo) 2014-04-10 ~ Fix terrible typo. +* 615ffa7 (HEAD -> fix_typo) 2014-04-10 ~ Fix terrible typo. * beec6f4 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(fix_typo) * 41290e0 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. @@ -1314,7 +1313,7 @@ It was a Domo-Banana Since we got lgtm, let the CQ land it.

$ git cl set_commit
 $ git map
 * 0e2e52e	 (chap2) 2014-04-10 ~ FREEZE.unindexed
-| * 2c0ad9c	 (fix_typo) 2014-04-10 ~ Fix typo for good!
+| * 2c0ad9c	 (HEAD -> fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
 |/
 * beec6f4	 (origin/master, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2, fix_typo)
@@ -1338,7 +1337,7 @@ state without impacting any branches by performing another checkout.
 If you want to create a new branch to retain commits you create, you may
 do so (now or later) by using -b with the checkout command again. Example:
 
-  git checkout -b new_branch_name
+  git checkout -b <new-branch-name>
 
 HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
 $ git nav-downstream
@@ -1391,7 +1390,7 @@ EOF
 [chap2 ceef712] Finish chapter 2
  1 file changed, 6 insertions(+)
 $ git map
-* ceef712	 (chap2) 2014-04-10 ~ Finish chapter 2
+* ceef712	 (HEAD -> chap2) 2014-04-10 ~ Finish chapter 2
 | * 2c0ad9c	 (fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
 |/
@@ -1416,7 +1415,7 @@ EOF
 [chap3 7d4238a] beginning of chapter 3
  1 file changed, 4 insertions(+)
 $ git map
-* 7d4238a	 (chap3) 2014-04-10 ~ beginning of chapter 3
+* 7d4238a	 (HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
 * ceef712	 (chap2) 2014-04-10 ~ Finish chapter 2    <(chap3)
 | * 2c0ad9c	 (fix_typo) 2014-04-10 ~ Fix typo for good!
 | * 615ffa7	 2014-04-10 ~ Fix terrible typo.
@@ -1436,13 +1435,13 @@ 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 fix_typo (was 5d26fec).
 Deleted branch chap2 (was 5d26fec).

Well look at that. The CQ landed our typo and chapter2 branches already and git rebase-update cleaned them up for us.

$ gclient sync
 ... truncated output ...
 $ git map
-* 93fe917	 (chap3) 2014-04-10 ~ beginning of chapter 3
+* 93fe917	 (HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
 * 5d26fec	 (origin/master, origin/HEAD) 2014-04-10 ~ Finish chapter 2    <(chap3)
 * df7fefb	 2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * 4b39cda	 2014-04-10 ~ Fix terrible typo.
@@ -1471,7 +1470,7 @@ Rebasing: chap2
   There was an poignant pause.
 
   CHAPTER 3:
-++<<<<<<< HEAD
+++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c
  +Hilariousness! This chapter is awesome!
 ++=======
 + Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
@@ -1500,7 +1499,7 @@ chap3 up-to-date
 $ gclient sync
 ... truncated output ...
 $ git map
-* 1cb4f5b	 (chap3) 2014-04-10 ~ beginning of chapter 3
+* 1cb4f5b	 (HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
 * 59cdb73	 (origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap3)
 * 34676a3	 2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
 * 7d4784e	 2014-04-10 ~ Add best chapter2 ever!
@@ -1581,7 +1580,7 @@ from 
 

 
 
diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7
index 8aa6560ac..0c5761ae8 100644
--- a/man/man7/depot_tools_tutorial.7
+++ b/man/man7/depot_tools_tutorial.7
@@ -2,12 +2,12 @@
 .\"     Title: depot_tools_tutorial
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 01/13/2015
+.\"      Date: 07/20/2016
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 379a889
+.\"    Source: depot_tools 5ef2ca1
 .\"  Language: English
 .\"
-.TH "DEPOT_TOOLS_TUTORIAL" "7" "01/13/2015" "depot_tools 379a889" "Chromium depot_tools Manual"
+.TH "DEPOT_TOOLS_TUTORIAL" "7" "07/20/2016" "depot_tools 5ef2ca1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -261,7 +261,7 @@ If you have never used git before, you\(cqll need to set some global git configu
 .nf
 \fB$\fR # get the code
 \fB$\fR # In an empty directory:
-\fB$ fetch {chromium,blink,\&.\&.\&.}\fR
+\fB$ fetch {chromium,\&.\&.\&.}\fR
 
 \fB$\fR # Update third_party repos and run pre\-compile hooks
 \fB$ gclient sync\fR
@@ -289,7 +289,6 @@ Pick an empty directory and run one of the following:
 .\}
 .nf
 \fB$ fetch chromium\fR  # Basic checkout for desktop Chromium
-\fB$ fetch blink\fR     # Chromium code with Blink checked out to tip\-of\-tree
 \fB$ fetch android\fR   # Chromium checkout for Android platform
 \fB$ fetch ios\fR       # Chromium checkout for iOS platform
 .fi
@@ -574,7 +573,7 @@ It was a Domo\-Kuun\&.
 [fix_typo 615ffa7] Fix terrible typo\&.
  1 file changed, 1 insertion(+), 1 deletion(\-)
 \fB$ git map\fR
-\fB* 615ffa7	\fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix terrible typo\&.
+* \fB615ffa7	\fR (HEAD \-> fix_typo) 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\&.
@@ -676,7 +675,7 @@ Since we got lgtm, let the CQ land it\&.
 \fB$ git cl set_commit\fR
 \fB$ git map\fR
 * \fB0e2e52e	\fR (\fBchap2\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
-| \fB* 2c0ad9c	\fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
+| * \fB2c0ad9c	\fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix typo for good!
 | * \fB615ffa7	\fR 2014\-04\-10 ~ Fix terrible typo\&.
 |/
 * \fBbeec6f4	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(chap2, fix_typo)\fR
@@ -711,7 +710,7 @@ state without impacting any branches by performing another checkout\&.
 If you want to create a new branch to retain commits you create, you may
 do so (now or later) by using \-b with the checkout command again\&. Example:
 
-  git checkout \-b new_branch_name
+  git checkout \-b 
 
 HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
 \fB$ git nav\-downstream\fR
@@ -775,7 +774,7 @@ EOF
 [chap2 ceef712] Finish chapter 2
  1 file changed, 6 insertions(+)
 \fB$ git map\fR
-\fB* ceef712	\fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2
+* \fBceef712	\fR (HEAD \-> chap2) 2014\-04\-10 ~ Finish chapter 2
 | * \fB2c0ad9c	\fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
 | * \fB615ffa7	\fR 2014\-04\-10 ~ Fix terrible typo\&.
 |/
@@ -822,7 +821,7 @@ EOF
 [chap3 7d4238a] beginning of chapter 3
  1 file changed, 4 insertions(+)
 \fB$ git map\fR
-\fB* 7d4238a	\fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3
+* \fB7d4238a	\fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
 * \fBceef712	\fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2\fB    <(chap3)\fR
 | * \fB2c0ad9c	\fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
 | * \fB615ffa7	\fR 2014\-04\-10 ~ Fix terrible typo\&.
@@ -853,8 +852,8 @@ 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 fix_typo (was 5d26fec)\&.
 Deleted branch chap2 (was 5d26fec)\&.
 .fi
 .if n \{\
@@ -870,7 +869,7 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi
 \fB$ gclient sync\fR
 \&.\&.\&. truncated output \&.\&.\&.
 \fB$ git map\fR
-\fB* 93fe917	\fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3
+* \fB93fe917	\fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
 * \fB5d26fec	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2\fB    <(chap3)\fR
 * \fBdf7fefb	\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
 * \fB4b39cda	\fR 2014\-04\-10 ~ Fix terrible typo\&.
@@ -910,7 +909,7 @@ Rebasing: chap2
   There was an poignant pause\&.
 
   CHAPTER 3:
-++<<<<<<< HEAD
+++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c
  +Hilariousness! This chapter is awesome!
 ++=======
 + Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he
@@ -961,7 +960,7 @@ chap3 up\-to\-date
 \fB$ gclient sync\fR
 \&.\&.\&. truncated output \&.\&.\&.
 \fB$ git map\fR
-\fB* 1cb4f5b	\fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3
+* \fB1cb4f5b	\fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
 * \fB59cdb73	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Refactor data interchange format\&.\fB    <(chap3)\fR
 * \fB34676a3	\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
 * \fB7d4784e	\fR 2014\-04\-10 ~ Add best chapter2 ever!
diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt
index e4c1125d4..7c08f0f6a 100644
--- a/man/src/depot_tools_tutorial.txt
+++ b/man/src/depot_tools_tutorial.txt
@@ -150,7 +150,7 @@ TL;DR
 ----
 [white]**$** # get the code
 [white]**$** # In an empty directory:
-[white]**$ fetch {chromium,blink,...}**
+[white]**$ fetch {chromium,...}**
 
 [white]**$** # Update third_party repos and run pre-compile hooks
 [white]**$ gclient sync**
@@ -174,7 +174,6 @@ Pick an empty directory and run one of the following:
 [subs="quotes"]
 ----
 [white]**$ fetch chromium**  # Basic checkout for desktop Chromium
-[white]**$ fetch blink**     # Chromium code with Blink checked out to tip-of-tree
 [white]**$ fetch android**   # Chromium checkout for Android platform
 [white]**$ fetch ios**       # Chromium checkout for iOS platform
 ----