suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-06 21:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

UK spelling

Browse Source
This commit is contained in:
stevenwdv 2025-07-17 11:43:28 +02:00 committed by GitHub
parent 08ecd39a1e
commit 5e75db824b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/doc/operators/anchor-and-alias-operators.md
View File

@ -97,7 +97,7 @@ x: 1
``` ```
## Override with local key ## Override with local key
like https://yaml.org/type/merge.html, but with x: 1 before the merge key. This is legacy behavior, see --yaml-fix-merge-anchor-to-spec like https://yaml.org/type/merge.html, but with x: 1 before the merge key. This is legacy behaviour, see --yaml-fix-merge-anchor-to-spec
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml

6
pkg/yqlib/doc/operators/traverse-read.md
View File

@ -304,7 +304,7 @@ foo_a
``` ```
## Traversing merge anchors with override ## Traversing merge anchors with override
This is legacy behavior, see --yaml-fix-merge-anchor-to-spec This is legacy behaviour, see --yaml-fix-merge-anchor-to-spec
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml
@ -401,7 +401,7 @@ foobar_thing
``` ```
## Traversing merge anchor lists ## Traversing merge anchor lists
Note that the later merge anchors override previous, but this is legacy behavior, see --yaml-fix-merge-anchor-to-spec Note that the later merge anchors override previous, but this is legacy behaviour, see --yaml-fix-merge-anchor-to-spec
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml
@ -434,7 +434,7 @@ bar_thing
``` ```
## Splatting merge anchor lists ## Splatting merge anchor lists
With legacy override behavior, see --yaml-fix-merge-anchor-to-spec With legacy override behaviour, see --yaml-fix-merge-anchor-to-spec
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml

2
pkg/yqlib/operator_anchors_aliases_test.go
View File

@ -154,7 +154,7 @@ var anchorOperatorScenarios = []expressionScenario{
{ {
description: "Override with local key", description: "Override with local key",
subdescription: "like https://yaml.org/type/merge.html, but with x: 1 before the merge key. " + subdescription: "like https://yaml.org/type/merge.html, but with x: 1 before the merge key. " +
"This is legacy behavior, see --yaml-fix-merge-anchor-to-spec", "This is legacy behaviour, see --yaml-fix-merge-anchor-to-spec",
document: specDocument + "- x: 1\n << : [ *BIG, *LEFT, *SMALL ]\n", document: specDocument + "- x: 1\n << : [ *BIG, *LEFT, *SMALL ]\n",
expression: ".[4] | explode(.)", expression: ".[4] | explode(.)",
expected: []string{"D0, P[4], (!!map)::x: 0\nr: 10\ny: 2\n"}, expected: []string{"D0, P[4], (!!map)::x: 0\nr: 10\ny: 2\n"},

6
pkg/yqlib/operator_traverse_path_test.go
View File

@ -433,7 +433,7 @@ var traversePathOperatorScenarios = []expressionScenario{
}, },
{ {
description: "Traversing merge anchors with override", description: "Traversing merge anchors with override",
subdescription: "This is legacy behavior, see --yaml-fix-merge-anchor-to-spec", subdescription: "This is legacy behaviour, see --yaml-fix-merge-anchor-to-spec",
document: mergeDocSample, document: mergeDocSample,
expression: `.foobar.c`, expression: `.foobar.c`,
expected: []string{ expected: []string{
@ -477,7 +477,7 @@ var traversePathOperatorScenarios = []expressionScenario{
{ {
description: "Traversing merge anchor lists", description: "Traversing merge anchor lists",
subdescription: "Note that the later merge anchors override previous, " + subdescription: "Note that the later merge anchors override previous, " +
"but this is legacy behavior, see --yaml-fix-merge-anchor-to-spec", "but this is legacy behaviour, see --yaml-fix-merge-anchor-to-spec",
document: mergeDocSample, document: mergeDocSample,
expression: `.foobarList.thing`, expression: `.foobarList.thing`,
expected: []string{ expected: []string{
@ -502,7 +502,7 @@ var traversePathOperatorScenarios = []expressionScenario{
}, },
{ {
description: "Splatting merge anchor lists", description: "Splatting merge anchor lists",
subdescription: "With legacy override behavior, see --yaml-fix-merge-anchor-to-spec", subdescription: "With legacy override behaviour, see --yaml-fix-merge-anchor-to-spec",
document: mergeDocSample, document: mergeDocSample,
expression: `.foobarList[]`, expression: `.foobarList[]`,
expected: []string{ expected: []string{