From 04d5d017c508376d789fe22b0453617c7e69a3b0 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 11 Dec 2017 22:16:35 +0200 Subject: [PATCH] Fix documentation on disabler behaviour with short circuiting. --- docs/markdown/Disabler.md | 3 ++- 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()