From e71983bc7dba65df6273faaad92c5a43afded0ff Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 6 Dec 2021 16:04:01 +0100 Subject: make the documentation a bit more inclusive Except the name of variables which can't be changed only in the documentation for obvious reasons and workflow or developement explanations around the use of the "master" branch which cannot be replaced with "development" branch instead, most of the non-inclusive words that appear in https://inclusivenaming.org/word-lists/tier-1/ should have been replaced in this patch. (From yocto-docs rev: 2755f35060084f7af356091de9dc144f85530fe2) Signed-off-by: Quentin Schulz Reviewed-by: Michael Opdenacker Signed-off-by: Richard Purdie --- documentation/kernel-dev/concepts-appx.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'documentation/kernel-dev/concepts-appx.rst') diff --git a/documentation/kernel-dev/concepts-appx.rst b/documentation/kernel-dev/concepts-appx.rst index cf2e75d853..910318e0f9 100644 --- a/documentation/kernel-dev/concepts-appx.rst +++ b/documentation/kernel-dev/concepts-appx.rst @@ -211,8 +211,8 @@ view, there is a linear path that travels from the baseline ``kernel.org``, through a select group of features and ends with their BSP-specific commits. In other words, the divisions of the kernel are transparent and are not relevant to the developer on a day-to-day basis. -From the developer's perspective, this path is the "master" branch in -Git terms. The developer does not need to be aware of the existence of +From the developer's perspective, this path is the development branch. +The developer does not need to be aware of the existence of any other branches at all. Of course, it can make sense to have these branches in the tree, should a person decide to explore them. For example, a comparison between two BSPs at either the commit level or at -- cgit v1.2.3-54-g00ecf