diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 06513545d8..cf6b274206 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ on:
       - "*"
   push:
     branches:
-      - master
+      - main
       - stable
   schedule:
     - cron: "30 0 * * 1,3,5" # At 00:30 UTC on Monday, Wednesday, and Friday
@@ -19,9 +19,9 @@ jobs:
 
   # This is ci/actions-templates/windows-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-windows-pr: # job-name skip-master skip-stable
+  build-windows-pr: # job-name skip-main skip-stable
     runs-on: ${{ matrix.os || 'windows-latest' }}
-    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
+    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
       RUST_MIN_STACK: 16777216
@@ -155,12 +155,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init.exe
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           Get-Command aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           .\ci\prepare-deploy.ps1
         shell: powershell
@@ -173,13 +173,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
@@ -191,9 +191,9 @@ jobs:
 
   # This is ci/actions-templates/windows-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-windows-master: # job-name skip-pr skip-stable
+  build-windows-main: # job-name skip-pr skip-stable
     runs-on: ${{ matrix.os || 'windows-latest' }}
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') }} # skip-pr skip-stable
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') }} # skip-pr skip-stable
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
       RUST_MIN_STACK: 16777216
@@ -327,12 +327,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init.exe
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           Get-Command aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           .\ci\prepare-deploy.ps1
         shell: powershell
@@ -345,13 +345,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
@@ -363,9 +363,9 @@ jobs:
 
   # This is ci/actions-templates/windows-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-windows-stable: # job-name skip-master skip-pr
+  build-windows-stable: # job-name skip-main skip-pr
     runs-on: ${{ matrix.os || 'windows-latest' }}
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-master
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
       RUST_MIN_STACK: 16777216
@@ -380,10 +380,10 @@ jobs:
           - release
         target:
           - x86_64-pc-windows-msvc
-          - i686-pc-windows-msvc # skip-pr skip-master
+          - i686-pc-windows-msvc # skip-pr skip-main
           - aarch64-pc-windows-msvc
           - x86_64-pc-windows-gnu
-          - i686-pc-windows-gnu # skip-pr skip-master
+          - i686-pc-windows-gnu # skip-pr skip-main
         include:
           - target: x86_64-pc-windows-msvc
             run_tests: YES
@@ -396,10 +396,10 @@ jobs:
             rustup_arch: aarch64
             os: windows-11-arm
             run_tests: YES
-          - target: i686-pc-windows-gnu # skip-pr skip-master
-            arch: i686 # skip-pr skip-master
-            mingwdir: mingw32 # skip-pr skip-master
-            gcc: i686-w64-mingw32-gcc # skip-pr skip-master
+          - target: i686-pc-windows-gnu # skip-pr skip-main
+            arch: i686 # skip-pr skip-main
+            mingwdir: mingw32 # skip-pr skip-main
+            gcc: i686-w64-mingw32-gcc # skip-pr skip-main
     steps:
       - uses: actions/checkout@v5
         # v2 defaults to a shallow checkout, but we need at least to the previous tag
@@ -505,12 +505,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init.exe
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           Get-Command aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           .\ci\prepare-deploy.ps1
         shell: powershell
@@ -523,13 +523,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
@@ -541,9 +541,9 @@ jobs:
 
   # This is ci/actions-templates/linux-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-linux-pr: # job-name skip-master skip-stable
+  build-linux-pr: # job-name skip-main skip-stable
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
-    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
+    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
     permissions:
       id-token: write
       contents: read
@@ -673,12 +673,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -690,13 +690,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
@@ -708,9 +708,9 @@ jobs:
 
   # This is ci/actions-templates/linux-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-linux-master: # job-name skip-pr skip-stable
+  build-linux-main: # job-name skip-pr skip-stable
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') }} # skip-pr skip-stable
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') }} # skip-pr skip-stable
     permissions:
       id-token: write
       contents: read
@@ -842,12 +842,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -859,13 +859,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
@@ -877,9 +877,9 @@ jobs:
 
   # This is ci/actions-templates/linux-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-linux-stable: # job-name skip-master skip-pr
