Skip to content

Commit

Permalink
Merge pull request #3264 from btriller/some-fixes
Browse files Browse the repository at this point in the history
Fix some format issues
  • Loading branch information
olehermanse authored Apr 24, 2024
2 parents 47af75b + ebbbf87 commit e8f5e0d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ This is the full version of CFEngine Enterprise host, but the number of hosts is
**System requirements**

CFEngine Hosts (clients)

* 32/64-bit machines with a recent version of Linux
* 20 mb of memory
* 20mb of disk space
Expand Down
15 changes: 8 additions & 7 deletions reference/language-concepts/augments.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ There are two canonical augments files, `host_specific.json`, and `def.json` whi
as specified by the [_augments_ key][Augments#augments].

**Notes:**

* CFEngine variables are **not** expanded unless otherwise noted.

### host_specific.json
Expand Down Expand Up @@ -409,13 +410,13 @@ results in
class `MISSING` is not defined.

* `augments_class_from_single_class_as_regex` will be defined because the class
`cfengine` is always defined.
```cfengine``` is always defined.

* `augments_class_from_single_class_as_expression` will be defined because
`cfengine` is defined when interpreted as a class expression.
```cfengine``` is defined when interpreted as a class expression.

* `augments_class_from_classexpression_and` will be defined because the class
`cfengine` and the class `cfengine_3` are defined and the class expression
```cfengine``` and the class `cfengine_3` are defined and the class expression
`cfengine.cfengine_3::` evaluates to true.

* `augments_class_from_classexpression_not` will be defined because the class
Expand All @@ -424,18 +425,18 @@ results in

* `augments_class_from_classexpression_or` will be defined because the class
expression `cfengine|cfengine_3::` evaluates to true since at least one of
`cfengine` or `cfengine_3` will always be defined by cfengine 3 agents.
```cfengine``` or `cfengine_3` will always be defined by cfengine 3 agents.

* `augments_class_from_classexpression_complex` will be defined because the
class expression `(cfengine|cfengine_3).!MISSING::` evaluates to true since at
least one of `cfengine` or `cfengine_3` will always be defined by cfengine 3
least one of ```cfengine``` or `cfengine_3` will always be defined by cfengine 3
agents and `MISSING` is not defined.

* `myclass_defined_by_augments_in_def_json_3_18_0_v0` will be defined because
the class expression `cfengine|linux::` will always be true since there is
always a `cfengine` class defined.
always a ```cfengine``` class defined.

* `myclass_defined_by_augments_in_def_json_3_18_0_v1` will be defined because the expression `cfengine.**` will match at least one defined class, `cfengine`
* `myclass_defined_by_augments_in_def_json_3_18_0_v1` will be defined because the expression `cfengine.**` will match at least one defined class, ```cfengine```

You can see the list of classes thus defined through `def.json` in the output
of `cf-promises --show-classes` (see [Components][]). They
Expand Down
2 changes: 1 addition & 1 deletion reference/language-concepts/namespaces.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ A common mistake is forgetting to specify `default:` when using bodies from the

## Variables

Variables (except for Special variables) are assumed to be within the same scope
Variables (except for [Special variables][Special variables]) are assumed to be within the same scope
as the promiser but can also be referenced fully qualified with the namespace.

[%CFEngine_include_example(namespace_variable_references.cf)%]
Expand Down
3 changes: 2 additions & 1 deletion reference/macros.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ syntax validation, so any CFEngine binary that is not compiled with
the feature support macro will be able to exclude syntax from
possibly incompatible versions.

Currently available features are :
Currently available features are:

* `xml`
* `yaml`
* `curl`
Expand Down
6 changes: 3 additions & 3 deletions reference/promise-types/files.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@ if the `create` attribute is explicitly used.

**History:**

* 3.20.0 Changed default from `false` to `true` for cases of full file management ( e.g. when `template_method` is `mustache`, `inline_mustache` or `cfengine`, or when the `content` or `copy_from` attributes are used ).
* 3.20.0 Changed default from `false` to `true` for cases of full file management ( e.g. when `template_method` is `mustache`, `inline_mustache` or ```cfengine```, or when the `content` or `copy_from` attributes are used ).

### delete

Expand Down Expand Up @@ -3076,15 +3076,15 @@ state in Mustache.

**Description:** The template type.

By default `cfengine` requests the native CFEngine template
By default ```cfengine``` requests the native CFEngine template
implementation, but you can use `mustache` or `inline_mustache` as well.

[%CFEngine_promise_attribute(cfengine)%]

#### template_method cfengine

The default native-CFEngine template format (selected when
[template_method][files#template_method] is `cfengine` or unspecified) uses inline tags to
[template_method][files#template_method] is ```cfengine``` or unspecified) uses inline tags to
mark regions and classes. Each line represents an `insert_lines`
promise, unless the promises are grouped into a block using:

Expand Down

0 comments on commit e8f5e0d

Please sign in to comment.