diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 1ce323e7a0..3948c64377 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -810,7 +810,8 @@
recipe listed in
DEPENDS.
Population of this directory is handled through shared state, while
- the path is specified by the COMPONENTS_DIR
+ the path is specified by the
+ COMPONENTS_DIR
variable. Apart from a few unusual circumstances, handling of the
sysroots-components directory should be
automatic, and recipes should not directly reference
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 0289ad183f..2b5f0e1494 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -2208,6 +2208,27 @@
+ COMPONENTS_DIR
+
+ COMPONENTS_DIR[doc] = "Stores sysroot components for each recipe."
+
+
+
+
+ Stores sysroot components for each recipe.
+ The OpenEmbedded build system uses
+ COMPONENTS_DIR when constructing
+ recipe-specific sysroots for other recipes.
+
+
+
+ The default is
+ "${STAGING_DIR}-components."
+ (i.e. "${TMPDIR}/sysroots-components".
+
+
+
+
CONF_VERSION
CONF_VERSION[doc] = "Tracks the version of local.conf. Increased each time build/conf/ changes incompatibly."