doc: update inclusive language terms in docs

Replace white/black master/slave terms with alternatives.  We're not
changing "master" when used in the context of GitHub branches.  GitHub
advises they have a plan to help this transition.  In the text body we
rever to the "master" branch as the "main" branch, but leave any urls or
code-block commands still using "master".

Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
This commit is contained in:
David B. Kinder
2020-08-31 15:40:08 -07:00
committed by David Kinder
parent 6ddf793f16
commit fc1fc0eb8d
9 changed files with 35 additions and 34 deletions

View File

@@ -112,7 +112,8 @@ This concludes setting up of Service VM and preparing it to boot ACRN hypervisor
Install ACRN Hypervisor
***********************
1. Clone ACRN repo with ``tag: acrn-2020w19.5-140000p`` or latest master. Below steps show our tested version,
1. Clone ACRN repo with ``tag: acrn-2020w19.5-140000p`` or the latest
(main) branch. Below steps show our tested version,
.. code-block:: none
@@ -244,7 +245,7 @@ Bring-up User VM (L2 Guest)
3. Install latest `IASL tool <https://acpica.org/downloads>`_ and copy the binary to ``/usr/sbin/iasl``.
For this setup, used IASL 20200326 version but anything after 20190215 should be good.
4. Clone latest stable version or master and build ACRN User VM Kernel.
4. Clone latest stable version or main branch and build ACRN User VM Kernel.
.. code-block:: none

View File

@@ -280,7 +280,7 @@ folder. Note that there's no direct selection to go to a newer version
from an older one, without going to ``latest`` first.
By default, doc build and publishing assumes we're generating
documentation for the master branch and publishing to the ``/latest/``
documentation for the main branch and publishing to the ``/latest/``
area on https://projectacrn.github.io. When we're generating the
documentation for a tagged version (e.g., 0.2), check out that version
of the repo, and add some extra flags to the make commands:

View File

@@ -36,7 +36,7 @@ Build Celadon from source
<https://01.org/projectceladon/documentation/getting-started/build-source>`__ guide
to set up the Celadon project source code.
.. note:: The master branch is based on the Google Android 10
.. note:: The main branch is based on the Google Android 10
pre-Production Early Release. Use the following command to specify a
stable Celadon branch based on the Google Android 9 source code in order
to apply those patches in the :ref:`ACRN patch list`::