diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
---|---|---|
committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
commit | 0f56c1b02d40f1f8552d933dd78b24745937b137 (patch) | |
tree | 3c6495838d1b876528cb4522de3484c44749140d /lib/puppet/reference/indirection.rb | |
parent | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff) | |
parent | 0aa27b5cc5df818e3878601e83f83a20590e161a (diff) | |
download | puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.gz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.xz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.zip |
Merge commit '2.6.1rc2' into next
Diffstat (limited to 'lib/puppet/reference/indirection.rb')
-rw-r--r-- | lib/puppet/reference/indirection.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/reference/indirection.rb b/lib/puppet/reference/indirection.rb index d14510c16..0cdbb2510 100644 --- a/lib/puppet/reference/indirection.rb +++ b/lib/puppet/reference/indirection.rb @@ -26,9 +26,8 @@ end reference.header = "This is the list of all indirections, their associated terminus classes, and how you select between them. -In general, the appropriate terminus class is selected by the application for you (e.g., ``puppet agent`` would always use the ``rest`` -terminus for most of its indirected classes), but some classes are tunable via normal settings. These will have ``terminus setting`` -documentation listed with them. +In general, the appropriate terminus class is selected by the application for you (e.g., `puppet agent` would always use the `rest` +terminus for most of its indirected classes), but some classes are tunable via normal settings. These will have `terminus setting` documentation listed with them. " |