+  build-linux-stable: # job-name skip-main skip-pr
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-master
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
     permissions:
       id-token: write
       contents: read
@@ -894,33 +894,33 @@ jobs:
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
-          - aarch64-unknown-linux-musl     # skip-pr skip-master
+          - aarch64-unknown-linux-musl     # skip-pr skip-main
           - powerpc64-unknown-linux-gnu    # skip-pr
           - x86_64-unknown-linux-musl      # skip-pr
-          - i686-unknown-linux-gnu         # skip-pr skip-master
-          - arm-unknown-linux-gnueabi      # skip-pr skip-master
-          - arm-unknown-linux-gnueabihf    # skip-pr skip-master
-          - x86_64-pc-solaris              # skip-pr skip-master
-          - x86_64-unknown-freebsd         # skip-pr skip-master
-          - x86_64-unknown-netbsd          # skip-pr skip-master
-          - x86_64-unknown-illumos         # skip-pr skip-master
-          - powerpc-unknown-linux-gnu      # skip-pr skip-master
-          - powerpc64le-unknown-linux-gnu  # skip-pr skip-master
-          - powerpc64le-unknown-linux-musl # skip-pr skip-master
-          - s390x-unknown-linux-gnu        # skip-pr skip-master
-          - sparcv9-sun-solaris            # skip-pr skip-master
-          - arm-linux-androideabi          # skip-pr skip-master
-          - armv7-linux-androideabi        # skip-pr skip-master
-          - x86_64-linux-android           # skip-pr skip-master
-          - riscv64gc-unknown-linux-gnu    # skip-pr skip-master
-          - loongarch64-unknown-linux-gnu  # skip-pr skip-master
-          - loongarch64-unknown-linux-musl # skip-pr skip-master
+          - i686-unknown-linux-gnu         # skip-pr skip-main
+          - arm-unknown-linux-gnueabi      # skip-pr skip-main
+          - arm-unknown-linux-gnueabihf    # skip-pr skip-main
+          - x86_64-pc-solaris              # skip-pr skip-main
+          - x86_64-unknown-freebsd         # skip-pr skip-main
+          - x86_64-unknown-netbsd          # skip-pr skip-main
+          - x86_64-unknown-illumos         # skip-pr skip-main
+          - powerpc-unknown-linux-gnu      # skip-pr skip-main
+          - powerpc64le-unknown-linux-gnu  # skip-pr skip-main
+          - powerpc64le-unknown-linux-musl # skip-pr skip-main
+          - s390x-unknown-linux-gnu        # skip-pr skip-main
+          - sparcv9-sun-solaris            # skip-pr skip-main
+          - arm-linux-androideabi          # skip-pr skip-main
+          - armv7-linux-androideabi        # skip-pr skip-main
+          - x86_64-linux-android           # skip-pr skip-main
+          - riscv64gc-unknown-linux-gnu    # skip-pr skip-main
+          - loongarch64-unknown-linux-gnu  # skip-pr skip-main
+          - loongarch64-unknown-linux-musl # skip-pr skip-main
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
             #snap_arch: amd64
-          - target: i686-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: i386  # skip-pr skip-master
+          - target: i686-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: i386  # skip-pr skip-main
             # We add an ARM-based host to the following target.
             # We need to do that because rust's CI uses ARM-based runners
             # to generate their Dockerfiles.
@@ -929,10 +929,10 @@ jobs:
             run_tests: YES
           - target: armv7-unknown-linux-gnueabihf
             #snap_arch: armhf
-          - target: powerpc64le-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: ppc64el # skip-pr skip-master
-          - target: s390x-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: s390x # skip-pr skip-master
+          - target: powerpc64le-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: ppc64el # skip-pr skip-main
+          - target: s390x-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: s390x # skip-pr skip-main
     steps:
       - name: Clone repo
         uses: actions/checkout@v5
