summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-06-01 16:31:22 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-06-01 16:31:22 -0700
commit80c197807faaaf839057c212e69ad0915b39bfe4 (patch)
tree4625a673b81c981c630ec3021000ef107bc232e5 /lib/puppet/application
parent796900b04e234b61a77fe4b64c006f24e15a7360 (diff)
parentbe233c33a8f857b0edc07e24f74db85d469983a4 (diff)
Merge branch 'feature/2.7rc/7683-man-face-with-ronn-support' into 2.7rc
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/help.rb3
-rw-r--r--lib/puppet/application/man.rb4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/application/help.rb b/lib/puppet/application/help.rb
index 4829a2036..66baa462e 100644
--- a/lib/puppet/application/help.rb
+++ b/lib/puppet/application/help.rb
@@ -1,7 +1,4 @@
require 'puppet/application/face_base'
class Puppet::Application::Help < Puppet::Application::FaceBase
- # Meh. Disable the default behaviour, which is to inspect the
- # string and return that – not so helpful. --daniel 2011-04-11
- def render(result) result end
end
diff --git a/lib/puppet/application/man.rb b/lib/puppet/application/man.rb
new file mode 100644
index 000000000..1ecc4d691
--- /dev/null
+++ b/lib/puppet/application/man.rb
@@ -0,0 +1,4 @@
+require 'puppet/application/face_base'
+
+class Puppet::Application::Man < Puppet::Application::FaceBase
+end