Skip to content

Commit

Permalink
Merge pull request #3328 from craigcomstock/various-fixes/3.24
Browse files Browse the repository at this point in the history
Fix formatting (3.24)
  • Loading branch information
nickanderson authored Aug 15, 2024
2 parents 0d4310a + 4a7a668 commit 6c793d4
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/example-snippets/user-management.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ drwxr-xr-x 5 root root 4096 Dec 22 16:37 ..
From the above output we can see that the local users `jack` and
`jill` are present, and that they both have home directories.

Now lets activate the example policy and insepect the result.
Now lets activate the example policy and inspect the result.

```console
root@debian-jessie:/core/examples# cf-agent -KIf ./local_users_absent.cf
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorials/write-cfengine-policy.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Let's save this policy in `/tmp/my-policy.cf`.
You can now run this policy either in Distributed (client-server) System or in a
Stand Alone system. The next two sections will cover each of the options.

## Option#1: Running the policy on a stand alone system
### Option#1: Running the policy on a stand alone system

Since CFEngine is fully distributed we can run policies locally. This can come
in handy as the result of a run is instant, especially during the design phase
Expand Down
1 change: 0 additions & 1 deletion examples/tutorials/writing-and-serving-policy.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ Writing, deploying, and using CFEngine `promises` will generally follow these si
2. Create a bundle and promise in the file (see ["Hello world" policy example][Examples and tutorials#"Hello world" policy example]).
3. Save the file on the policy server somewhere under `/var/cfengine/masterfiles` (can be under a sub-directory).
4. Let CFEngine know about the `promise` on the `policy server`, generally in the file `/var/cfengine/masterfiles/promises.cf`, or a file elsewhere but referred to in `promises.cf`.

* Optional: it is also possible to call a bundle manually, using `cf-agent`.

5. Verify the `policy file` was deployed and successfully run.
Expand Down
1 change: 1 addition & 0 deletions reference/components/cf-agent.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ The following classes are excluded from logging:
* `any`
* `from_cfexecd`
* Life cycle (`Lcycle_0`, `GMT_Lcycle_3`)

### secureinput

**Description:** The `secureinput` menu option policy checks whether
Expand Down
1 change: 1 addition & 0 deletions reference/language-concepts/normal-ordering.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ evaluation perspective as bundles placed in files included in body common
control inputs will be evaluated before bundles from file control inputs.

The following steps are executed per-bundle for each file parsed, in this order:

1. if it's a common bundle, evaluate **vars** promises
2. if it's a common bundle, evaluate **classes** promises
3. evaluate **vars** promises
Expand Down
2 changes: 1 addition & 1 deletion reference/masterfiles-policy-framework.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ published: true
sorting: 90
---

The Masterfiles Policy Framework or MPF also commonly reffered to as simply
The Masterfiles Policy Framework or MPF also commonly referred to as simply
masterfiles is the policy framework that ships with CFEngine.

[%CFEngine_include_markdown(../../masterfiles/MPF.md)%]
2 changes: 1 addition & 1 deletion reference/promise-types/commands.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ commands:
```

When referring to executables the full path to the executable must be used.
When reffereing to executables whose paths contain spaces, you should quote
When referring to executables whose paths contain spaces, you should quote
the entire program string separately so that CFEngine knows the name of the
executable file. For example:

Expand Down

0 comments on commit 6c793d4

Please sign in to comment.