diff options
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/src/SUMMARY.md | 4 | ||||
| -rw-r--r-- | doc/manual/src/language/values.md | 21 | ||||
| -rw-r--r-- | doc/manual/src/release-notes/rl-2.90.md | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md index 5090c78c0..2cf28aa91 100644 --- a/doc/manual/src/SUMMARY.md +++ b/doc/manual/src/SUMMARY.md @@ -196,8 +196,8 @@ - [C++ style guide](contributing/cxx.md) - [Release Notes](release-notes/release-notes.md) - [Upcoming release](release-notes/rl-next.md) - <!-- RELENG-AUTO-INSERTION-MARKER (see releng/release_notes.py) --> - - [Lix 2.90 (FIXME date)](release-notes/rl-2.90.md) + <!-- RELENG-AUTO-INSERTION-MARKER (see releng/release_notes.py) --> + - [Lix 2.90 (2024-07-10)](release-notes/rl-2.90.md) - [Nix 2.18 (2023-09-20)](release-notes/rl-2.18.md) - [Nix 2.17 (2023-07-24)](release-notes/rl-2.17.md) - [Nix 2.16 (2023-05-31)](release-notes/rl-2.16.md) diff --git a/doc/manual/src/language/values.md b/doc/manual/src/language/values.md index f02ef2597..aa5455ae2 100644 --- a/doc/manual/src/language/values.md +++ b/doc/manual/src/language/values.md @@ -7,13 +7,16 @@ *Strings* can be written in three ways. The most common way is to enclose the string between double quotes, - e.g., `"foo bar"`. Strings can span multiple lines. The special - characters `"` and `\` and the character sequence `${` must be - escaped by prefixing them with a backslash (`\`). Newlines, carriage - returns and tabs can be written as `\n`, `\r` and `\t`, - respectively. + e.g., `"foo bar"`. Strings can span multiple lines. The backslash + (`\`) can be used to escape characters: newlines, carriage returns + and tabs may be written as `\n`, `\r` and `\t` respectively; any + other characters can be preceded by a backslash to remove any + special meaning they may have, like the special characters `"` and + `\` and the character sequence `${`. You can include the results of other expressions into a string by enclosing them in `${ }`, a feature known as [string interpolation]. + Due to a parser issue that has since come to be relied upon, the character sequence `$${` is interpreted literally and does not introduce an interpolation. + To express a `$` character immediately followed by an interpolation, the former must be escaped. [string interpolation]: ./string-interpolation.md @@ -43,16 +46,16 @@ Note that the whitespace and newline following the opening `''` is ignored if there is no non-whitespace text on the initial line. - Indented strings support [string interpolation]. - Since `${` and `''` have special meaning in indented strings, you need a way to quote them. `$` can be escaped by prefixing it with `''` (that is, two single quotes), i.e., `''$`. `''` can be escaped - by prefixing it with `'`, i.e., `'''`. `$` removes any special - meaning from the following `$`. Linefeed, carriage-return and tab + by prefixing it with `'`, i.e., `'''`. Linefeed, carriage-return and tab characters can be written as `''\n`, `''\r`, `''\t`, and `''\` escapes any other character. + Indented strings support [string interpolation] using `${ }` the same way regular strings do. + `$${` is interpreted literally in indented strings as well, so the `$` character must be escaped if it is to be followed by an interpolation. + Indented strings are primarily useful in that they allow multi-line string literals to follow the indentation of the enclosing Nix expression, and that less escaping is typically necessary for diff --git a/doc/manual/src/release-notes/rl-2.90.md b/doc/manual/src/release-notes/rl-2.90.md index e8041b74c..409a0eea2 100644 --- a/doc/manual/src/release-notes/rl-2.90.md +++ b/doc/manual/src/release-notes/rl-2.90.md @@ -1,7 +1,7 @@ -# Lix 2.90 "Vanilla Ice Cream" (FIXME date) +# Lix 2.90 "Vanilla Ice Cream" (2024-07-10) -# Lix 2.90.0 (FIXME date) +# Lix 2.90.0 (2024-07-10) ## Breaking Changes - Deprecate the online flake registries and vendor the default registry [fj#183](https://git.lix.systems/lix-project/lix/issues/183) [fj#110](https://git.lix.systems/lix-project/lix/issues/110) [fj#116](https://git.lix.systems/lix-project/lix/issues/116) [#8953](https://github.com/NixOS/nix/issues/8953) [#9087](https://github.com/NixOS/nix/issues/9087) [cl/1127](https://gerrit.lix.systems/c/lix/+/1127) |