docs: Change a number of 'master' branch refers to 'main'
Now that we use 'main' for git development, update the docs to reflect
or point there instead of 'master'.
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
@ -11,7 +11,7 @@ there is no LICENSE file or way to put a LICENSE file there, so we describe the
@@ -11,7 +11,7 @@ there is no LICENSE file or way to put a LICENSE file there, so we describe the
@ -19,7 +19,7 @@ Licensing is very important to open source projects. It helps ensure the
@@ -19,7 +19,7 @@ Licensing is very important to open source projects. It helps ensure the
software continues to be available under the terms that the author desired.
commit(s) to fix review issues. In your development repo::
git fetch --all
git rebase --ignore-whitespace upstream/master
git rebase --ignore-whitespace upstream/main
The ``--ignore-whitespace`` option stops ``git apply`` (called by rebase)
from changing any whitespace. Continuing::
@ -586,7 +586,7 @@ The description body of the commit message must include:
@@ -586,7 +586,7 @@ The description body of the commit message must include:
* **how** you know it works -- for example, which tests you ran.
For examples of accepted commit messages, you can refer to the Zephyr GitHub
@ -23,7 +23,7 @@ submitting a change or an enhancement to any Zephyr component, a developer
@@ -23,7 +23,7 @@ submitting a change or an enhancement to any Zephyr component, a developer
should use GitHub. GitHub automatically assigns a responsible reviewer on a
component basis, as defined in the :zephyr_file:`CODEOWNERS` file stored with the code
tree in the Zephyr project repository. A limited set of release managers are
allowed to merge a pull request into the master branch once reviews are complete.
allowed to merge a pull request into the main branch once reviews are complete.
@ -47,7 +47,7 @@ Contributors are granted the following rights and responsibilities:
@@ -47,7 +47,7 @@ Contributors are granted the following rights and responsibilities:
* Responsibility to provide constructive advice whenever participating in
discussions and in the review of contributions.
* Responsibility to follow the project’s code of conduct
@ -158,5 +158,5 @@ and main stakeholders of the project can make progress on.
@@ -158,5 +158,5 @@ and main stakeholders of the project can make progress on.
Items labeled as ``features`` are short or long term release items that shall
@ -883,7 +883,7 @@ Offensive terms do not create an inclusive community environment and therefore
@@ -883,7 +883,7 @@ Offensive terms do not create an inclusive community environment and therefore
violate the Zephyr Project `Code of Conduct`_. This coding rule was inspired by
a similar rule in `Linux`_.
.._Code of Conduct: https://github.com/zephyrproject-rtos/zephyr/blob/master/CODE_OF_CONDUCT.md
.._Code of Conduct: https://github.com/zephyrproject-rtos/zephyr/blob/main/CODE_OF_CONDUCT.md
@ -543,4 +543,4 @@ Currently only the MCUboot bootloader is supported. See :ref:`mcuboot` for more
@@ -543,4 +543,4 @@ Currently only the MCUboot bootloader is supported. See :ref:`mcuboot` for more
Welcome to the Zephyr Project's documentation for version |version|.
Documentation for the latest (master) development branch of Zephyr
Documentation for the latest (main) development branch of Zephyr
can be found at https://docs.zephyrproject.org/
..only:: (development or daily)
**Welcome to the Zephyr Project's documentation
for the master tree under development** (version |version|).
for the main tree under development** (version |version|).
Use the version selection menu on the left to view
documentation for a specific version of Zephyr.
@ -30,7 +30,7 @@ imports or reuses packages, scripts, and other files that use other
@@ -30,7 +30,7 @@ imports or reuses packages, scripts, and other files that use other
licensing, as described in :ref:`Zephyr_Licensing`.
@ -31,7 +31,7 @@ imported or reused components of the Zephyr project that use other licensing,
@@ -31,7 +31,7 @@ imported or reused components of the Zephyr project that use other licensing,