Update references to master branch
Change-Id: I1bfd1b655af6cdfbd64452b1e594a276425095fe
Bug: skia:11987
Docs-Preview: https://skia.org/?cl=410790
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410790
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
diff --git a/site/docs/dev/contrib/_index.md b/site/docs/dev/contrib/_index.md
index ea99972..14b14cc 100644
--- a/site/docs/dev/contrib/_index.md
+++ b/site/docs/dev/contrib/_index.md
@@ -55,7 +55,7 @@
- If it is your first time submitting code or you have not previously done so,
add your (or your organization's) name and contact info to the
- [AUTHORS file](https://skia.googlesource.com/skia/+/master/AUTHORS) as a part
+ [AUTHORS file](https://skia.googlesource.com/skia/+/main/AUTHORS) as a part
of your CL.
REVIEWERS: Before you LGTM a change, verify that the contributor is listed in
diff --git a/site/docs/dev/contrib/revert.md b/site/docs/dev/contrib/revert.md
index b8e7a2e..6c07414 100644
--- a/site/docs/dev/contrib/revert.md
+++ b/site/docs/dev/contrib/revert.md
@@ -16,15 +16,15 @@
Update the local repository
- git fetch origin master
+ git fetch origin main
-Create a local branch with origin/master as its start point.
+Create a local branch with origin/main as its start point.
- git checkout -b revert$RANDOM origin/master
+ git checkout -b revert$RANDOM origin/main
Find the SHA1 of the commit you want to revert
- git log origin/master
+ git log origin/main
Create a revert commit.
@@ -34,7 +34,7 @@
git cl upload
-Land the revert in origin/master.
+Land the revert in origin/main.
git cl land
diff --git a/site/docs/dev/contrib/submit.md b/site/docs/dev/contrib/submit.md
index d9ebcf0..bebb946 100644
--- a/site/docs/dev/contrib/submit.md
+++ b/site/docs/dev/contrib/submit.md
@@ -17,7 +17,7 @@
<!--?prettify lang=sh?-->
git config branch.autosetuprebase always
- git checkout -b my_feature origin/master
+ git checkout -b my_feature origin/main
After making your changes, create a commit
@@ -169,7 +169,7 @@
Once your commit has gone in, you should delete the branch containing your
change:
- git checkout -q origin/master
+ git checkout -q origin/main
git branch -D my_feature
## Final Testing
diff --git a/site/docs/dev/flutter/_index.md b/site/docs/dev/flutter/_index.md
index 40c44b4..947e94b 100644
--- a/site/docs/dev/flutter/_index.md
+++ b/site/docs/dev/flutter/_index.md
@@ -29,7 +29,7 @@
- Deprecate the old code path so that it must be enabled with a flag such as
'SK_SUPPORT_LEGACY_XXX'.
- Add that same flag to
- [flutter_defines.gni](https://skia.googlesource.com/skia/+/master/gn/flutter_defines.gni)
+ [flutter_defines.gni](https://skia.googlesource.com/skia/+/main/gn/flutter_defines.gni)
in Skia.
- Both Flutter and Fuchsia build Skia with a GN argument that enables all the
defines listed in that file.
diff --git a/site/docs/dev/testing/automated_testing.md b/site/docs/dev/testing/automated_testing.md
index 48f687c..a01c8f5 100644
--- a/site/docs/dev/testing/automated_testing.md
+++ b/site/docs/dev/testing/automated_testing.md
@@ -34,7 +34,7 @@
$ go run infra/bots/gen_tasks.go
It is necessary to run `gen_tasks.go` every time it is changed or every time an
-[asset](https://skia.googlesource.com/skia/+/master/infra/bots/assets/README.md)
+[asset](https://skia.googlesource.com/skia/+/main/infra/bots/assets/README.md)
has changed. There is also a test mode which simply verifies that the `tasks.json`
file is up to date:
@@ -127,13 +127,13 @@
[new bot request]:
https://bugs.chromium.org/p/skia/issues/entry?template=New+Bot+Request
-[jobs json]: https://skia.googlesource.com/skia/+/master/infra/bots/jobs.json
+[jobs json]: https://skia.googlesource.com/skia/+/main/infra/bots/jobs.json
[build recipe module]:
https://skia.googlesource.com/skia/+/refs/heads/master/infra/bots/recipe_modules/build/
[test py]:
- https://skia.googlesource.com/skia/+/master/infra/bots/recipes/test.py
+ https://skia.googlesource.com/skia/+/main/infra/bots/recipes/test.py
[perf py]:
- https://skia.googlesource.com/skia/+/master/infra/bots/recipes/perf.py
+ https://skia.googlesource.com/skia/+/main/infra/bots/recipes/perf.py
Detail on Skia Tasks
@@ -179,15 +179,15 @@
mtklein.
[gen_tasks]:
- https://skia.googlesource.com/skia/+/master/infra/bots/gen_tasks.go
+ https://skia.googlesource.com/skia/+/main/infra/bots/gen_tasks.go
[cfg json]:
- https://skia.googlesource.com/skia/+/master/infra/bots/cfg.json
+ https://skia.googlesource.com/skia/+/main/infra/bots/cfg.json
[builder_name_schema]:
- https://skia.googlesource.com/skia/+/master/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
+ https://skia.googlesource.com/skia/+/main/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
[recipes README]:
- https://skia.googlesource.com/skia/+/master/infra/bots/recipes/README.md
+ https://skia.googlesource.com/skia/+/main/infra/bots/recipes/README.md
[recipe_modules README]:
- https://skia.googlesource.com/skia/+/master/infra/bots/recipe_modules/README.md
+ https://skia.googlesource.com/skia/+/main/infra/bots/recipe_modules/README.md
[isolate user guide]:
https://chromium.googlesource.com/infra/luci/luci-py/+/master/appengine/isolate/doc/client/Isolate-User-Guide.md
diff --git a/site/docs/dev/testing/skqp.md b/site/docs/dev/testing/skqp.md
index 0a2db87..c1dae85 100644
--- a/site/docs/dev/testing/skqp.md
+++ b/site/docs/dev/testing/skqp.md
@@ -52,5 +52,5 @@
* * *
For more information about building your own APK, refer to
-https://skia.googlesource.com/skia/+/master/tools/skqp/README.md
+https://skia.googlesource.com/skia/+/main/tools/skqp/README.md
diff --git a/site/docs/dev/tools/sk.md b/site/docs/dev/tools/sk.md
index ca6354d..a513c14 100644
--- a/site/docs/dev/tools/sk.md
+++ b/site/docs/dev/tools/sk.md
@@ -17,7 +17,7 @@
Used for managing versioned non-code assets used by Skia developers and in CI.
These are stored in [CIPD](https://chrome-infra-packages.appspot.com/p/skia/bots)
and their versions are pinned under
-[//infra/bots/assets](https://skia.googlesource.com/skia/+/master/infra/bots/assets)
+[//infra/bots/assets](https://skia.googlesource.com/skia/+/main/infra/bots/assets)
in Skia.
* add - Add an entry for a new asset. This does not create an initial version.
@@ -63,5 +63,5 @@
New versions of `sk` are automatically built and uploaded to
[CIPD](https://chrome-infra-packages.appspot.com/p/skia/tools/sk) as part of
Skia Infra's CI/CD pipeline. The version used by Skia is pinned in
-[DEPS](https://skia.googlesource.com/skia/+/master/DEPS) and updated by an
+[DEPS](https://skia.googlesource.com/skia/+/main/DEPS) and updated by an
[autoroller](https://autoroll.skia.org/r/sk-tool-skia).
diff --git a/site/docs/user/build.md b/site/docs/user/build.md
index 73fb57e..457ceb3 100644
--- a/site/docs/user/build.md
+++ b/site/docs/user/build.md
@@ -184,10 +184,10 @@
If you don't have authorization to use those assets, then see the README.md
files for
-[armhf_sysroot](https://skia.googlesource.com/skia/+/master/infra/bots/assets/armhf_sysroot/README.md),
-[chromebook_arm_gles](https://skia.googlesource.com/skia/+/master/infra/bots/assets/chromebook_arm_gles/README.md),
+[armhf_sysroot](https://skia.googlesource.com/skia/+/main/infra/bots/assets/armhf_sysroot/README.md),
+[chromebook_arm_gles](https://skia.googlesource.com/skia/+/main/infra/bots/assets/chromebook_arm_gles/README.md),
and
-[chromebook_x86_64_gles](https://skia.googlesource.com/skia/+/master/infra/bots/assets/chromebook_x86_64_gles/README.md)
+[chromebook_x86_64_gles](https://skia.googlesource.com/skia/+/main/infra/bots/assets/chromebook_x86_64_gles/README.md)
for instructions on creating those assets.
Once those files are in place, generate the GN args that resemble the following:
diff --git a/site/docs/user/modules/skottie.md b/site/docs/user/modules/skottie.md
index fc01995..2a62f69 100644
--- a/site/docs/user/modules/skottie.md
+++ b/site/docs/user/modules/skottie.md
@@ -61,7 +61,7 @@
## The code
Skia's animation code entry point can be found here on
-[Googlesource](https://skia.googlesource.com/skia/+/master/modules/skottie/include/Skottie.h)
+[Googlesource](https://skia.googlesource.com/skia/+/main/modules/skottie/include/Skottie.h)
and
[GitHub](https://github.com/google/skia/blob/master/modules/skottie/include/Skottie.h).
The code is part of Skia's library but can also be made available as a separate
diff --git a/site/docs/user/release/schedule.md b/site/docs/user/release/schedule.md
index 4dfb9d1..2889289 100644
--- a/site/docs/user/release/schedule.md
+++ b/site/docs/user/release/schedule.md
@@ -32,5 +32,5 @@
Skia is maintaining 82 for our customers. Future dates are subject to change.
The current milestone is included in the headers in
-[SkMilestone.h](https://skia.googlesource.com/skia/+/master/include/core/SkMilestone.h).
+[SkMilestone.h](https://skia.googlesource.com/skia/+/main/include/core/SkMilestone.h).
diff --git a/site/docs/user/tips.md b/site/docs/user/tips.md
index 2c92f80..c980514 100644
--- a/site/docs/user/tips.md
+++ b/site/docs/user/tips.md
@@ -72,7 +72,7 @@
There are sets of bottleneck routines inside the blits of Skia that can be
replace on a platform in order to take advantage of specific CPU features.
One such example is the NEON SIMD instructions on ARM v7 devices. See
- [src/opts/](https://skia.googlesource.com/skia/+/master/src/opts/)
+ [src/opts/](https://skia.googlesource.com/skia/+/main/src/opts/)
---