diff options
| author | Craig Scott <craig.scott@crascit.com> | 2022-10-22 05:18:45 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2022-10-22 05:19:19 (GMT) |
| commit | 8de977fa70ebbb372b9d1f352f1f7899a47b73f9 (patch) | |
| tree | 59a62a3bc52652c126e16fcdec108930efcb0561 | |
| parent | e11773e8cf3829f09347db4165e60327745acb17 (diff) | |
| download | CMake-8de977fa70ebbb372b9d1f352f1f7899a47b73f9.zip CMake-8de977fa70ebbb372b9d1f352f1f7899a47b73f9.tar.gz CMake-8de977fa70ebbb372b9d1f352f1f7899a47b73f9.tar.bz2 | |
Help: Use array consistently in presets manual
When referring to data in a JSON array, use "array" consistently
rather than "list". This avoids ambiguity over whether we mean
a string containing a CMake list, or a JSON array.
Fixes: #24074
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 7839509..08eee1f 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -161,7 +161,7 @@ that may contain the following fields: presets by default (except ``name``, ``hidden``, ``inherits``, ``description``, and ``displayName``), but can override them as desired. If multiple ``inherits`` presets provide conflicting values for - the same field, the earlier preset in the ``inherits`` list will be + the same field, the earlier preset in the ``inherits`` array will be preferred. A preset can only inherit from another preset that is defined in the @@ -388,7 +388,7 @@ that may contain the following fields: ``inherits`` presets by default (except ``name``, ``hidden``, ``inherits``, ``description``, and ``displayName``), but can override them as desired. If multiple ``inherits`` presets provide conflicting - values for the same field, the earlier preset in the ``inherits`` list + values for the same field, the earlier preset in the ``inherits`` array will be preferred. A preset can only inherit from another preset that is defined in the @@ -549,7 +549,7 @@ that may contain the following fields: ``inherits`` presets by default (except ``name``, ``hidden``, ``inherits``, ``description``, and ``displayName``), but can override them as desired. If multiple ``inherits`` presets provide conflicting - values for the same field, the earlier preset in the ``inherits`` list + values for the same field, the earlier preset in the ``inherits`` array will be preferred. A preset can only inherit from another preset that is defined in the @@ -891,7 +891,7 @@ fields: ``inherits`` presets by default (except ``name``, ``hidden``, ``inherits``, ``description``, and ``displayName``), but can override them as desired. If multiple ``inherits`` presets provide conflicting - values for the same field, the earlier preset in the ``inherits`` list + values for the same field, the earlier preset in the ``inherits`` array will be preferred. A preset can only inherit from another preset that is defined in the @@ -948,10 +948,10 @@ fields: explicitly specified in this package preset. ``generators`` - An optional list of strings representing generators for CPack to use. + An optional array of strings representing generators for CPack to use. ``configurations`` - An optional list of strings representing build configurations for CPack to + An optional array of strings representing build configurations for CPack to package. ``variables`` @@ -1073,7 +1073,7 @@ object, it has the following fields: A required string to search for. This field supports macro expansion. ``list`` - A required list of strings to search. This field supports macro + A required array of strings to search. This field supports macro expansion, and uses short-circuit evaluation. ``"matches"`` |