@@ -1036,12 +1036,12 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -1053,13 +1053,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
@@ -1161,13 +1161,13 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           brew install --overwrite awscli
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -1179,13 +1179,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
@@ -1292,13 +1292,13 @@ jobs:
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           brew install --overwrite awscli
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -1310,13 +1310,13 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
@@ -1334,9 +1334,9 @@ jobs:
 
   # This is ci/actions-templates/freebsd-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-freebsd-master: # job-name skip-stable
+  build-freebsd-main: # job-name skip-stable
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-stable
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'schedule' }} # skip-stable
     steps:
     - uses: actions/checkout@v5
       with:
@@ -1366,9 +1366,9 @@ jobs:
 
   # This is ci/actions-templates/freebsd-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-freebsd-stable: # job-name skip-master
+  build-freebsd-stable: # job-name skip-main
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-master
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-main
     steps:
     - uses: actions/checkout@v5
       with:
@@ -1543,8 +1543,8 @@ jobs:
   # This is ci/actions-templates/test-docs-templates.yaml
   # Do not edit this file in .github/workflows
   #
-  # Builds docs for both stable and master branches.
-  # stable is placed in the root of the gh-pages branch, while master is placed at /devel
+  # Builds docs for both stable and main branches.
+  # stable is placed in the root of the gh-pages branch, while main is placed at /devel
   doc: # job-name
     runs-on: ubuntu-latest
     steps:
@@ -1566,16 +1566,16 @@ jobs:
           cd doc/user-guide || cd doc
           mdbook build
           mv book ${{ runner.temp }}
-      - name: Build user-guide (master)
+      - name: Build user-guide (main)
         run: |
-          git checkout master
+          git checkout main
           cd doc/user-guide
           mdbook build
           mkdir -p ${{ runner.temp }}/book
           mv book ${{ runner.temp }}/book/devel
-      - name: Build dev-guide (master)
+      - name: Build dev-guide (main)
         run: |
-          git checkout master
+          git checkout main
           cd doc/dev-guide
           mdbook build
           mkdir -p ${{ runner.temp }}/book
@@ -1590,7 +1590,7 @@ jobs:
           git add . .nojekyll
           git commit -m "Deploy $GITHUB_REF $GITHUB_SHA to gh-pages"
           git remote add origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git push --force --set-upstream origin master:gh-pages
+          git push --force --set-upstream origin main:gh-pages
 
   # This is ci/actions-templates/conclusion-template.yaml
   # Do not edit this file in .github/workflows
@@ -1609,14 +1609,14 @@ jobs:
     needs:
       - build-all-features
       - check
-      - build-freebsd-master
+      - build-freebsd-main
       - build-freebsd-stable
       - build-linux-pr
-      - build-linux-master
+      - build-linux-main
       - build-linux-stable
       - build-macos-aarch64
       - build-macos-x86_64
       - doc
       - build-windows-pr
-      - build-windows-master
+      - build-windows-main
       - build-windows-stable
