Skip to content

Commit

Permalink
Meta: default branch rename
Browse files Browse the repository at this point in the history
Also correct a broken link. Not even w3.org URLs are that cool.

Helps with whatwg/meta#174.
  • Loading branch information
annevk committed Jan 15, 2021
1 parent fba814b commit 24ec036
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build
on:
pull_request:
branches:
- master
- main
push:
branches:
- master
- main
jobs:
build:
name: Build
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: …
Expand Down
6 changes: 3 additions & 3 deletions review-draft.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 ""
Expand Down
6 changes: 3 additions & 3 deletions source
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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
Expand Down

0 comments on commit 24ec036

Please sign in to comment.