diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-11 22:16:35 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-11 22:21:39 +0200 |
| commit | 04d5d017c508376d789fe22b0453617c7e69a3b0 (patch) | |
| tree | 21765ef976f12ee5a3f2a4a7b9792cc93963fa16 | |
| parent | 448710ba96195b857502fa07dd691874d3d47c6f (diff) | |
| download | meson-04d5d017c508376d789fe22b0453617c7e69a3b0.tar.gz | |
Fix documentation on disabler behaviour with short circuiting.
| -rw-r--r-- | docs/markdown/Disabler.md | 3 | ||||
| -rw-r--r-- | docs/markdown/Reference-manual.md | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/markdown/Disabler.md b/docs/markdown/Disabler.md index 2d50c5cf8..bd2b32223 100644 --- a/docs/markdown/Disabler.md +++ b/docs/markdown/Disabler.md @@ -45,7 +45,8 @@ object then ```meson d2 = some_func(d) # value of d2 will be disabler -d3 = true or d2 # value of d3 will be disabler +d3 = true or d2 # value of d3 will be true because of short-circuiting +d4 = false or d2 # value of d4 will be disabler if d # neither branch is evaluated ``` diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 03660f55a..dcedccdd5 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -328,7 +328,7 @@ The returned object also has methods that are documented in the ### disabler() -Returns a [disabler object]((#disabler-object)). Added in 0.44.0. +Returns a [disabler object](#disabler-object). Added in 0.44.0. ### error() |