diff --git a/README.md b/README.md
index f0bfa28367..8f4e7dbc61 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ And it runs on all platforms Rust supports, including Windows.
 See [**The Rustup book**](https://rust-lang.github.io/rustup/) for
 documentation on installing and using Rustup.
 
-The latest documentation for the master branch can be found
+The latest documentation for the main branch can be found
 under [devel](https://rust-lang.github.io/rustup/devel/).
 
 ## Contributing
@@ -36,4 +36,4 @@ at your option.
 
 <!-- Badges -->
 [actions-default-branch]: https://github.com/rust-lang/rustup/actions/workflows/ci.yaml/badge.svg
-[actions-default-branch-status]: https://github.com/rust-lang/rustup/actions?query=branch%3Amaster
+[actions-default-branch-status]: https://github.com/rust-lang/rustup/actions?query=branch%3Amain
diff --git a/ci/actions-templates/README.md b/ci/actions-templates/README.md
index 7eabe13c4f..235d68d5ee 100644
--- a/ci/actions-templates/README.md
+++ b/ci/actions-templates/README.md
@@ -7,8 +7,8 @@ This directory contains all the workflows we use in Rustup for GitHub Actions.
 Rustup has five situations in which we perform CI builds:
 
 1. On PR changes
-2. On merge to master
-3. Time-based rebuilds of master
+2. On merge to main
+3. Time-based rebuilds of main
 4. Pushes to the stable branch
 5. Renovate branches with dependency updates, tested before opening a PR or
    merging. They are assessed the same as a PR: if it would be good enough as a
@@ -17,9 +17,9 @@ Rustup has five situations in which we perform CI builds:
 The goals for each of those situations are subtly different. For PR changes,
 we want to know as quickly as possible if the change is likely to be an issue.
 
-Once a change hits master, we want to know that all our targets build.
+Once a change hits main, we want to know that all our targets build.
 
-Time based rebuilds of master are about determining if updates to the toolchain
+Time based rebuilds of main are about determining if updates to the toolchain
 have caused us problems, and also to try and highlight if we have flaky tests.
 
 The stable branch is about making releases. Builds from that branch are uploaded
@@ -65,5 +65,5 @@ Due to limitations in how github workflows work, we have to create our workflows
 from template files and then commit them.
 
 The templates are in this directory, and the built workflows end up in the
-`.github/workflows` directory. `-all` always runs, `-on-pr` `-on-master` and
+`.github/workflows` directory. `-all` always runs, `-on-pr` `-on-main` and
 `-on-stable` do the obvious.
diff --git a/ci/actions-templates/freebsd-builds-template.yaml b/ci/actions-templates/freebsd-builds-template.yaml
index ffc01fd9e9..4d1c07db42 100644
--- a/ci/actions-templates/freebsd-builds-template.yaml
+++ b/ci/actions-templates/freebsd-builds-template.yaml
@@ -1,12 +1,12 @@
-jobs: # skip-master skip-stable
+jobs: # skip-main skip-stable
 
   # This is ci/actions-templates/freebsd-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-freebsd-master: # job-name skip-stable
-  build-freebsd-stable: # job-name skip-master
+  build-freebsd-main: # job-name skip-stable
+  build-freebsd-stable: # job-name skip-main
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-stable
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-master
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'schedule' }} # skip-stable
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-main
     steps:
     - uses: actions/checkout@v5
       with:
diff --git a/ci/actions-templates/gen-workflows.sh b/ci/actions-templates/gen-workflows.sh
index fb023d6dca..4b99a13d61 100755
--- a/ci/actions-templates/gen-workflows.sh
+++ b/ci/actions-templates/gen-workflows.sh
@@ -20,7 +20,7 @@ on:
       - "*"
   push:
     branches:
-      - master
+      - main
       - stable
   schedule:
     - cron: "30 0 * * 1,3,5" # At 00:30 UTC on Monday, Wednesday, and Friday
@@ -29,17 +29,17 @@ jobs:
 EOF
 
 gen_job windows-builds pr
-gen_job windows-builds master
+gen_job windows-builds main
 gen_job windows-builds stable
 
 gen_job linux-builds pr
-gen_job linux-builds master
+gen_job linux-builds main
 gen_job linux-builds stable
 
 gen_job macos-builds x86_64
 gen_job macos-builds aarch64
 
-gen_job freebsd-builds master
+gen_job freebsd-builds main
 gen_job freebsd-builds stable
 
 # The following targets only have a single job
diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
index 1a020375a2..07456082c1 100644
--- a/ci/actions-templates/linux-builds-template.yaml
+++ b/ci/actions-templates/linux-builds-template.yaml
@@ -1,14 +1,14 @@
-jobs: # skip-master skip-pr skip-stable
+jobs: # skip-main skip-pr skip-stable
 
   # This is ci/actions-templates/linux-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-linux-pr: # job-name skip-master skip-stable
-  build-linux-master: # job-name skip-pr skip-stable
-  build-linux-stable: # job-name skip-master skip-pr
+  build-linux-pr: # job-name skip-main skip-stable
+  build-linux-main: # job-name skip-pr skip-stable
+  build-linux-stable: # job-name skip-main skip-pr
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
-    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') }} # skip-pr skip-stable
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-master
+    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') }} # skip-pr skip-stable
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
     permissions:
       id-token: write
       contents: read
