Merge branch 'main' into array-api

3 files changed, 17 insertions, 17 deletions

diff --git a/doc/source/dev/gitwash/development_setup.rst b/doc/source/dev/gitwash/development_setup.rst
index a7e9c28b9..2be7125da 100644
--- a/doc/source/dev/gitwash/development_setup.rst
+++ b/doc/source/dev/gitwash/development_setup.rst
@@ -100,8 +100,8 @@ Make the local copy
 #. Set up your repository so ``git pull`` pulls from ``upstream`` by
    default: ::
 
-    git config branch.master.remote upstream
-    git config branch.master.merge refs/heads/master
+    git config branch.main.remote upstream
+    git config branch.main.merge refs/heads/main
 
 ******************************************************************************
 Look it over
@@ -109,17 +109,17 @@ Look it over
 
 #. The branches shown by ``git branch -a`` will include
 
-   - the ``master`` branch you just cloned on your own machine
-   - the ``master`` branch from your fork on GitHub, which git named
+   - the ``main`` branch you just cloned on your own machine
+   - the ``main`` branch from your fork on GitHub, which git named
      ``origin`` by default
-   - the ``master`` branch on the the main NumPy repo, which you named
+   - the ``main`` branch on the the main NumPy repo, which you named
      ``upstream``.
 
    ::
 
-     master
-     remotes/origin/master
-     remotes/upstream/master
+     main
+     remotes/origin/main
+     remotes/upstream/main
 
    If ``upstream`` isn't there, it will be added after you access the
    NumPy repo with a command like ``git fetch`` or ``git pull``.
@@ -139,8 +139,8 @@ Look it over
     user.name=Your Name
     remote.origin.url=git@github.com:your-github-id/numpy.git
     remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
-    branch.master.remote=upstream
-    branch.master.merge=refs/heads/master
+    branch.main.remote=upstream
+    branch.main.merge=refs/heads/main
     remote.upstream.url=https://github.com/numpy/numpy.git
     remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/*
 
@@ -165,7 +165,7 @@ slightly. Instead of ::
 
 run ::
 
-  git clone git@github.com:numpy/numpy.git
+  git clone git@github.com:your-user-name/numpy.git
 
 and instead of showing an ``https`` URL,  ``git remote -v`` will show ::
 
diff --git a/doc/source/dev/gitwash/dot2_dot3.rst b/doc/source/dev/gitwash/dot2_dot3.rst
index 7759e2e60..30852b5ad 100644
--- a/doc/source/dev/gitwash/dot2_dot3.rst
+++ b/doc/source/dev/gitwash/dot2_dot3.rst
@@ -7,22 +7,22 @@
 Thanks to Yarik Halchenko for this explanation.
 
 Imagine a series of commits A, B, C, D...  Imagine that there are two
-branches, *topic* and *master*.  You branched *topic* off *master* when
-*master* was at commit 'E'.  The graph of the commits looks like this::
+branches, *topic* and *main*.  You branched *topic* off *main* when
+*main* was at commit 'E'.  The graph of the commits looks like this::
 
 
         A---B---C topic
         /
-   D---E---F---G master
+   D---E---F---G main
 
 Then::
 
-   git diff master..topic
+   git diff main..topic
 
 will output the difference from G to C (i.e. with effects of F and G),
 while::
 
-   git diff master...topic
+   git diff main...topic
 
 would output just differences in the topic branch (i.e. only A, B, and
 C).
diff --git a/doc/source/dev/gitwash/git_links.inc b/doc/source/dev/gitwash/git_links.inc
index 8032dca41..8126cf9ac 100644
--- a/doc/source/dev/gitwash/git_links.inc
+++ b/doc/source/dev/gitwash/git_links.inc
@@ -47,7 +47,7 @@
 .. _ipython git workflow: https://mail.python.org/pipermail/ipython-dev/2010-October/005632.html
 .. _git parable: http://tom.preston-werner.com/2009/05/19/the-git-parable.html
 .. _git foundation: http://matthew-brett.github.com/pydagogue/foundation.html
-.. _numpy/master: https://github.com/numpy/numpy
+.. _numpy/main: https://github.com/numpy/numpy
 .. _git cherry-pick: https://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html
 .. _git blame: https://www.kernel.org/pub/software/scm/git/docs/git-blame.html
 .. _this blog post: https://github.com/blog/612-introducing-github-compare-view