summaryrefslogtreecommitdiff
path: root/docs/yaml/objects
diff options
context:
space:
mode:
Diffstat (limited to 'docs/yaml/objects')
-rw-r--r--docs/yaml/objects/cfg_data.yaml12
-rw-r--r--docs/yaml/objects/env.yaml13
2 files changed, 4 insertions, 21 deletions
diff --git a/docs/yaml/objects/cfg_data.yaml b/docs/yaml/objects/cfg_data.yaml
index 069cadbf6..03abb1709 100644
--- a/docs/yaml/objects/cfg_data.yaml
+++ b/docs/yaml/objects/cfg_data.yaml
@@ -1,14 +1,10 @@
name: cfg_data
long_name: Configuration data object
description: |
- This object encapsulates configuration values to be used for generating
- configuration files. A more in-depth description can be found in the
- [the configuration page](Configuration.md).
-
- This object becomes immutable after first use. This means that
- calling set() or merge_from() will cause an error if this object has
- already been used in any function arguments. However, assignment creates a
- mutable copy.
+ This object encapsulates
+ configuration values to be used for generating configuration files. A
+ more in-depth description can be found in the [the configuration wiki
+ page](Configuration.md).
methods:
- name: set
diff --git a/docs/yaml/objects/env.yaml b/docs/yaml/objects/env.yaml
index 3b2e2a851..714da4fe4 100644
--- a/docs/yaml/objects/env.yaml
+++ b/docs/yaml/objects/env.yaml
@@ -9,11 +9,6 @@ description: |
on the same `varname`. Earlier Meson versions would warn and only the last
operation took effect.
- *Since 1.5.0* This object becomes immutable after first use. This means that
- calling append(), prepend() or set() will cause a deprecation warning if this
- object has already been used in any function arguments. However, assignment
- creates a mutable copy.
-
example: |
```meson
env = environment()
@@ -23,14 +18,6 @@ example: |
env.append('MY_PATH', '2')
env.append('MY_PATH', '3')
env.prepend('MY_PATH', '0')
-
- # Deprecated since 1.5.0
- run_command('script.py', env: env)
- env.append('MY_PATH', '4')
-
- # Allowed and only env2 is modified
- env2 = env
- env2.append('MY_PATH', '4')
```
methods: