puppetlabs/puppet — pull request #1227 by slindberg (2012-10-17 15:24:04+00:00)
Title: (#7962) Reopen: Added description of 'duration' settings format.

This reopens [a PR that was closed with the removal of the 3.x branch](https://github.com/puppetlabs/puppet/pull/1154). As per instructions, I've rebased off master and made it the target branch of this PR. I would like to emphasize the importance of this commit: without it, the auto-generated configuration documentation page will contain references to 'duration format' that isn't explained anywhere. The original commit that made the changes I'm referring to [is already in master](https://github.com/puppetlabs/puppet/commit/2cb9b503c427c75b45ba47a0ea538ae95342bee2).

---

Descriptions for settings of the `DurationSetting` type indicate that they
'can be specified as a duration'. This adds the description of how a
duration should be specified to the configuration reference section.

This also adds back a pertinant sentence accidentally removed from the
`ca_ttl` setting description.