diff --git a/generator/_references.md b/generator/_references.md index de7d45480..24af13648 100644 --- a/generator/_references.md +++ b/generator/_references.md @@ -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" diff --git a/reference/language-concepts/augments.markdown b/reference/language-concepts/augments.markdown index 0859758c2..1d8959230 100644 --- a/reference/language-concepts/augments.markdown +++ b/reference/language-concepts/augments.markdown @@ -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 @@ -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 diff --git a/reference/promise-types/files.markdown b/reference/promise-types/files.markdown index a9b498ba1..a412bf2ff 100644 --- a/reference/promise-types/files.markdown +++ b/reference/promise-types/files.markdown @@ -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 @@ -3076,7 +3076,7 @@ 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)%] @@ -3084,7 +3084,7 @@ implementation, but you can use `mustache` or `inline_mustache` as well. #### 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: @@ -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 @@ -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:: %]