@@ -23,33 +23,33 @@ jobs: # skip-master skip-pr skip-stable
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
-          - aarch64-unknown-linux-musl     # skip-pr skip-master
+          - aarch64-unknown-linux-musl     # skip-pr skip-main
           - powerpc64-unknown-linux-gnu    # skip-pr
           - x86_64-unknown-linux-musl      # skip-pr
-          - i686-unknown-linux-gnu         # skip-pr skip-master
-          - arm-unknown-linux-gnueabi      # skip-pr skip-master
-          - arm-unknown-linux-gnueabihf    # skip-pr skip-master
-          - x86_64-pc-solaris              # skip-pr skip-master
-          - x86_64-unknown-freebsd         # skip-pr skip-master
-          - x86_64-unknown-netbsd          # skip-pr skip-master
-          - x86_64-unknown-illumos         # skip-pr skip-master
-          - powerpc-unknown-linux-gnu      # skip-pr skip-master
-          - powerpc64le-unknown-linux-gnu  # skip-pr skip-master
-          - powerpc64le-unknown-linux-musl # skip-pr skip-master
-          - s390x-unknown-linux-gnu        # skip-pr skip-master
-          - sparcv9-sun-solaris            # skip-pr skip-master
-          - arm-linux-androideabi          # skip-pr skip-master
-          - armv7-linux-androideabi        # skip-pr skip-master
-          - x86_64-linux-android           # skip-pr skip-master
-          - riscv64gc-unknown-linux-gnu    # skip-pr skip-master
-          - loongarch64-unknown-linux-gnu  # skip-pr skip-master
-          - loongarch64-unknown-linux-musl # skip-pr skip-master
+          - i686-unknown-linux-gnu         # skip-pr skip-main
+          - arm-unknown-linux-gnueabi      # skip-pr skip-main
+          - arm-unknown-linux-gnueabihf    # skip-pr skip-main
+          - x86_64-pc-solaris              # skip-pr skip-main
+          - x86_64-unknown-freebsd         # skip-pr skip-main
+          - x86_64-unknown-netbsd          # skip-pr skip-main
+          - x86_64-unknown-illumos         # skip-pr skip-main
+          - powerpc-unknown-linux-gnu      # skip-pr skip-main
+          - powerpc64le-unknown-linux-gnu  # skip-pr skip-main
+          - powerpc64le-unknown-linux-musl # skip-pr skip-main
+          - s390x-unknown-linux-gnu        # skip-pr skip-main
+          - sparcv9-sun-solaris            # skip-pr skip-main
+          - arm-linux-androideabi          # skip-pr skip-main
+          - armv7-linux-androideabi        # skip-pr skip-main
+          - x86_64-linux-android           # skip-pr skip-main
+          - riscv64gc-unknown-linux-gnu    # skip-pr skip-main
+          - loongarch64-unknown-linux-gnu  # skip-pr skip-main
+          - loongarch64-unknown-linux-musl # skip-pr skip-main
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
             #snap_arch: amd64
-          - target: i686-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: i386  # skip-pr skip-master
+          - target: i686-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: i386  # skip-pr skip-main
             # We add an ARM-based host to the following target.
             # We need to do that because rust's CI uses ARM-based runners
             # to generate their Dockerfiles.
@@ -58,10 +58,10 @@ jobs: # skip-master skip-pr skip-stable
             run_tests: YES
           - target: armv7-unknown-linux-gnueabihf
             #snap_arch: armhf
-          - target: powerpc64le-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: ppc64el # skip-pr skip-master
-          - target: s390x-unknown-linux-gnu # skip-pr skip-master
-            #snap_arch: s390x # skip-pr skip-master
+          - target: powerpc64le-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: ppc64el # skip-pr skip-main
+          - target: s390x-unknown-linux-gnu # skip-pr skip-main
+            #snap_arch: s390x # skip-pr skip-main
     steps:
       - name: Clone repo
         uses: actions/checkout@v5
