summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-05-28 07:42:34 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-05-28 07:42:34 +0000
commit2b409a2b7c9cbd46d723f0e4f8588bbe6cbfce87 (patch)
tree47988bf4eed6e3804bb17452ddbacfc5d2d61f20
parent27ac938a668e9c9dac1af59a86a1f20138f96fe8 (diff)
parent692df79157720d81cd1c8beb76ce5610cb62d049 (diff)
downloadbuildstream-2b409a2b7c9cbd46d723f0e4f8588bbe6cbfce87.tar.gz
Merge branch 'tristan/junction-docs-touchup' into 'master'
doc/source/format_declaring.rst: Fixing spelling mistake See merge request BuildStream/buildstream!1940
-rw-r--r--doc/source/format_declaring.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/format_declaring.rst b/doc/source/format_declaring.rst
index 6805c249b..7514d43e1 100644
--- a/doc/source/format_declaring.rst
+++ b/doc/source/format_declaring.rst
@@ -408,7 +408,7 @@ For example, the following is logically same as the example above:
.. code:: yaml
build-depends:
- - baseproject.bst:foo.bst
+ - baseproject.bst:foo.bst
Similarly, you can also refer to cross-junction elements via the ``filename``
attribute, like so:
@@ -416,12 +416,12 @@ attribute, like so:
.. code:: yaml
depends:
- - filename: baseproject.bst:foo.bst
- type: build
+ - filename: baseproject.bst:foo.bst
+ type: build
.. note::
- BuildStream does not allow recursice lookups for junction elements. If a
+ BuildStream does not allow recursive lookups for junction elements. If a
filename contains more than one ``:`` (colon) character, an error will be
raised. See :ref:`nested junctions <core_junction_nested>` for more details
on nested junctions.