Doc: Add component info for filing Chromium bugs

infra/ANGLEWrangling.md

@@ -24,21 +24,22 @@ extension for inspecting bot builds. It'll save you a lot of time.
 ## Task 1: Monitor ANGLE CI and Try Testers
 
 Your first job is to keep the
-[ANGLE Try Waterfall](https://ci.chromium.org/p/chromium/g/tryserver.chromium.angle/builders) healthy.  Some
-failures are expected on this waterfall. Developers might be testing expectedly buggy code. But
-persistent flakiness and failures should be reported and reverted.
+[ANGLE Try Waterfall](https://ci.chromium.org/p/chromium/g/tryserver.chromium.angle/builders)
+healthy.  These are also known as the CQ (commit queue) bots.  Some
+failures are expected on this waterfall. Developers might be testing expectedly buggy code. However,
+persistent flakiness and failures should be reported and appropriate CLs reverted.
 
-For ANGLE issues that require CLs, please file a bug in Monorail and mark the bug as
-`Hotlist-Wrangler`.
+For ANGLE issues that require CLs, please [file an ANGLE bug](http://anglebug.com/new) and set
+the Label `Hotlist-Wrangler` on the bug.
 [Click here to see those bugs.][WranglerBugs]
 
 [WranglerBugs]:https://bugs.chromium.org/p/angleproject/issues/list?q=Hotlist%3DWrangler&can=2
 
-When encoutering an unexpected failure in your CLs please
+When encountering an unexpected failure in a CL that looks ANGLE related, please
 [file an ANGLE bug](http://anglebug.com/new) and cc the current ANGLE wrangler. If the failure is
-unrelated to ANGLE [file a Chromium bug](http://crbug.com/new) and mark the bug as
-`Hotlist-PixelWrangler`. Refer to
-[build.chromium.org](https://ci.chromium.org/p/chromium/g/main/console) to find the current ANGLE
+unrelated to ANGLE [file a Chromium bug](http://crbug.com/new) and set the Label
+`Hotlist-PixelWrangler` on the bug (see [Filing Chromium Bug Reports](#filing-chromium-bug-reports) below).
+Refer to [build.chromium.org](https://ci.chromium.org/p/chromium/g/main/console) to find the current ANGLE
 wrangler and GPU Pixel Wrangler.
 
 **NOTE: When all builds seem to be purple or otherwise broken:**
@@ -46,30 +47,40 @@ wrangler and GPU Pixel Wrangler.
 This could be a major infrastructure outage. File a high-priority bug using
 [g.co/bugatrooper](http://g.co/bugatrooper).
 
-## Task 2: Respond to Bugs
+## Task 2: Monitor Chromium FYI Testers and Respond to Bugs
 
-ANGLE bugs sometimes make it past the commit queue testing and into the master branch. This can be
+ANGLE bugs sometimes make it past the commit queue testing and into the main branch. This can be
 because of flaky tests or because the failures are specific to system configurations for which we
 lack full pre-commit testing support.
 
-The [Chromium GPU FYI Waterfall](https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console)
+The [Chromium GPU FYI Waterfall][ChromiumFYI]
 waterfall includes a number of these one-off specialized configurations.  Monitor this console for
-persistent breakage that could be related to ANGLE.  Also follow the `Internals>GPU>ANGLE` component
-on the Chromium issue tracker to be alerted to reports of breakage on the GPU.FYI waterfall.
+persistent breakage that could be related to ANGLE.  Also follow [Chromium bugs in the `Internals>GPU>ANGLE` component][ChromiumANGLEBugs]
+to be alerted to reports of breakage on the GPU.FYI waterfall.
+
+[ChromiumFYI]:https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console
+[ChromiumANGLEBugs]:https://bugs.chromium.org/p/chromium/issues/list?q=component%3AInternals%3EGPU%3EANGLE&can=2
+
 Googlers can use [sheriff-o-matic](https://sheriff-o-matic.appspot.com/chromium.gpu.fyi) to monitor
 the health of the GPU.FYI waterfall.
 
-Note that the GPU Pixel Wrangler is responsible for the *Chromium* bugs.  Please file issues with
-the tag `Hotlist-PixelWrangler` for bugs that aren't caused by ANGLE regressions.
+### Filing Chromium Bug Reports
+
+The GPU Pixel Wrangler is responsible for the *Chromium* bugs.  Please file issues with
+the Label `Hotlist-PixelWrangler` for bugs that aren't caused by ANGLE regressions.
 
-*IMPORTANT*: Info to include in bug reports:
+*IMPORTANT* info to include in Chromium bug reports:
 
- * Links to all first failing builds (eg first windows failure, first mac failure, etc).
+ * Links to all first failing builds (e.g. first windows failure, first mac failure, etc).
  * Related regression ranges. See below on how to determine the ANGLE regression range.
  * Relevant error messages.
- * Set components: `Internals>GPU` and/or `Internals>GPU>ANGLE`.
- * cc relevant sheriffs or blame suspects.
- * Set the `Hotlist-PixelWrangler` label.
+ * Set the **Components** to one or more value, such as (start typing "Internals" and you'll see choices):
+   * `Internals>GPU` for general GPU bugs
+   * `Internals>GPU>Testing` for failures that look infrastructure-related
+   * `Internals>GPU>ANGLE` for ANGLE-related Chromium bugs
+   * `Internals>Skia` for Skia-specific bugs
+ * Cc relevant sheriffs or blame suspects, as well as yourself or the current ANGLE Wrangler.
+ * Set the `Hotlist-PixelWrangler` Label.
 
 ### How to determine the ANGLE regression range on the GPU.FYI bots:
 
@@ -101,14 +112,14 @@ cause is a problem with ANGLE or with the upstream repo, and file an issue with
 step.
 
 The autoroller configurations live in the [skia/buildbot repository](https://skia.googlesource.com/buildbot/)
-in the [autoroll/config](https://skia.googlesource.com/buildbot/+/master/autoroll/config) folder.
+in the [autoroll/config](https://skia.googlesource.com/buildbot/+/main/autoroll/config) folder.
 
 **NOTE: vulkan-deps consists of several related Vulkan dependencies:**
 
 vulkan-deps houses Vulkan-Tools, Vulkan-Loader, Vulkan-ValidationLayers, Vulkan-Headers and other
 related repos. If the roll fails, you will have to determine the correct upstream repo and file
 an issue upstream. For more info on vulkan-deps see the
-[README](https://chromium.googlesource.com/vulkan-deps/+/refs/heads/master/README.md).
+[README](https://chromium.googlesource.com/vulkan-deps/+/refs/heads/main/README.md).
 
 ## Task 4: ANGLE Standalone Testing