diff --git a/doc/appengine/src/crashpad-home/main.go b/doc/appengine/src/crashpad-home/main.go index 5ce7d0ab..74830d42 100644 --- a/doc/appengine/src/crashpad-home/main.go +++ b/doc/appengine/src/crashpad-home/main.go @@ -41,29 +41,29 @@ func init() { func handler(w http.ResponseWriter, r *http.Request) { const ( baseURL = "https://chromium.googlesource.com/crashpad/crashpad/+/" - masterBaseURL = baseURL + "master/" + mainBaseURL = baseURL + "main/" generatedDocBaseURL = baseURL + "doc/doc/generated/?format=TEXT" bugBaseURL = "https://bugs.chromium.org/p/crashpad/" ) redirectMap := map[string]string{ - "/": masterBaseURL + "README.md", + "/": mainBaseURL + "README.md", "/bug": bugBaseURL, "/bug/": bugBaseURL, "/bug/new": bugBaseURL + "issues/entry", - "/doc/developing.html": masterBaseURL + "/doc/developing.md", - "/doc/status.html": masterBaseURL + "/doc/status.md", - "/index.html": masterBaseURL + "README.md", - "/man": masterBaseURL + "doc/man.md", - "/man/": masterBaseURL + "doc/man.md", - "/man/catch_exception_tool.html": masterBaseURL + "tools/mac/catch_exception_tool.md", - "/man/crashpad_database_util.html": masterBaseURL + "tools/crashpad_database_util.md", - "/man/crashpad_handler.html": masterBaseURL + "handler/crashpad_handler.md", - "/man/exception_port_tool.html": masterBaseURL + "tools/mac/exception_port_tool.md", - "/man/generate_dump.html": masterBaseURL + "tools/generate_dump.md", - "/man/index.html": masterBaseURL + "doc/man.md", - "/man/on_demand_service_tool.html": masterBaseURL + "tools/mac/on_demand_service_tool.md", - "/man/run_with_crashpad.html": masterBaseURL + "tools/mac/run_with_crashpad.md", + "/doc/developing.html": mainBaseURL + "/doc/developing.md", + "/doc/status.html": mainBaseURL + "/doc/status.md", + "/index.html": mainBaseURL + "README.md", + "/man": mainBaseURL + "doc/man.md", + "/man/": mainBaseURL + "doc/man.md", + "/man/catch_exception_tool.html": mainBaseURL + "tools/mac/catch_exception_tool.md", + "/man/crashpad_database_util.html": mainBaseURL + "tools/crashpad_database_util.md", + "/man/crashpad_handler.html": mainBaseURL + "handler/crashpad_handler.md", + "/man/exception_port_tool.html": mainBaseURL + "tools/mac/exception_port_tool.md", + "/man/generate_dump.html": mainBaseURL + "tools/generate_dump.md", + "/man/index.html": mainBaseURL + "doc/man.md", + "/man/on_demand_service_tool.html": mainBaseURL + "tools/mac/on_demand_service_tool.md", + "/man/run_with_crashpad.html": mainBaseURL + "tools/mac/run_with_crashpad.md", } ctx := appengine.NewContext(r) diff --git a/doc/developing.md b/doc/developing.md index a4017fb7..06dec03e 100644 --- a/doc/developing.md +++ b/doc/developing.md @@ -28,7 +28,7 @@ other projects, Crashpad uses [mini_chromium](https://chromium.googlesource.com/chromium/mini_chromium/), a small, self-contained library that provides many of Chromium’s useful low-level base routines. [mini_chromium’s -README](https://chromium.googlesource.com/chromium/mini_chromium/+/master/README.md) +README](https://chromium.googlesource.com/chromium/mini_chromium/+/main/README.md) provides more detail. ## Prerequisites @@ -153,7 +153,7 @@ suitable location. These instructions assume that it’s been expanded to Note that Chrome uses Android API level 21 for both 64-bit platforms and 32-bit platforms. See Chrome’s -[`build/config/android/config.gni`](https://chromium.googlesource.com/chromium/src/+/master/build/config/android/config.gni) +[`build/config/android/config.gni`](https://chromium.googlesource.com/chromium/src/+/main/build/config/android/config.gni) which sets `android32_ndk_api_level` and `android64_ndk_api_level`. Set these gn args @@ -241,7 +241,7 @@ $ ZIRCON_NODENAME=scare-brook-skip-dried python build/run_tests.py out/fuchsia ## Contributing Crashpad’s contribution process is very similar to [Chromium’s contribution -process](https://chromium.googlesource.com/chromium/src/+/master/docs/contributing.md). +process](https://chromium.googlesource.com/chromium/src/+/main/docs/contributing.md). ### Code Review @@ -250,7 +250,7 @@ review is conducted on [Chromium’s Gerrit](https://chromium-review.googlesource.com/) system, and all code reviews must be sent to an appropriate reviewer, with a Cc sent to [crashpad-dev](https://groups.google.com/a/chromium.org/group/crashpad-dev). The -[`codereview.settings`](https://chromium.googlesource.com/crashpad/crashpad/+/master/codereview.settings) +[`codereview.settings`](https://chromium.googlesource.com/crashpad/crashpad/+/main/codereview.settings) file specifies this environment to `git-cl`. `git-cl` is part of the @@ -259,7 +259,7 @@ no need to install it separately. ``` $ cd ~/crashpad/crashpad -$ git checkout -b work_branch origin/master +$ git checkout -b work_branch origin/main …do some work… $ git add … $ git commit @@ -280,7 +280,7 @@ patch set with `git cl upload` and let your reviewer know you’ve addressed the feedback. The most recently uploaded patch set on a review may be tested on a -[trybot](https://chromium.googlesource.com/chromium/src/+/master/docs/infra/trybot_usage.md) +[trybot](https://chromium.googlesource.com/chromium/src/+/main/docs/infra/trybot_usage.md) by running `git cl try` or by clicking the “CQ Dry Run” button in Gerrit. These set the “Commit-Queue: +1” label. This does not mean that the patch will be committed, but the trybot and commit queue share infrastructure and a Gerrit @@ -292,7 +292,7 @@ Crashpad and Chromium committers. After code review is complete and “Code-Review: +1” has been received from all reviewers, the patch can be submitted to Crashpad’s [commit -queue](https://chromium.googlesource.com/chromium/src/+/master/docs/infra/cq.md) +queue](https://chromium.googlesource.com/chromium/src/+/main/docs/infra/cq.md) by clicking the “Submit to CQ” button in Gerrit. This sets the “Commit-Queue: +2” label, which tests the patch on trybots before landing it. Commit queue access is available to Crashpad and Chromium committers. @@ -314,9 +314,9 @@ Agreement](https://cla.developers.google.com/about/google-individual) or [Corporate Contributor License Agreement](https://cla.developers.google.com/about/google-corporate) as appropriate before any submission can be accepted, and must be listed in the -[`AUTHORS`](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS) +[`AUTHORS`](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS) file. Contributors may be listed in the -[`CONTRIBUTORS`](https://chromium.googlesource.com/crashpad/crashpad/+/master/CONTRIBUTORS) +[`CONTRIBUTORS`](https://chromium.googlesource.com/crashpad/crashpad/+/main/CONTRIBUTORS) file. ## Buildbot diff --git a/doc/support/generate_git.sh b/doc/support/generate_git.sh index 209c11b9..6a7c39f7 100755 --- a/doc/support/generate_git.sh +++ b/doc/support/generate_git.sh @@ -38,8 +38,8 @@ local_branch="\ $(${sed_ext} -e 's/(.*)\..*/\1/' <<< "${basename}").${$}.${RANDOM}" remote_name=origin -remote_master_branch_name=master -remote_master_branch="${remote_name}/${remote_master_branch_name}" +remote_main_branch_name=main +remote_main_branch="${remote_name}/${remote_main_branch_name}" remote_doc_branch_name=doc remote_doc_branch="${remote_name}/${remote_doc_branch_name}" @@ -61,9 +61,9 @@ function cleanup() { trap cleanup EXIT -master_hash=$(git rev-parse --short=12 "${remote_master_branch}") -git merge "${remote_master_branch}" \ - -m "Merge ${remote_master_branch_name} ${master_hash} into doc" +main_hash=$(git rev-parse --short=12 "${remote_main_branch}") +git merge "${remote_main_branch}" \ + -m "Merge ${remote_main_branch_name} ${main_hash} into doc" dirty=y @@ -74,7 +74,7 @@ git add -A doc/generated count="$(git diff --staged --numstat | wc -l)" if [[ $count -gt 0 ]]; then git commit \ - -m "Update documentation to ${remote_master_branch_name} ${master_hash}" + -m "Update documentation to ${remote_main_branch_name} ${main_hash}" dirty= git push "${remote_name}" "HEAD:${remote_doc_branch_name}" diff --git a/handler/crashpad_handler.md b/handler/crashpad_handler.md index 6d055ed1..30d4e687 100644 --- a/handler/crashpad_handler.md +++ b/handler/crashpad_handler.md @@ -332,7 +332,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/base94_encoder.md b/tools/base94_encoder.md index 292c7a63..25f2ddde 100644 --- a/tools/base94_encoder.md +++ b/tools/base94_encoder.md @@ -83,7 +83,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2020 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/crashpad_database_util.md b/tools/crashpad_database_util.md index a63d9a68..d02b8709 100644 --- a/tools/crashpad_database_util.md +++ b/tools/crashpad_database_util.md @@ -191,7 +191,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2015 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/crashpad_http_upload.md b/tools/crashpad_http_upload.md index 93b87522..90a200e7 100644 --- a/tools/crashpad_http_upload.md +++ b/tools/crashpad_http_upload.md @@ -115,7 +115,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2017 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/generate_dump.md b/tools/generate_dump.md index c58ecbc3..0d10d11e 100644 --- a/tools/generate_dump.md +++ b/tools/generate_dump.md @@ -110,7 +110,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/mac/catch_exception_tool.md b/tools/mac/catch_exception_tool.md index 3c71decf..699b0945 100644 --- a/tools/mac/catch_exception_tool.md +++ b/tools/mac/catch_exception_tool.md @@ -123,7 +123,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/mac/exception_port_tool.md b/tools/mac/exception_port_tool.md index 1743e420..5a14e971 100644 --- a/tools/mac/exception_port_tool.md +++ b/tools/mac/exception_port_tool.md @@ -217,7 +217,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/mac/on_demand_service_tool.md b/tools/mac/on_demand_service_tool.md index 5a850352..894f7434 100644 --- a/tools/mac/on_demand_service_tool.md +++ b/tools/mac/on_demand_service_tool.md @@ -116,7 +116,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License diff --git a/tools/run_with_crashpad.md b/tools/run_with_crashpad.md index 9758f9af..3aafea3b 100644 --- a/tools/run_with_crashpad.md +++ b/tools/run_with_crashpad.md @@ -130,7 +130,7 @@ Report bugs at https://crashpad.chromium.org/bug/new. ## Copyright Copyright 2014 [The Crashpad -Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS). +Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS). ## License