From 178462b800fe6a471bee699c4df9f935e8bc5723 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 24 Nov 2017 10:35:57 +0100
Subject: [PATCH] chrome -> chromium and updates to crashpad doc

---
 ...rading-chrome.md => upgrading-chromium.md} |  2 +-
 docs/development/upgrading-crashpad.md        | 56 ++++++++++---------
 docs/development/upgrading-node.md            |  2 +-
 3 files changed, 33 insertions(+), 27 deletions(-)
 rename docs/development/{upgrading-chrome.md => upgrading-chromium.md} (99%)

diff --git a/docs/development/upgrading-chrome.md b/docs/development/upgrading-chromium.md
similarity index 99%
rename from docs/development/upgrading-chrome.md
rename to docs/development/upgrading-chromium.md
index 07e137b97f3c..6257a030d681 100644
--- a/docs/development/upgrading-chrome.md
+++ b/docs/development/upgrading-chromium.md
@@ -1,4 +1,4 @@
-# Upgrading Chromium Workflow
+# Upgrading Chromium
 
 This document is meant to serve as an overview of what steps are needed
 on each Chromium upgrade in Electron.
diff --git a/docs/development/upgrading-crashpad.md b/docs/development/upgrading-crashpad.md
index c0fc92917154..0eb31a8f5966 100644
--- a/docs/development/upgrading-crashpad.md
+++ b/docs/development/upgrading-crashpad.md
@@ -1,36 +1,42 @@
-- Get the version of crashpad that we're going to use.
-  - `libcc/src/third_party/crashpad/README.chromium` will have a line `Revision:` with a checksum.
-  - clone [Electron's Crashpad fork](https://github.com/electron/crashpad) and create a new branch
-  - `git clone https://chromium.googlesource.com/crashpad/crashpad`
-  - `git checkout 01110c0a3b`
-  - `git remote add electron https://github.com/electron/crashpad`
-  - `git checkout -b electron-crashpad-vA.B.C.D`
-     - `A.B.C.D` is the Chromium version found in `libcc/VERSION`
+# Upgrading Crashpad
+
+1. Get the version of crashpad that we're going to use.
+  - `libcc/src/third_party/crashpad/README.chromium` will have a line `Revision:` with a checksum
+    - We need to check out the correponding branch.
+  - Clone Google's crashpad (https://chromium.googlesource.com/crashpad/crashpad)
+    - `git clone https://chromium.googlesource.com/crashpad/crashpad`
+  - Check out the branch with the revision checksum:
+      - `git checkout <revision checksum>`
+  - Add electron's crashpad fork as a remote
+    - `git remote add electron https://github.com/electron/crashpad`
+  - Check out a new branch for the update
+    - `git checkout -b electron-crashpad-vA.B.C.D`
+    - `A.B.C.D` is the Chromium version found in `libcc/VERSION`
        and will be something like `62.0.3202.94`
 
-- Make a checklist of the Electron patches we need to apply
-  e.g. `git log --oneline`
-  or view http://github.com/electron/crashpad/commits/previous-branch-name
-- Foreach patch:
-  - (in new branch) `git cherry-pick checksum`
-  - resolve any conflicts
-  - make sure it builds
-  - add && commit
-- Push your work:
-  `git push electron electorn-crashpad-v62.0.3202.94`
+2. Make a checklist of the Electron patches that need to be applied
+  with `git log --oneline`
+    - Or view http://github.com/electron/crashpad/commits/previous-branch-name
 
-- Update Electron to build the new crashpad:
+3. For each patch:
+  - In `electron-crashpad-vA.B.C.D`, cherry-pick the patch's checksum    
+    - `git cherry-pick <checksum>`
+  - Resolve any conflicts
+  - Make sure it builds then add, commit, and push work to electron's crashpad fork
+    - `git push electron electron-crashpad-vA.B.C.D`
+
+4. Update Electron to build the new crashpad:
   - `cd vendor/crashpad`
   - `git fetch`
   - `git checkout electron-crashpad-v62.0.3202.94`
-- Regenerate Ninja files
-  - from Electron root's root, run `script/update.py`
+5. Regenerate Ninja files against both targets
+  - From Electron root's root, run `script/update.py`
   - `script/build.py -c D --target=crashpad_client`
   - `script/build.py -c D --target=crashpad_handler`
-  - If both of these work, it's probably good.
-- Push changes to submodule reference
-  - (from electron root) `git add vendor/crashpad`
+  - Both should build with no errors
+6. Push changes to submodule reference
+  - (From electron root) `git add vendor/crashpad`
   - `git push origin upgrade-to-chromium-62`
-  
+
 
 
diff --git a/docs/development/upgrading-node.md b/docs/development/upgrading-node.md
index 0a7ca8ad01ce..4e81e1fa96d1 100644
--- a/docs/development/upgrading-node.md
+++ b/docs/development/upgrading-node.md
@@ -119,7 +119,7 @@ We need to generate a patch file from each patch applied to V8.
    electron$ script/build.py -c -D
    ```
 
-   
+
 
 ## Notes