Slightly more doc updates

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1846 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 2 insertions, 28 deletions

diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 35c51da7c..ad5f53080 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -72,21 +72,7 @@ module Functions
     def self.functiondocs
         autoloader.loadall
 
-        header = %{inMenu: true
-title: Function Reference
-orderInfo: 40
-
-There are two types of functions in Puppet: Statements and rvalues.
-Statements stand on their own and do not return arguments; they are used for
-performing stand-alone work like importing.  Rvalues return values and can
-only be used in a statement requiring a value, such as an assignment or a case
-statement.
-
-Here are the functions available in Puppet:
-
-}
-
-        ret = header.dup
+        ret = ""
 
         @functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
             ret += "* **%s** (*%s*)" % [name, hash[:type]]
diff --git a/lib/puppet/server/report.rb b/lib/puppet/server/report.rb
index bbc8e7ddb..efebf1b4e 100755
--- a/lib/puppet/server/report.rb
+++ b/lib/puppet/server/report.rb
@@ -73,20 +73,8 @@ class Server
         end
 
         def self.reportdocs
-            docs = %{Puppet clients can report back to the server after each
-transaction.  This transaction report is sent as a YAML dump and includes every
-log message that was generated during the transaction along with as many metrics
-as Puppet knows how to collect.
+            docs = ""
 
-Currently, clients default to not sending in reports; you can enable reporting
-by setting the ``report`` parameter to true.
-
-To use a report, set the ``reports`` parameter on the server; multiple
-reports must be comma-separated.
-
-Puppet provides multiple report handlers that will process client reports:
-
-}
             # Use this method so they all get loaded
             reports.sort { |a,b| a.to_s <=> b.to_s }.each do |name|
                 mod = self.report(name)