From a6bc594405c4b204a01ebf6d177089995aa6c1c3 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Wed, 13 Jan 2021 14:27:47 +0100
Subject: [PATCH] Meta: default branch rename

Also correct a broken link. Not even w3.org URLs are that cool.

Helps with https://github.com/whatwg/meta/issues/174.
---
 .github/workflows/build.yml | 6 +++---
 CONTRIBUTING.md             | 4 ++--
 FAQ.md                      | 6 +++---
 PULL_REQUEST_TEMPLATE.md    | 2 +-
 review-draft.sh             | 6 +++---
 source                      | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24e93857f42..e700bccf10f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,10 +2,10 @@ name: Build
 on:
   pull_request:
     branches:
-    - master
+    - main
   push:
     branches:
-    - master
+    - main
 jobs:
   build:
     name: Build
@@ -24,7 +24,7 @@ jobs:
                    --env "HTML_OUTPUT=/whatwg/output" \
                    whatwg/html-build
     - name: Deploy
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       env:
         SERVER: ${{ secrets.MARQUEE_SERVER }}
         SERVER_PUBLIC_KEY: ${{ secrets.MARQUEE_PUBLIC_KEY }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d2732301ed6..3784f6c0197 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # HTML Standard contributor guidelines
 
-These are the guidelines for contributing to the HTML Standard. First see the [WHATWG contributor guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md).
+These are the guidelines for contributing to the HTML Standard. First see the [WHATWG contributor guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md).
 
 The HTML Standard is quite complex and people notice minor and larger issues with it all the time. We'd love your help fixing these. Pull requests for typographical and grammar errors are also most welcome.
 
@@ -12,7 +12,7 @@ We'd be happy to mentor you through this process. If you're interested and need
 
 In short, change `source` and submit your patch, with a [good commit message](https://github.com/erlang/otp/wiki/Writing-good-commit-messages). Try to follow the source formatting rules below.
 
-Note that `source` is written in a dialect of HTML, which is eventually compiled into the deployed standard by a tool called [Wattsi](https://github.com/whatwg/wattsi). Documentation for this dialect can be found [in the Wattsi repository](https://github.com/whatwg/wattsi/blob/master/Syntax.md).
+Note that `source` is written in a dialect of HTML, which is eventually compiled into the deployed standard by a tool called [Wattsi](https://github.com/whatwg/wattsi). Documentation for this dialect can be found [in the Wattsi repository](https://github.com/whatwg/wattsi/blob/main/Syntax.md).
 
 Please add your name to the Acknowledgments section (search for `<!-- ACKS`) in your first pull request, even for trivial fixes. The names are sorted lexicographically.
 
diff --git a/FAQ.md b/FAQ.md
index 170d5d6fa66..e242a94e420 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -45,7 +45,7 @@ Validity (more often referred to as document conformance in the WHATWG) is a qua
 There are a number of ways to track changes to the standard:
 
 * The Twitter feed: [@htmlstandard](https://twitter.com/htmlstandard)
-* The [GitHub commits log](https://github.com/whatwg/html/commits/master)
+* The [GitHub commits log](https://github.com/whatwg/html/commits)
 * The standard is available in the [Git repository](https://github.com/whatwg/html/). You may use any Git client to check out the latest version and use your client's diff tools to compare revisions and see what has been changed.
 * At a broader level, Anne and Simon once wrote a document that gave a high-level overview of changes to HTML over the last decade or so: https://html-differences.whatwg.org/
 
@@ -377,8 +377,8 @@ The plan to get the specs to converge again, such as it is, is to just do a bett
 
 Here are some documents that detail the history of HTML:
 
-* [A feature history of the modern web platform](https://platform.html5.org/history/) (2003 onward) ([on GitHub](https://github.com/whatwg/platform.html5.org/blob/master/history/index.html))
-* [HTML's timeline on the ESW wiki](http://esw.w3.org/topic/HTML/history) (1997 to 2008)
+* [A feature history of the modern web platform](https://platform.html5.org/history/) (2003 onward) ([on GitHub](https://github.com/whatwg/platform.html5.org/blob/main/history/index.html))
+* [HTML's timeline on the W3C HTML WG wiki](https://www.w3.org/html/wg/wiki/History) (1997 to 2008)
 * [The history section in the HTML standard itself](https://html.spec.whatwg.org/multipage/introduction.html#history-2)
 
 ## Using HTML
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 240e62c4a5e..10dc234b3fa 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@ Thank you for contributing to the HTML Standard! Please describe the change you
    * …
 - [ ] [Tests](https://github.com/web-platform-tests/wpt) are written and can be reviewed and commented upon at:
    * …
-- [ ] [Implementation bugs](https://github.com/whatwg/meta/blob/master/MAINTAINERS.md#handling-pull-requests) are filed:
+- [ ] [Implementation bugs](https://github.com/whatwg/meta/blob/main/MAINTAINERS.md#handling-pull-requests) are filed:
    * Chrome: …
    * Firefox: …
    * Safari: …
diff --git a/review-draft.sh b/review-draft.sh
index a41c4947701..4ece569e132 100755
--- a/review-draft.sh
+++ b/review-draft.sh
@@ -3,9 +3,9 @@ set -o errexit
 set -o nounset
 
 # This is based on a script named review.sh over at
-# https://github.com/whatwg/whatwg.org/tree/master/resources.whatwg.org/build
+# https://github.com/whatwg/whatwg.org/tree/main/resources.whatwg.org/build
 #
-# Please see https://github.com/whatwg/meta/blob/master/MAINTAINERS.md for information on creating
+# Please see https://github.com/whatwg/meta/blob/main/MAINTAINERS.md for information on creating
 # and announcing Review Drafts.
 
 header() {
@@ -16,7 +16,7 @@ header() {
 
 header "Creating a git branch with a Review Draft:"
 
-git checkout master
+git checkout main
 git pull
 git checkout -b "review-draft-$(date +'%F')"
 echo ""
diff --git a/source b/source
index 7f75c5c54c2..e4c174919c6 100644
--- a/source
+++ b/source
@@ -73,7 +73,7 @@
      <a href="https://github.com/whatwg/html/wiki/Translations"><span data-x=""><strong>Translations</strong> <code data-x="">日本語 • 简体中文</code></span></a>
     </div>
     <div>
-     <a class="misc" href="https://github.com/whatwg/html/blob/master/FAQ.md"><span data-x=""><strong>FAQ</strong> <code data-x="">on GitHub</code></span></a>
+     <a class="misc" href="https://github.com/whatwg/html/blob/main/FAQ.md"><span data-x=""><strong>FAQ</strong> <code data-x="">on GitHub</code></span></a>
      <a class="comms" href="https://wiki.whatwg.org/wiki/IRC"><span data-x=""><strong>Join us on IRC</strong> <code data-x="">#whatwg on Freenode</code></span></a>
     </div>
     <div>
@@ -100,8 +100,8 @@
    <summary>This is a Commit Snapshot of the standard</summary>
 
    <p>This document contains the contents of the standard as of the <a class="sha-link"></a>, and
-   should only be used as a historical reference. This commit may not even have been merged into
-   master.</p>
+   should only be used as a historical reference. This commit may not even have been merged into the
+   main branch.</p>
 
    <p>Do not attempt to implement this version of the standard. Do not reference this version as
    authoritative in any way. Instead, see <a