subtree updatesnanbield

meta-arm: 9a4ae38e84..150169d01f:
  Jon Mason (1):
        arm/linux-yocto: backport patch to fix 6.5.13 networking issues

meta-raspberrypi: fde68b24f0..fd79e74cbc:
  Khem Raj (2):
        linux-raspberrypi_6.1.bb: Upgrade to 6.1.74
        linux-raspberrypi: Upgrade to 6.1.77

  Martin Jansa (1):
        u-boot: backport one commit from v2024.01 to fix booting from uSD

poky: 1a5c00f00c..7b8aa378d0:
  Alex Kiernan (1):
        wireless-regdb: Upgrade 2023.09.01 -> 2024.01.23

  Alexander Kanavin (3):
        linux-firmware: upgrade 20231211 -> 20240220
        sdk-manual: correctly describe separate build-sysroots tasks in direct sdk workflows
        dev-manual: improve descriptions of 'bitbake -S printdiff'

  BELOUARGA Mohamed (1):
        ref-manual: add documentation of the variable SPDX_NAMESPACE_PREFIX

  Bruce Ashfield (2):
        linux-yocto/6.1: update to v6.1.78
        linux-yocto/6.1: update CVE exclusions

  Claus Stovgaard (1):
        wpa-supplicant: Fix CVE-2023-52160

  Dhairya Nagodra (2):
        glibc: Remove duplicate entry for CVE-2023-4527
        xwayland: upgrade 23.2.3 -> 23.2.4

  Geoff Parker (1):
        ref-manual: variables: adding multiple groups in GROUPADD_PARAM

  Johan Bezem (1):
        ref-manual: variables: correct sdk installation default path

  Khem Raj (1):
        core-image-ptest: Increase disk size to 1.5G for strace ptest image

  Lee Chee Yang (3):
        libxml2: upgrade to 2.11.7
        openssl: upgrade to 3.1.5
        migration-guides: add release notes for 4.0.17

  Luca Ceresoli (2):
        ref-manual: tasks: do_cleanall: recommend using '-f' instead
        ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate

  Martin Jansa (1):
        contributor-guide: be more specific about meta-* trees

  Michael Halstead (1):
        yocto-uninative: Update to 4.4 for glibc 2.39

  Michael Opdenacker (13):
        ref-manual: system-requirements: update packages to build docs
        ref-manual: release-process: grammar fix
        manuals: suppress excess use of "following" word
        dev-manual: packages: clarify shared PR service constraint
        dev-manual: packages: need enough free space
        dev-manual: packages: fix capitalization
        manuals: document VIRTUAL-RUNTIME variables
        manuals: add initial stylechecks with Vale
        profile-manual: usage.rst: formatting fixes
        manuals: use "manual page(s)"
        profile-manual: usage.rst: fix reference to bug report
        documentation: Makefile: remove releases.rst in "make clean"
        profile-manual: usage.rst: further style improvements

  Munehisa Kamata (1):
        kernel.bbclass: Set pkg-config variables for building modules

  Pavel Zhukov (1):
        mdadm: Disable ptests

  Priyal Doshi (1):
        tzdata : Upgrade to 2024a

  Ross Burton (4):
        curl: improve run-ptest
        curl: increase test timeouts
        openssl: fix crash on aarch64 if BTI is enabled but no Crypto instructions
        gstreamer1.0: skip a test that is known to be flaky

  Simone Weiß (4):
        dev-manual: Rephrase spdx creation
        gnutls: Upgrade 3.8.2 -> 3.8.3
        contributor-guide: add notes for tests
        cve-check: Log if CVE_STATUS set but not reported for component

  Soumya Sambu (1):
        bind: Upgrade 9.18.21 -> 9.18.24

  Steve Sakoman (3):
        poky.conf: bump version for 4.3.4 release
        build-appliance-image: Update to nanbield head revision
        build-appliance-image: Update to nanbield head revision

  Tim Orling (1):
        vim: upgrade v9.0.2130 -> v9.0.2190

  Wang Mingyu (3):
        python3-jinja2: upgrade 3.1.2 -> 3.1.3
        bind: upgrade 9.18.20 -> 9.18.21
        gnutls: upgrade 3.8.1 -> 3.8.2

  Yoann Congal (6):
        cve-update-nvd2-native: Fix typo in comment
        cve-update-nvd2-native: Add an age threshold for incremental update
        cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition
        cve-update-nvd2-native: nvd_request_next: Improve comment
        cve-update-nvd2-native: Fix CVE configuration update
        cve-update-nvd2-native: Remove rejected CVE from database

