Merge branch 'next'

This synchronizes the 2.7 master branch with 2.6.1RC2

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/puppet/util/nagios_maker.rb b/lib/puppet/util/nagios_maker.rb
index 59ed820f9..863fe24fa 100644
--- a/lib/puppet/util/nagios_maker.rb
+++ b/lib/puppet/util/nagios_maker.rb
@@ -45,17 +45,16 @@ module Puppet::Util::NagiosMaker
     provider.nagios_type
 
     type.desc "The Nagios type #{name.to_s}.  This resource type is autogenerated using the
-      model developed in Naginator_, and all of the Nagios types are generated using the
+      model developed in Naginator, and all of the Nagios types are generated using the
       same code and the same library.
 
       This type generates Nagios configuration statements in Nagios-parseable configuration
-      files.  By default, the statements will be added to ``#{target}``, but
-      you can send them to a different file by setting their ``target`` attribute.
+      files.  By default, the statements will be added to `#{target}`, but
+      you can send them to a different file by setting their `target` attribute.
 
-      You can purge Nagios resources using the ``resources`` type, but *only*
+      You can purge Nagios resources using the `resources` type, but *only*
       in the default file locations.  This is an architectural limitation.
 
-      .. _naginator: http://projects.reductivelabs.com/projects/naginator
     "
   end
 end