Skip to content

Commit

Permalink
Merge pull request #3281 from olehermanse/3.21_autolink
Browse files Browse the repository at this point in the history
Stopped autolinking "cfengine" to cfengine.com (3.21)
  • Loading branch information
olehermanse authored May 27, 2024
2 parents 268fac1 + 1f0506f commit 694c327
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion generator/_references.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[cfengine]: https://cfengine.com "CFEngine Homepage"
[support desk]: https://support.northern.tech "CFEngine - Support desk"
[professional services]: https://cfengine.com/support/ "CFEngine - Help and Support"
[Free25 Forum]: https://groups.google.com/forum/?hl=en&fromgroups#!forum/cfengine-enterprise-free-25 "Free25 Forum"
Expand Down
14 changes: 7 additions & 7 deletions reference/language-concepts/augments.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,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 @@ -428,18 +428,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
10 changes: 5 additions & 5 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 Expand Up @@ -3112,7 +3112,7 @@ agent's current context. This allows conditional insertion.
lines will not be rendered more than once unless they are included within a
block. This includes blank lines.

Example contrived ```cfengine``` template:
Example contrived `cfengine` template:

```cf3
#This is a template file /templates/input.tmpl
Expand All @@ -3135,7 +3135,7 @@ With text before and after.
nameserver $(some.list)
```

Example ```cfengine``` template for apache vhost directives:
Example `cfengine` template for apache vhost directives:

```cf3
[%CFEngine any:: %]
Expand Down

0 comments on commit 694c327

Please sign in to comment.