Skip to content

Commit

Permalink
Grammar fixes (#1877)
Browse files Browse the repository at this point in the history
  • Loading branch information
scop authored Nov 23, 2023
1 parent 26effdd commit 998b4ed
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ yq (4.9.6) focal; urgency=medium
yq (3.3.2) focal; urgency=medium

* Bug fix: existStatus bug (#459)
* Automatically makes a os temp directory if it does not exist (#461)
* Automatically makes an os temp directory if it does not exist (#461)

-- Roberto Mier Escandon <[email protected]> Fri, 07 Aug 2020 18:53:01 +0200

Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/data_tree_navigator.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

type DataTreeNavigator interface {
// given the context and a expressionNode,
// given the context and an expressionNode,
// this will process the against the given expressionNode and return
// a new context of matching candidates
GetMatchingNodes(context Context, expressionNode *ExpressionNode) (Context, error)
Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/doc/operators/boolean-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The `or` and `and` operators take two parameters and return a boolean result.

`not` flips a boolean from true to false, or vice versa.

`any` will return `true` if there are any `true` values in a array sequence, and `all` will return true if _all_ elements in an array are true.
`any` will return `true` if there are any `true` values in an array sequence, and `all` will return true if _all_ elements in an array are true.

`any_c(condition)` and `all_c(condition)` are like `any` and `all` but they take a condition expression that is used against each element to determine if it's `true`. Note: in `jq` you can simply pass a condition to `any` or `all` and it simply works - `yq` isn't that clever..yet

Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/doc/operators/headers/boolean-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The `or` and `and` operators take two parameters and return a boolean result.

`not` flips a boolean from true to false, or vice versa.

`any` will return `true` if there are any `true` values in a array sequence, and `all` will return true if _all_ elements in an array are true.
`any` will return `true` if there are any `true` values in an array sequence, and `all` will return true if _all_ elements in an array are true.

`any_c(condition)` and `all_c(condition)` are like `any` and `all` but they take a condition expression that is used against each element to determine if it's `true`. Note: in `jq` you can simply pass a condition to `any` or `all` and it simply works - `yq` isn't that clever..yet

Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/doc/operators/multiply-merge.md
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ will output
some: thing
```

## Merging an null with an array
## Merging a null with an array
Running
```bash
yq --null-input 'null * ["some"]'
Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/operator_multiply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ var multiplyOperatorScenarios = []expressionScenario{
},
},
{
description: "Merging an null with an array",
description: "Merging a null with an array",
expression: `null * ["some"]`,
expected: []string{
"D0, P[], (!!seq)::- some\n",
Expand Down
2 changes: 1 addition & 1 deletion pkg/yqlib/operator_to_number.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

func tryConvertToNumber(value string) (string, bool) {
// try a int first
// try an int first
_, _, err := parseInt64(value)
if err == nil {
return "!!int", true
Expand Down
2 changes: 1 addition & 1 deletion release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
- Fixed bug - handle expressions that match a directory (e.g. ".")

4.19.1:
- New [eval](https://mikefarah.gitbook.io/yq/operators/eval) _operator_ that allows dynamic expression evaluation (e.g. from a env variable) (#1087)
- New [eval](https://mikefarah.gitbook.io/yq/operators/eval) _operator_ that allows dynamic expression evaluation (e.g. from an env variable) (#1087)
- Adding new elements to array now automatically applies styling of existing elements (#722)

4.18.1:
Expand Down

0 comments on commit 998b4ed

Please sign in to comment.