@@ -165,12 +165,12 @@ jobs: # skip-master skip-pr skip-stable
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -182,13 +182,13 @@ jobs: # skip-master skip-pr skip-stable
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
diff --git a/ci/actions-templates/macos-builds-template.yaml b/ci/actions-templates/macos-builds-template.yaml
index 278a7bf364..eefb8c7e79 100644
--- a/ci/actions-templates/macos-builds-template.yaml
+++ b/ci/actions-templates/macos-builds-template.yaml
@@ -97,13 +97,13 @@ jobs: # skip-x86_64 skip-aarch64
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           brew install --overwrite awscli
           which aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           bash ci/prepare-deploy.bash
       - name: Deploy build to dev-static dist tree for release team
@@ -115,13 +115,13 @@ jobs: # skip-x86_64 skip-aarch64
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }}
         env:
diff --git a/ci/actions-templates/test-docs-template.yaml b/ci/actions-templates/test-docs-template.yaml
index bc24186aad..54e1079c7b 100644
--- a/ci/actions-templates/test-docs-template.yaml
+++ b/ci/actions-templates/test-docs-template.yaml
@@ -3,8 +3,8 @@ jobs: # skip-all
   # This is ci/actions-templates/test-docs-templates.yaml
   # Do not edit this file in .github/workflows
   #
-  # Builds docs for both stable and master branches.
-  # stable is placed in the root of the gh-pages branch, while master is placed at /devel
+  # Builds docs for both stable and main branches.
+  # stable is placed in the root of the gh-pages branch, while main is placed at /devel
   doc: # job-name
     runs-on: ubuntu-latest
     steps:
@@ -26,16 +26,16 @@ jobs: # skip-all
           cd doc/user-guide || cd doc
           mdbook build
           mv book ${{ runner.temp }}
-      - name: Build user-guide (master)
+      - name: Build user-guide (main)
         run: |
-          git checkout master
+          git checkout main
           cd doc/user-guide
           mdbook build
           mkdir -p ${{ runner.temp }}/book
           mv book ${{ runner.temp }}/book/devel
-      - name: Build dev-guide (master)
+      - name: Build dev-guide (main)
         run: |
-          git checkout master
+          git checkout main
           cd doc/dev-guide
           mdbook build
           mkdir -p ${{ runner.temp }}/book
@@ -50,4 +50,4 @@ jobs: # skip-all
           git add . .nojekyll
           git commit -m "Deploy $GITHUB_REF $GITHUB_SHA to gh-pages"
           git remote add origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git push --force --set-upstream origin master:gh-pages
+          git push --force --set-upstream origin main:gh-pages
diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
index adc27140db..151001ebd9 100644
--- a/ci/actions-templates/windows-builds-template.yaml
+++ b/ci/actions-templates/windows-builds-template.yaml
@@ -1,14 +1,14 @@
-jobs: # skip-master skip-pr skip-stable
+jobs: # skip-main skip-pr skip-stable
 
   # This is ci/actions-templates/windows-builds-template.yaml
   # Do not edit this file in .github/workflows
-  build-windows-pr: # job-name skip-master skip-stable
-  build-windows-master: # job-name skip-pr skip-stable
-  build-windows-stable: # job-name skip-master skip-pr
+  build-windows-pr: # job-name skip-main skip-stable
+  build-windows-main: # job-name skip-pr skip-stable
+  build-windows-stable: # job-name skip-main skip-pr
     runs-on: ${{ matrix.os || 'windows-latest' }}
-    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
-    if: ${{ (github.event_name == 'push' && github.ref_name == 'master') }} # skip-pr skip-stable
-    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-master
+    if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
+    if: ${{ (github.event_name == 'push' && github.ref_name == 'main') }} # skip-pr skip-stable
+    if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
       RUST_MIN_STACK: 16777216
@@ -23,10 +23,10 @@ jobs: # skip-master skip-pr skip-stable
           - release
         target:
           - x86_64-pc-windows-msvc