Change-Id: I041c2504ee3a1b3275770a6949606db7f6e22ee0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

1 files changed, 10 insertions, 10 deletions

diff --git a/poky/documentation/overview-manual/concepts.rst b/poky/documentation/overview-manual/concepts.rst
index d335c2fcdd..62f2327a7e 100644
--- a/poky/documentation/overview-manual/concepts.rst
+++ b/poky/documentation/overview-manual/concepts.rst
@@ -37,7 +37,7 @@ to each data source as a layer. For information on layers, see the
 ":ref:`dev-manual/layers:understanding and creating layers`"
 section of the Yocto Project Development Tasks Manual.
 
-Following are some brief details on these core components. For
+Here are some brief details on these core components. For
 additional information on how these components interact during a build,
 see the
 ":ref:`overview-manual/concepts:openembedded build system concepts`"
@@ -1321,7 +1321,7 @@ can initialize the environment before using the tools.
 All the output files for an SDK are written to the ``deploy/sdk`` folder
 inside the :term:`Build Directory` as shown in the previous figure. Depending
 on the type of SDK, there are several variables to configure these files.
-Here are the variables associated with an extensible SDK:
+The variables associated with an extensible SDK are:
 
 -  :term:`DEPLOY_DIR`: Points to
    the ``deploy`` directory.
@@ -1375,7 +1375,7 @@ This next list, shows the variables associated with a standard SDK:
    Lists packages that make up the target part of the SDK (i.e. the part
    built for the target hardware).
 
--  :term:`SDKPATH`: Defines the
+-  :term:`SDKPATHINSTALL`: Defines the
    default SDK installation path offered by the installation script.
 
 -  :term:`SDK_HOST_MANIFEST`:
@@ -2238,7 +2238,7 @@ which is integrating ``sayhello`` in our root file system:
 #.  Add ``sayhello`` to :term:`IMAGE_INSTALL` to integrate it into
     the root file system
 
-The following are the contents of ``libhello/Makefile``::
+The contents of ``libhello/Makefile`` are::
 
    LIB=libhello.so
 
@@ -2266,7 +2266,7 @@ The following are the contents of ``libhello/Makefile``::
    and ``CFLAGS`` as BitBake will set them as environment variables according
    to your build configuration.
 
-The following are the contents of ``libhello/hellolib.h``::
+The contents of ``libhello/hellolib.h`` are::
 
    #ifndef HELLOLIB_H
    #define HELLOLIB_H
@@ -2275,7 +2275,7 @@ The following are the contents of ``libhello/hellolib.h``::
 
    #endif
 
-The following are the contents of ``libhello/hellolib.c``::
+The contents of ``libhello/hellolib.c`` are::
 
    #include <stdio.h>
 
@@ -2283,7 +2283,7 @@ The following are the contents of ``libhello/hellolib.c``::
       puts("Hello from a Yocto demo \n");
    }
 
-The following are the contents of ``sayhello/Makefile``::
+The contents of ``sayhello/Makefile`` are::
 
    EXEC=sayhello
    LDFLAGS += -lhello
@@ -2296,7 +2296,7 @@ The following are the contents of ``sayhello/Makefile``::
    clean:
       rm -rf $(EXEC) *.o
 
-The following are the contents of ``sayhello/sayhello.c``::
+The contents of ``sayhello/sayhello.c`` are::
 
    #include <hellolib.h>
 
@@ -2305,7 +2305,7 @@ The following are the contents of ``sayhello/sayhello.c``::
       return 0;
    }
 
-The following are the contents of ``libhello_0.1.bb``::
+The contents of ``libhello_0.1.bb`` are::
 
    SUMMARY = "Hello demo library"
    DESCRIPTION = "Hello shared library used in Yocto demo"
@@ -2328,7 +2328,7 @@ The following are the contents of ``libhello_0.1.bb``::
       oe_soinstall ${PN}.so.${PV} ${D}${libdir}
    }
 
-The following are the contents of ``sayhello_0.1.bb``::
+The contents of ``sayhello_0.1.bb`` are::
 
    SUMMARY = "SayHello demo"
    DESCRIPTION = "SayHello project used in Yocto demo"