Skip to content

Commit b3e6e87

Browse files
committed
Merge branch 'master' of github.com:puppetlabs/puppet-docs
2 parents f3d6db4 + ca901f8 commit b3e6e87

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

source/puppet/5.5/configuration.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,8 +1612,7 @@ Where Puppet PID files are kept.
16121612

16131613
How often puppet agent applies the catalog.
16141614
Note that a runinterval of 0 means "run continuously" rather than
1615-
"never run." If you want puppet agent to never run, you should start
1616-
it with the `--no-client` option. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
1615+
"never run." This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
16171616

16181617
- *Default*: 30m
16191618

source/puppet/6.16/configuration.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,8 +1659,7 @@ Where Puppet PID files are kept.
16591659

16601660
How often puppet agent applies the catalog.
16611661
Note that a runinterval of 0 means "run continuously" rather than
1662-
"never run." If you want puppet agent to never run, you should start
1663-
it with the `--no-client` option. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
1662+
"never run." This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
16641663

16651664
- *Default*: 30m
16661665

source/puppet/latest/configuration.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,8 +1660,7 @@ Where Puppet PID files are kept.
16601660

16611661
How often puppet agent applies the catalog.
16621662
Note that a runinterval of 0 means "run continuously" rather than
1663-
"never run." If you want puppet agent to never run, you should start
1664-
it with the `--no-client` option. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
1663+
"never run." This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
16651664

16661665
- *Default*: 30m
16671666

source/puppet/latest/types/file.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ of file backups. For example:
192192
-print0 | xargs -0 rm
193193
```
194194

195-
196195
Default: `puppet`
197196

198197
([↑ Back to file attributes](#file-attributes))

0 commit comments

Comments
 (0)