-          - i686-pc-windows-msvc # skip-pr skip-master
+          - i686-pc-windows-msvc # skip-pr skip-main
           - aarch64-pc-windows-msvc
           - x86_64-pc-windows-gnu
-          - i686-pc-windows-gnu # skip-pr skip-master
+          - i686-pc-windows-gnu # skip-pr skip-main
         include:
           - target: x86_64-pc-windows-msvc
             run_tests: YES
@@ -39,10 +39,10 @@ jobs: # skip-master skip-pr skip-stable
             rustup_arch: aarch64
             os: windows-11-arm
             run_tests: YES
-          - target: i686-pc-windows-gnu # skip-pr skip-master
-            arch: i686 # skip-pr skip-master
-            mingwdir: mingw32 # skip-pr skip-master
-            gcc: i686-w64-mingw32-gcc # skip-pr skip-master
+          - target: i686-pc-windows-gnu # skip-pr skip-main
+            arch: i686 # skip-pr skip-main
+            mingwdir: mingw32 # skip-pr skip-main
+            gcc: i686-w64-mingw32-gcc # skip-pr skip-main
     steps:
       - uses: actions/checkout@v5
         # v2 defaults to a shallow checkout, but we need at least to the previous tag
@@ -148,12 +148,12 @@ jobs: # skip-master skip-pr skip-stable
             target/${{ matrix.target }}/release/rustup-init.exe
           retention-days: 7
       - name: Ensure that awscli is installed
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           Get-Command aws
           aws --version
       - name: Prepare the dist
-        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
+        if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/main')
         run: |
           .\ci\prepare-deploy.ps1
         shell: powershell
@@ -166,13 +166,13 @@ jobs: # skip-master skip-pr skip-stable
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-1
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--rustup
           aws-region: us-east-1
       - name: Deploy build to rustup-builds bucket for release team
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.mode == 'release'
         run: |
           aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
diff --git a/ci/fetch-rust-docker.bash b/ci/fetch-rust-docker.bash
index 2590e6f00b..c8196151e6 100644
--- a/ci/fetch-rust-docker.bash
+++ b/ci/fetch-rust-docker.bash
@@ -17,9 +17,9 @@ ARTIFACTS_BASE_URL="https://ci-artifacts.rust-lang.org/rustc-builds"
 # This means it is using a Docker image fetched from a container registry provided by `rustc`'s CI.
 LOCAL_DOCKER_TAG="rust-$TARGET"
 # The following is a mapping from `$TARGET`s to cached Docker images built from `Dockerfile`s under
-# <https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/>,
+# <https://github.com/rust-lang/rust/blob/HEAD/src/ci/docker/host-x86_64/>,
 # e.g. `FROM rust-aarch64-unknown-linux-musl` means the base `Dockerfile` to look at is located under
-# <https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/dist-arm-linux-musl>.
+# <https://github.com/rust-lang/rust/blob/HEAD/src/ci/docker/host-x86_64/dist-arm-linux-musl>.
 case "$TARGET" in
   aarch64-unknown-linux-gnu)       image=dist-aarch64-linux ;;
   aarch64-unknown-linux-musl)      image=dist-arm-linux-musl ;;
@@ -49,8 +49,8 @@ case "$TARGET" in
   *) exit ;;
 esac
 
-master=$(git ls-remote "$RUST_REPO" HEAD | cut -f1)
-image_url="$ARTIFACTS_BASE_URL/$master/image-$image.txt"
+head=$(git ls-remote "$RUST_REPO" HEAD | cut -f1)
+image_url="$ARTIFACTS_BASE_URL/$head/image-$image.txt"
 info="/tmp/image-$image.txt"
 
 rm -f "$info"
diff --git a/doc/dev-guide/book.toml b/doc/dev-guide/book.toml
index ca6d28278a..dd48698d4c 100644
--- a/doc/dev-guide/book.toml
+++ b/doc/dev-guide/book.toml
@@ -7,6 +7,6 @@ title = "The Rustup developer guide"
 
 [output.html]
 curly-quotes = true
