Permalink
Browse files

Various small grammar and spelling changes.

changed list of phrases with comma's to semicolons in a few places.

reworded description of when to use passenger
  • Loading branch information...
1 parent 6741b28 commit 04d4a5ff32d0e45b7a95f2e182de461d801e33b6 @uphillian committed Mar 2, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 source/guides/configuring.markdown
  2. +3 −3 source/guides/scaling.markdown
@@ -90,7 +90,7 @@ The `[main]` config block is the least specific. Settings here are always effect
#### `[agent]`, `[master]`, and `[user]` Blocks
-These three blocks correspond to Puppet's run modes. Settings in `[agent]` will only be used by puppet agent, settings in `[master]` will be used by puppet master and puppet cert, and settings in `[user]` will be used by puppet apply. The Faces subcommands introduced in Puppet 2.7 default to the `user` run mode, but their mode can be changed at run time with the `--mode` option. Note that not every setting makes sense for every run mode, but specifying a setting in a block where it is irrelevant has no observable effect.
+These three blocks correspond to Puppet's run modes. Settings in `[agent]` will only be used by puppet agent; settings in `[master]` will be used by puppet master and puppet cert; and settings in `[user]` will only be used by puppet apply. The Faces subcommands introduced in Puppet 2.7 default to the `user` run mode, but their mode can be changed at run time with the `--mode` option. Note that not every setting makes sense for every run mode, but specifying a setting in a block where it is irrelevant has no observable effect.
##### Notes on Puppet 0.25.5 and Older
@@ -223,7 +223,7 @@ So, for example:
webserver, !mailserver: httpadmins@domain.com
emerg, crit: james@domain.com, zach@domain.com, ben@domain.com
-This `tagmail.conf` file will mail any resource events tagged with `webserver` but _not_ with `mailserver` to the httpadmins group, any emergency or critical events to to James, Zach, and Ben, and all events to the log-archive group.
+This `tagmail.conf` file will mail any resource events tagged with `webserver` but _not_ with `mailserver` to the httpadmins group; any emergency or critical events to to James, Zach, and Ben, and all events to the log-archive group.
### `autosign.conf`
@@ -14,17 +14,17 @@ Are you using the default webserver?
------------------------------------
WEBrick, the default web server used to enable Puppet's web services connectivity, is essentially a reference
-implementation, and becomes unreliable beyond about ten managed nodes. In any sort of production environment, you should switch to a more efficient web server implementation such as [Passenger](./passenger.html) or [Mongrel](./mongrel.html), which will allow for serving many more nodes concurrently. If your system can work with Passenger, that is currently the recommended route. On older systems, use Mongrel.
+implementation, and becomes unreliable beyond about ten managed nodes. In any sort of production environment serving many nodes, you should switch to a more efficient web server implementation such as [Passenger](./passenger.html) or [Mongrel](./mongrel.html). Passenger is the currently recommended implementation, on older systems use Mongrel.
Delayed check in
----------------
-Puppet's default configuration asks that each node check in every 30 minutes. An option called 'splay' can add a random configurable lag to this check in time, to further balance out check in frequency. Alternatively, do not run puppetd as a daemon, and add `puppet agent` with `--onetime` to your crontab, allowing for setting different crontab intervals on different servers.
+Puppet's default configuration asks that each node check-in every 30 minutes. An option called 'splay' can add a random configurable lag to this check-in time, to further balance out check-in frequency. Alternatively, do not run puppetd as a daemon. Add a cronjob for `puppet agent` with `--onetime`, thus allowing for setting different intervals on different nodes.
Triggered selective updates
---------------------------
-Similar to the delayed checkin and cron strategies, it's possible to trigger node updates on an as-needed basis. Managed nodes can be configured to not check in automatically every 30 minutes, but rather to check in only when requested. `puppetrun` (in the 'ext' directory of the Puppet checkout) may be used to selectively update hosts. Alternatively, do not run the daemon, and a tool like [mcollective](http://www.puppetlabs.com/mcollective/introduction/) could be used to launch `puppet agent` with the `--onetime` option.
+Similar to the delayed check-in and cron strategies, it's possible to trigger node updates on demand. Managed nodes can be configured to not check-in automatically, but rather to check-in only when requested. `puppetrun` (in the 'ext' directory of the Puppet checkout) may be used to selectively update hosts. Alternatively, do not run the daemon, instead use a tool like [mcollective](http://www.puppetlabs.com/mcollective/introduction/) to launch `puppet agent` with the `--onetime` option.
No central host
---------------

0 comments on commit 04d4a5f

Please sign in to comment.