summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-11 14:06:35 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-11 14:06:35 +0900
commita580a4a032c2e492c5287a976ced1db178467549 (patch)
tree7acb9e0804fa1cb5e609800210f9c22f55e70f03
parent176017f990b30be3d5713d7c7ba94a30be2a5e78 (diff)
downloadbuildstream-a580a4a032c2e492c5287a976ced1db178467549.tar.gz
doc/source/formatintro.rst: Remove reference to architecture conditionals
-rw-r--r--doc/source/formatintro.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/source/formatintro.rst b/doc/source/formatintro.rst
index 6e358573d..81003cf6d 100644
--- a/doc/source/formatintro.rst
+++ b/doc/source/formatintro.rst
@@ -57,6 +57,8 @@ a project relative path to the element one depends on must be provided.
Directives
----------
+.. _format_directives_conditional:
+
(?) Conditionals
~~~~~~~~~~~~~~~~
The ``(?)`` directive allows expression of conditional statements which
@@ -122,6 +124,8 @@ Compound conditionals are also allowed.
enable-debug: True
+.. _format_directives_assertion:
+
(!) Assertions
~~~~~~~~~~~~~~
Assertions allow the project author to abort processing and present
@@ -189,6 +193,6 @@ the given element's default.
5. Element Declarations
~~~~~~~~~~~~~~~~~~~~~~~
-Finally, after having resolved any `Architecture Conditionals`_
+Finally, after having resolved any :ref:`conditionals <format_directives_conditional>`
in the parsing phase of loading element declarations; the configurations specified in a
``.bst`` file have the last word on any configuration in the data model.