From 9141b74eb77d58844a056313eff5cbd02d9e9dd4 Mon Sep 17 00:00:00 2001 From: Marcel Transier <34482842+marceltransier@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:34:49 +0100 Subject: Fix markdown error in operators.md Escape logical or pipe in markdown table according to https://github.github.com/gfm/#example-200 --- doc/manual/src/language/operators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/manual/src/language') diff --git a/doc/manual/src/language/operators.md b/doc/manual/src/language/operators.md index 797f13bd3..fb824feca 100644 --- a/doc/manual/src/language/operators.md +++ b/doc/manual/src/language/operators.md @@ -24,7 +24,7 @@ | [Equality] | *expr* `==` *expr* | none | 11 | | Inequality | *expr* `!=` *expr* | none | 11 | | Logical conjunction (`AND`) | *bool* `&&` *bool* | left | 12 | -| Logical disjunction (`OR`) | *bool* `||` *bool* | left | 13 | +| Logical disjunction (`OR`) | *bool* `\|\|` *bool* | left | 13 | | [Logical implication] | *bool* `->` *bool* | none | 14 | [string]: ./values.md#type-string -- cgit v1.2.3 From 8b9325ec4ab263ff6b6da8a32d08038e83ed4146 Mon Sep 17 00:00:00 2001 From: Marcel Transier <34482842+marceltransier@users.noreply.github.com> Date: Thu, 19 Jan 2023 10:20:41 +0100 Subject: Fix update operator usage in operators.md --- doc/manual/src/language/operators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/manual/src/language') diff --git a/doc/manual/src/language/operators.md b/doc/manual/src/language/operators.md index 797f13bd3..2263597f0 100644 --- a/doc/manual/src/language/operators.md +++ b/doc/manual/src/language/operators.md @@ -120,7 +120,7 @@ The result is a string. ## Update -> *attrset1* + *attrset2* +> *attrset1* // *attrset2* Update [attribute set] *attrset1* with names and values from *attrset2*. -- cgit v1.2.3 From 9469b1bb30c9341eab3521be975f881cb01acac2 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Wed, 18 Jan 2023 13:43:50 +0100 Subject: doc: update language/index.md - make `` visible (was blank in the rendered version) --- doc/manual/src/language/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/manual/src/language') diff --git a/doc/manual/src/language/index.md b/doc/manual/src/language/index.md index db34fde75..31300631c 100644 --- a/doc/manual/src/language/index.md +++ b/doc/manual/src/language/index.md @@ -191,12 +191,12 @@ This is an incomplete overview of language features, by example. - + `` - Search path. Value determined by [`$NIX_PATH` environment variable](../command-ref/env-common.md#env-NIX_PATH). + Search path for Nix files. Value determined by [`$NIX_PATH` environment variable](../command-ref/env-common.md#env-NIX_PATH). -- cgit v1.2.3 From 4ff9ed5c2de28e157d66b1a1ad3f24c18f6f9ee7 Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Fri, 20 Jan 2023 13:21:45 +0100 Subject: doc: fix update operator description --- doc/manual/src/language/operators.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/manual/src/language') diff --git a/doc/manual/src/language/operators.md b/doc/manual/src/language/operators.md index a287b513f..1f918bd4d 100644 --- a/doc/manual/src/language/operators.md +++ b/doc/manual/src/language/operators.md @@ -124,8 +124,8 @@ The result is a string. Update [attribute set] *attrset1* with names and values from *attrset2*. -The returned attribute set will have of all the attributes in *e1* and *e2*. -If an attribute name is present in both, the attribute value from the former is taken. +The returned attribute set will have of all the attributes in *attrset1* and *attrset2*. +If an attribute name is present in both, the attribute value from the latter is taken. [Update]: #update -- cgit v1.2.3