summaryrefslogtreecommitdiff
path: root/docs/language-reference/05-expressions.md
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-12-20 17:25:14 -0500
committerGitHub <noreply@github.com>2021-12-20 17:25:14 -0500
commit407f1809821086afc520694e0a34e264679a6bb5 (patch)
tree5dcbc78f6349dc7d181ba279182b14327394b514 /docs/language-reference/05-expressions.md
parent1efa01f584924149a2bb957d1092ca29e4feac37 (diff)
Hotfix/doc typos3 (#2065)
* #include an absolute path didn't work - because paths were taken to always be relative. * Fix typos in docs. * Fix some typos.
Diffstat (limited to 'docs/language-reference/05-expressions.md')
-rw-r--r--docs/language-reference/05-expressions.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/language-reference/05-expressions.md b/docs/language-reference/05-expressions.md
index 4879d5a5f..ea5c37ee0 100644
--- a/docs/language-reference/05-expressions.md
+++ b/docs/language-reference/05-expressions.md
@@ -345,7 +345,7 @@ useNegative ? -1.0f : 1.0f
The condition may be either a single value of type `bool`, or a vector of `bool`.
When a vector of `bool` is used, the two values being selected between must be vectors, and selection is performed component-wise.
-> Note: Unlike C, C++, GLSL, and most other C-family languages, Slang currently follows the precedent of HLSL where `?:` does not short-cirucuit.
+> Note: Unlike C, C++, GLSL, and most other C-family languages, Slang currently follows the precedent of HLSL where `?:` does not short-circuit.
>
> This decision may change (for the scalar case) in a future version of the language.
> Programmer are encouraged to write code that does not depend on whether or not `?:` short-circuits.