From e4aed3d06a8a1ef6e7af142f02be95ce2a3065cb Mon Sep 17 00:00:00 2001 From: Alex Touchet Date: Sat, 16 Dec 2023 01:32:20 -0800 Subject: [PATCH] Update branch name to main (#30877) --- CONTRIBUTING.md | 8 ++++---- README.md | 2 +- components/script/docs/JS-Servos-only-GC.md | 2 +- components/style/README.md | 2 +- docs/HACKING_QUICKSTART.md | 2 +- docs/components/style.md | 2 +- etc/doc.servo.org/README.md | 6 +++--- etc/layout_viewer/viewer.html | 4 ++-- etc/layout_viewer/viewer_2020.html | 4 ++-- etc/profilicate.py | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b42ecdf2202..9d6450d5e27 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,9 +27,9 @@ on how to start working on Servo. ## Pull request checklist -- Branch from the master branch and, if needed, rebase to the current master - branch before submitting your pull request. If it doesn't merge cleanly with - master you may be asked to rebase your changes. +- Branch from the main branch and, if needed, rebase to the current main branch + before submitting your pull request. If it doesn't merge cleanly with main + you may be asked to rebase your changes. - Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests). @@ -74,5 +74,5 @@ Servo contributors frequent the [Servo Zulip chat](https://servo.zulipchat.com/) ## Technical Steering Committee Technical oversight of the Servo Project is provided by the -[Technical Steering Committee](https://github.com/servo/project/blob/master/governance/tsc/README.md). +[Technical Steering Committee](https://github.com/servo/project/blob/main/governance/tsc/README.md). diff --git a/README.md b/README.md index 025b713c64f..b03a8806758 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ The examples below will use Unix, but the same applies to Windows. Servo's build system uses rustup.rs to automatically download a Rust compiler. This is a specific version of Rust Nightly determined by the -[`rust-toolchain.toml`](https://github.com/servo/servo/blob/master/rust-toolchain.toml) file. +[`rust-toolchain.toml`](https://github.com/servo/servo/blob/main/rust-toolchain.toml) file. ### Normal build diff --git a/components/script/docs/JS-Servos-only-GC.md b/components/script/docs/JS-Servos-only-GC.md index 95eb694bce6..9e2a8ea6d09 100644 --- a/components/script/docs/JS-Servos-only-GC.md +++ b/components/script/docs/JS-Servos-only-GC.md @@ -134,7 +134,7 @@ or a custom attribute `#[dom_struct]` which implies it. Let's look at [Servo's implementation][document-rs] of the DOM's [`Document`][document-mdn] interface: -[document-rs]: https://github.com/servo/servo/blob/master/components/script/dom/document.rs +[document-rs]: https://github.com/servo/servo/blob/main/components/script/dom/document.rs [document-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/document ```rust diff --git a/components/style/README.md b/components/style/README.md index 96457e1b30f..bdbe36e44c4 100644 --- a/components/style/README.md +++ b/components/style/README.md @@ -3,4 +3,4 @@ servo-style Style system for Servo, using [rust-cssparser](https://github.com/servo/rust-cssparser) for parsing. - * [Documentation](https://github.com/servo/servo/blob/master/docs/components/style.md). + * [Documentation](https://github.com/servo/servo/blob/main/docs/components/style.md). diff --git a/docs/HACKING_QUICKSTART.md b/docs/HACKING_QUICKSTART.md index 2ca48d0cccb..1c811d45364 100644 --- a/docs/HACKING_QUICKSTART.md +++ b/docs/HACKING_QUICKSTART.md @@ -357,7 +357,7 @@ In some cases, extensive tests for the feature you're working on already exist u - Make a release build - run `./mach test-wpt --release --log-raw=/path/to/some/logfile` -- run [`update-wpt` on it](https://github.com/servo/servo/blob/master/tests/wpt/README.md#updating-test-expectations) +- run [`update-wpt` on it](https://github.com/servo/servo/blob/main/tests/wpt/README.md#updating-test-expectations) This may create a new commit with changes to expectation ini files. If there are lots of changes, it's likely that your feature had tests in wpt already. diff --git a/docs/components/style.md b/docs/components/style.md index 161f490f935..a54482ad34c 100644 --- a/docs/components/style.md +++ b/docs/components/style.md @@ -148,6 +148,6 @@ that you didn't find it here so it can be added :) [selectors-rule]: https://doc.servo.org/style/stylist/struct.Rule.html [per-pseudo-selectormap]: https://doc.servo.org/style/selector_parser/struct.PerPseudoElementMap.html [per-origin-selectormap]: https://doc.servo.org/style/stylist/struct.PerOriginSelectorMap.html -[docs-pipeline]: https://github.com/servo/servo/blob/master/docs/glossary.md#pipeline +[docs-pipeline]: https://github.com/servo/servo/blob/main/docs/glossary.md#pipeline [properties-module]: https://doc.servo.org/style/properties/index.html [properties-cascade-fn]: https://doc.servo.org/style/properties/fn.cascade.html diff --git a/etc/doc.servo.org/README.md b/etc/doc.servo.org/README.md index 53b4f03cd6d..4cba1e1d88d 100644 --- a/etc/doc.servo.org/README.md +++ b/etc/doc.servo.org/README.md @@ -1,6 +1,6 @@ -[doc.servo.org](https://doc.servo.org) +[doc.servo.org](https://doc.servo.org/) ===================================== The Servo documentation. -This is generated automatically at every push to the `master` branch -of [Servo’s repository](https://github.com/servo/servo/). +This is generated automatically at every push to the `main` branch of +[Servo’s repository](https://github.com/servo/servo). diff --git a/etc/layout_viewer/viewer.html b/etc/layout_viewer/viewer.html index 2deded56f8e..e1f5d9e1b5d 100644 --- a/etc/layout_viewer/viewer.html +++ b/etc/layout_viewer/viewer.html @@ -1,4 +1,4 @@ - + @@ -28,7 +28,7 @@

Servo Layout Viewer

-

Check the README for instructions.

+

Check the README for instructions.

diff --git a/etc/layout_viewer/viewer_2020.html b/etc/layout_viewer/viewer_2020.html index 6708127e64b..6189c13f6e5 100644 --- a/etc/layout_viewer/viewer_2020.html +++ b/etc/layout_viewer/viewer_2020.html @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@

Check the README for instructions. diff --git a/etc/profilicate.py b/etc/profilicate.py index 44c734aef99..def71933186 100644 --- a/etc/profilicate.py +++ b/etc/profilicate.py @@ -13,9 +13,9 @@ # output a [processed profile]. Based largely on [this script] and # [this documentation]. # -# [processed profile]: https://github.com/firefox-devtools/profiler/blob/master/docs-developer/processed-profile-format.md -# [this script]: https://github.com/firefox-devtools/profiler/blob/master/src/profile-logic/import/linux-perf.js -# [this documentation]: https://github.com/firefox-devtools/profiler/blob/master/src/types/profile.js +# [processed profile]: https://github.com/firefox-devtools/profiler/blob/main/docs-developer/processed-profile-format.md +# [this script]: https://github.com/firefox-devtools/profiler/blob/main/src/profile-logic/import/linux-perf.js +# [this documentation]: https://github.com/firefox-devtools/profiler/blob/main/src/types/profile.js from collections import defaultdict import json