summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-02-19 15:54:06 +0000
committerJürg Billeter <j@bitron.ch>2019-02-20 06:06:53 +0000
commitf6b8ac57cce43f5a3dcac0e561ffe95095cd431a (patch)
tree9eb39c906dc957862a88824ce688c20973c790d1
parentd7596d1c42ed44557eb4c58f8bb068b8f9502d49 (diff)
downloadbuildstream-f6b8ac57cce43f5a3dcac0e561ffe95095cd431a.tar.gz
doc/./arch_data_model:edit comp stages for clarity
-rw-r--r--doc/source/arch_data_model.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/arch_data_model.rst b/doc/source/arch_data_model.rst
index a903687af..6e78d3a67 100644
--- a/doc/source/arch_data_model.rst
+++ b/doc/source/arch_data_model.rst
@@ -72,9 +72,10 @@ deal of configurations understood by the *Element* is also understood by the cor
has default configurations built into BuildStream and configurable with the project
configuration. These include values such as *variables*, *environment*, *sandbox*, etc.
-As shown above, composition is performed in two stages, as we only need to composite
-the data from the toplevel element declaration against the composition of previous
-stages every time we instantiate an element.
+As shown above, composition is performed in two stages for each element. First
+we compose everything below the line, this happens just once per 'kind' of
+element - the result is re-used. Secondly, we compose the element declaration
+on top.
Source