-edit-url-template = "https://github.com/rust-lang/rustup/edit/master/doc/dev-guide/{path}"
-git-repository-url = "https://github.com/rust-lang/rustup/tree/master/doc/dev-guide"
+edit-url-template = "https://github.com/rust-lang/rustup/edit/HEAD/doc/dev-guide/{path}"
+git-repository-url = "https://github.com/rust-lang/rustup/tree/HEAD/doc/dev-guide"
 site-url = "https://rust-lang.github.io/rustup/dev-guide"
diff --git a/doc/dev-guide/src/release-process.md b/doc/dev-guide/src/release-process.md
index 0e555705eb..067b86dd4a 100644
--- a/doc/dev-guide/src/release-process.md
+++ b/doc/dev-guide/src/release-process.md
@@ -36,11 +36,11 @@ or an official [r]elease:
    2. Update `CHANGELOG.md` accordingly if necessary.
 2. [b/r] After merging the PR made in step 1, in a separate PR:
    1. Update the commit shasum in `rustup-init.sh` to match the latest commit
-      on `master`.
-3. [b/r] After merging the PR made in step 2, sync `master` to `stable` using
+      on `main`.
+3. [b/r] After merging the PR made in step 2, sync `main` to `stable` using
    `--ff-only`:
-   - `git fetch origin master:master`
-   - `git checkout stable && git merge --ff-only master`
+   - `git fetch origin main:main`
+   - `git checkout stable && git merge --ff-only main`
    - `git push origin HEAD:stable`
 4. [b/r] While you wait for green CI on `stable`, double-check the
    functionality of `rustup-init.sh` and `rustup-init` just in case.
diff --git a/doc/user-guide/book.toml b/doc/user-guide/book.toml
index 06f3c0d2dd..036b36628f 100644
--- a/doc/user-guide/book.toml
+++ b/doc/user-guide/book.toml
@@ -4,8 +4,8 @@ title = "The rustup book"
 
 [output.html]
 curly-quotes = true
-edit-url-template = "https://github.com/rust-lang/rustup/edit/master/doc/user-guide/{path}"
-git-repository-url = "https://github.com/rust-lang/rustup/tree/master/doc/user-guide"
+edit-url-template = "https://github.com/rust-lang/rustup/edit/HEAD/doc/user-guide/{path}"
+git-repository-url = "https://github.com/rust-lang/rustup/tree/HEAD/doc/user-guide"
 site-url = "https://rust-lang.github.io/rustup/"
 
 [output.html.redirect]
diff --git a/doc/user-guide/src/basics.md b/doc/user-guide/src/basics.md
index 7151dba455..89cb9ae115 100644
--- a/doc/user-guide/src/basics.md
+++ b/doc/user-guide/src/basics.md
@@ -30,7 +30,7 @@ info: downloading self-update
 
 ## Keeping `rustup` up to date
 
-If your `rustup` was built with the [no-self-update feature](https://github.com/rust-lang/rustup/blob/master/Cargo.toml#L25), it can not update
+If your `rustup` was built with the [no-self-update feature](https://github.com/rust-lang/rustup/blob/HEAD/Cargo.toml#L25), it can not update
 itself. This is not the default, and only versions of `rustup` built with
 `--no-default-features`, or obtained from a third-party distributor who has
 disabled it (such as NixOS).
diff --git a/doc/user-guide/src/index.md b/doc/user-guide/src/index.md
index 4427c809a9..8030f17ffa 100644
--- a/doc/user-guide/src/index.md
+++ b/doc/user-guide/src/index.md
@@ -16,7 +16,7 @@ The source code of rustup and this manual may be found at
 
 Release notes for rustup may be found in the [CHANGELOG].
 
-[CHANGELOG]: https://github.com/rust-lang/rustup/blob/master/CHANGELOG.md
+[CHANGELOG]: https://github.com/rust-lang/rustup/blob/HEAD/CHANGELOG.md
 [concepts]: concepts/index.md
 [installation]: installation/index.md
 [issue tracker]: https://github.com/rust-lang/rustup/issues