summaryrefslogtreecommitdiffstats
path: root/documentation/kernel-dev/concepts-appx.rst
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/kernel-dev/concepts-appx.rst')
-rw-r--r--documentation/kernel-dev/concepts-appx.rst4
1 files changed, 2 insertions, 2 deletions
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
211``kernel.org``, through a select group of features and ends with their 211``kernel.org``, through a select group of features and ends with their
212BSP-specific commits. In other words, the divisions of the kernel are 212BSP-specific commits. In other words, the divisions of the kernel are
213transparent and are not relevant to the developer on a day-to-day basis. 213transparent and are not relevant to the developer on a day-to-day basis.
214From the developer's perspective, this path is the "master" branch in 214From the developer's perspective, this path is the development branch.
215Git terms. The developer does not need to be aware of the existence of 215The developer does not need to be aware of the existence of
216any other branches at all. Of course, it can make sense to have these 216any other branches at all. Of course, it can make sense to have these
217branches in the tree, should a person decide to explore them. For 217branches in the tree, should a person decide to explore them. For
218example, a comparison between two BSPs at either the commit level or at 218example, a comparison between two BSPs at either the commit level or at