switch default git branch name to main

The default git branch of the main DPDK repository has been renamed
from master to main.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 08fea5d..9988bf8 100755 (executable)
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -16,7 +16,7 @@ print_usage () {
        by latest git commits limited with -n option, or commits in the git
        range specified with -r option.
        e.g. To check only the last commit, ‘-n1’ or ‘-r@~..’ is used.
-       If no range provided, default is origin/master..HEAD.
+       If no range provided, default is origin/main..HEAD.
        END_OF_HELP
 }
 
@@ -27,7 +27,7 @@ selfdir=$(dirname $(readlink -f $0))
 # and allows for specifying the patches to check by passing -nX or -r range.
 # The old format allows for specifying patches by passing -X or range
 # as the first argument.
-range=${1:-origin/master..}
+range=${1:-origin/main..}
 
 if [ "$range" = '--help' ] ; then
        print_usage

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index b5191df..78a408e 100755 (executable)
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -45,7 +45,7 @@ print_usage () {
 
        The patches to check can be from stdin, files specified on the command line,
        latest git commits limited with -n option, or commits in the git range
-       specified with -r option (default: "origin/master..").
+       specified with -r option (default: "origin/main..").
        END_OF_HELP
 }
 
@@ -200,7 +200,7 @@ check_internal_tags() { # <patch>
 }
 
 number=0
-range='origin/master..'
+range='origin/main..'
 quiet=false
 verbose=false
 while getopts hn:qr:v ARG ; do

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index de493a9..425bb87 100644 (file)
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -118,7 +118,8 @@ The proposer should justify the need for a new sub-tree and should have demonstr
 The maintainer should be confirmed by an ``ack`` from an existing tree maintainer.
 Disagreements on trees or maintainers can be brought to the Technical Board.
 
-The backup maintainer for the master tree should be selected from the existing sub-tree maintainers from the project.
+The backup maintainer for the main tree should be selected
+from the existing sub-tree maintainers of the project.
 The backup maintainer for a sub-tree should be selected from among the component maintainers within that sub-tree.
 
 
@@ -319,7 +320,7 @@ For example::
 Patch for Stable Releases
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-All fix patches to the master branch that are candidates for backporting
+All fix patches to the main branch that are candidates for backporting
 should also be CCed to the `stable@dpdk.org <https://mails.dpdk.org/listinfo/stable>`_
 mailing list.
 In the commit message body the Cc: stable@dpdk.org should be inserted as follows::

diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
index 890bbec..20b0816 100644 (file)
--- a/doc/guides/contributing/stable.rst
+++ b/doc/guides/contributing/stable.rst
@@ -27,8 +27,9 @@ Stable Releases
 
 Any release of DPDK can be designated as a Stable Release if a
 maintainer volunteers to maintain it and there is a commitment from major
-contributors to validate it before releases. If a release is to be designated
-as a Stable Release, it should be done by 1 month after the master release.
+contributors to validate it before releases.
+If a version is to be a "Stable Release", it should be designated as such
+within one month of that version being initially released.
 
 A Stable Release is used to backport fixes from an ``N`` release back to an
 ``N-1`` release, for example, from 16.11 to 16.07.
@@ -72,7 +73,7 @@ point the LTS branch will no longer be maintained with no further releases.
 What changes should be backported
 ---------------------------------
 
-Backporting should be limited to bug fixes. All patches accepted on the master
+Backporting should be limited to bug fixes. All patches accepted on the main
 branch with a Fixes: tag should be backported to the relevant stable/LTS
 branches, unless the submitter indicates otherwise. If there are exceptions,
 they will be discussed on the mailing lists.
@@ -107,7 +108,7 @@ The Stable Mailing List
 The Stable and LTS release are coordinated on the stable@dpdk.org mailing
 list.
 
-All fix patches to the master branch that are candidates for backporting
+All fix patches to the main branch that are candidates for backporting
 should also be CCed to the `stable@dpdk.org <https://mails.dpdk.org/listinfo/stable>`_
 mailing list.