Build: Rename master to main across the repository

The default branch was updated, this updates the remaining occurrences in code
& comments.

Closes gh-4838

(cherry picked from commit 8ae477a432f0924cd4bd3bdeaef2c4c15e483a8f)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 18c6bc80250ddff3e0dec5aa1039cd36a219c046..71fc258e8ba4f8f1b54ec844a46163902b43db7a 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -85,16 +85,16 @@ Change directory to the newly created dir jquery/
 $ cd jquery
 ```
 
-Add the jQuery master as a remote. I label mine "upstream"
+Add the jQuery main as a remote. I label mine "upstream"
 
 ```bash
 $ git remote add upstream git://github.com/jquery/jquery.git
 ```
 
-Get in the habit of pulling in the "upstream" master to stay up to date as jQuery receives new commits
+Get in the habit of pulling in the "upstream" main to stay up to date as jQuery receives new commits
 
 ```bash
-$ git pull upstream master
+$ git pull upstream main
 ```
 
 Run the build script

diff --git a/README.md b/README.md
index fd6630eaa3efbe95d930334fdcf465e70a29cf4f..f36cefef28aa46b878c28a672bae772f1be61309 100644 (file)
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Some example modules that can be excluded are:
 
 As a special case, you may also replace Sizzle by using a special flag `grunt custom:-sizzle`.
 
-- **sizzle**: The Sizzle selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/master/src/selector-native.js) file for details.
+- **sizzle**: The Sizzle selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/main/src/selector-native.js) file for details.
 
 *Note*: Excluding Sizzle will also exclude all jQuery selector extensions (such as `effects/animatedSelector` and `css/hiddenVisibleSelectors`).
 
@@ -227,7 +227,7 @@ As the source code is handled by the Git version control system, it's useful to
 If you want to purge your working directory back to the status of upstream, the following commands can be used (remember everything you've worked on is gone after these):
 
 ```bash
-git reset --hard upstream/master
+git reset --hard upstream/main
 git clean -fdx
 ```
 
@@ -285,7 +285,7 @@ throws( block, [expected], [message] );
 ```
 
 
-Test Suite Convenience Methods Reference (See [test/data/testinit.js](https://github.com/jquery/jquery/blob/master/test/data/testinit.js))
+Test Suite Convenience Methods Reference (See [test/data/testinit.js](https://github.com/jquery/jquery/blob/main/test/data/testinit.js))
 ------------------------------
 
 ### Returns an array of elements with the given IDs ###

diff --git a/build/release/dist.js b/build/release/dist.js
index 2f9078d8ce6d42c6da1ced00328de5035f2f37e2..3bbccd41aeaa6e6cc7df063b5d61141589a5bf85 100644 (file)
--- a/build/release/dist.js
+++ b/build/release/dist.js
@@ -30,9 +30,9 @@ module.exports = function( Release, files, complete ) {
                Release.exec( `git clone ${ distRemote } ${ Release.dir.dist }`,
                        "Error cloning repo." );
 
-               // Distribution always works on master
+               // Distribution always works on main
                Release.chdir( Release.dir.dist );
-               Release.exec( "git checkout master", "Error checking out branch." );
+               Release.exec( "git checkout main", "Error checking out branch." );
                console.log();
        }
 
@@ -144,8 +144,8 @@ module.exports = function( Release, files, complete ) {
                Release.exec(
                        `git push ${
                                Release.isTest ? " --dry-run" : ""
-                       } ${ distRemote } master --tags`,
-                       "Error pushing master and tags to git repo."
+                       } ${ distRemote } main --tags`,
+                       "Error pushing main and tags to git repo."
                );
 
                // Set repo for npm publish

diff --git a/package.json b/package.json
index 3db6d1b580f22ee2ff5eb10735475c4b55b49a6a..65cd587bdd741f7bd1bb369ab2d18ee74fc12370 100644 (file)
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://jquery.com",
   "author": {
     "name": "OpenJS Foundation and other contributors",
-    "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
+    "url": "https://github.com/jquery/jquery/blob/main/AUTHORS.txt"
   },
   "repository": {
     "type": "git",

diff --git a/test/unit/offset.js b/test/unit/offset.js
index 5607ddaf96a5f48ddbd5d13ec1454ce9d9acf9b6..814de29a9ab639ecf33e77f3cffb5d570f35e4bb 100644 (file)
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -69,7 +69,7 @@ QUnit.test( "disconnected element", function( assert ) {
 
        var result = jQuery( document.createElement( "div" ) ).offset();
 
-       // These tests are solely for master/compat consistency
+       // These tests are solely for main/compat consistency
        // Retrieving offset on disconnected/hidden elements is not officially
        // valid input, but will return zeros for back-compat
        assert.equal( result.top, 0, "Retrieving offset on disconnected elements returns zeros (gh-2310)" );
@@ -86,7 +86,7 @@ QUnit.test( "hidden (display: none) element", function( assert ) {
 
        node.remove();
 
-       // These tests are solely for master/compat consistency
+       // These tests are solely for main/compat consistency
        // Retrieving offset on disconnected/hidden elements is not officially
        // valid input, but will return zeros for back-compat
        assert.equal( result.top, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" );
@@ -484,7 +484,7 @@ testIframe( "scroll", "offset/scroll.html", function( assert, $, win ) {
        assert.equal( $( "#scroll-1-1" ).offset().top, 11, "jQuery('#scroll-1-1').offset().top" );
        assert.equal( $( "#scroll-1-1" ).offset().left, 11, "jQuery('#scroll-1-1').offset().left" );
 
-       // These tests are solely for master/compat consistency
+       // These tests are solely for main/compat consistency
        // Retrieving offset on disconnected/hidden elements is not officially
        // valid input, but will return zeros for back-compat
        assert.equal( $( "#hidden" ).offset().top, 0, "Hidden elements do not subtract scroll" );