Merge pull request #1683 from ssurbhi560/change-master-to-main

Author: beckermr

src/README.md

@@ -11,5 +11,5 @@ To build the docs locally, follow the steps mentioned below:
 
 Documentation update PRs should only change the files in ``src``. 
 
-Once the PR is merged to ``master``, you can find the auto-generated html files in ``docs`` directory.
+Once the PR is merged to ``main``, you can find the auto-generated html files in ``docs`` directory.
 

src/maintainer/adding_pkgs.rst

@@ -166,21 +166,21 @@ much easier to review. The following steps will reset your fork of
 staged-recipes and should be executed from within a clone of your forked
 staged-recipes directory.
 
-#. Checkout your master branch::
+#. Checkout your main branch::
 
-     git checkout master
+     git checkout main
 
 #. Define the conda-forge/staged-recipes repository as ``upstream`` (if you have not already done so).::
 
      git remote add upstream https://github.com/conda-forge/staged-recipes.git
 
-#. Pull all of the upstream commits from the upstream master branch.::
+#. Pull all of the upstream commits from the upstream main branch.::
 
-     git pull --rebase upstream master
+     git pull --rebase upstream main
 
 #. Push all of the changes to your fork on GitHub (make sure there are not any changes on GitHub that you need because they will be overwritten).::
 
-     git push origin master --force
+     git push origin main --force
 
 Once these steps are complete, you can continue with the steps in :ref:`staging_steps` to stage your new package recipe using your existing staged-recipes fork.
 

src/maintainer/conda_forge_yml.rst

@@ -269,10 +269,10 @@ defaults are as follows:
       # repository name, usually filled in automatically
       repo_name: ""
       # branch name to execute on
-      branch_name: master
+      branch_name: main
       # branch name to use for rerender+webservices github actions and
       # conda-forge-ci-setup-feedstock references
-      tooling_branch_name: master
+      tooling_branch_name: main
 
 .. _idle_timeout_minutes:
 
@@ -520,11 +520,11 @@ This parameter restricts uploading access on work from certain branches of the
 same repo. Only the branch listed in ``upload_on_branch`` will trigger uploading
 of packages to the target channel. The default is to skip this check if the key
 ``upload_on_branch`` is not in ``conda-forge.yml``. To restrict uploads to the
-master branch:
+main branch:
 
 .. code-block:: yaml
 
-    upload_on_branch: master
+    upload_on_branch: main
 
 .. _win:
 

src/maintainer/updating_pkgs.rst

@@ -80,10 +80,10 @@ Here we assume that you would like to update the feedstock ``<feedstock>``. Feed
 
    This step is only required if you have forked some time ago and your fork is missing commits from the feedstock at conda-forge.
 
-   - Make sure you are on the master branch: ``git checkout master``
+   - Make sure you are on the main branch: ``git checkout main``
    - Register conda-forge's feedstock with ``git remote add upstream https://github.com/conda-forge/<feedstock>``
    - Fetch the latest updates with ``git fetch upstream``
-   - Pull in the latest changes into your master branch: ``git rebase upstream/master``
+   - Pull in the latest changes into your main branch: ``git rebase upstream/main``
 
 #. Creating your changes in a new branch
 

src/user/contributing.rst

@@ -42,7 +42,7 @@ We are glad to know that you would like to contribute to the ``conda-forge`` doc
 2. `Clone <https://help.github.com/articles/cloning-a-repository/>`_ this fork onto your computer.
 3. `Check out
    <https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging>`_
-   a new branch deriving from ``master`` to do your work.
+   a new branch deriving from ``main`` to do your work.
 4. Make and `commit
    <https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository>`_
    your changes.