3 files changed, 5 insertions, 8 deletions
diff --git a/lib/puppet/element.rb b/lib/puppet/element.rb
index 19e8c7dbc..eb43d4013 100644
--- a/lib/puppet/element.rb
+++ b/lib/puppet/element.rb
@@ -14,6 +14,10 @@ class Puppet::Element
     include Puppet
     attr_writer :noop
 
+    class << self
+        attr_accessor :doc, :nodoc
+    end
+
     #---------------------------------------------------------------
     # all of our subclasses must respond to each of these methods...
     @@interface_methods = [
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 1cb377eb2..e2080d5cb 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -35,7 +35,7 @@ require 'puppet/type/state'
 module Puppet
 class Type < Puppet::Element
     attr_accessor :children, :parameters, :parent
-    attr_accessor :paramdoc, :file, :line
+    attr_accessor :file, :line
     include Enumerable
 
     @@retrieved = Hash.new(0)
@@ -126,7 +126,6 @@ class Type < Puppet::Element
     # the Type class attribute accessors
     class << self
         attr_reader :name, :namevar, :states, :validstates, :parameters
-        attr_reader :doc
     end
 
     #---------------------------------------------------------------
diff --git a/lib/puppet/type/state.rb b/lib/puppet/type/state.rb
index 6524e4aa0..e77992b29 100644
--- a/lib/puppet/type/state.rb
+++ b/lib/puppet/type/state.rb
@@ -137,11 +137,5 @@ class State < Puppet::Element
         return "%s(%s)" % [@parent.name,self.name]
     end
     #---------------------------------------------------------------
-
-    #---------------------------------------------------------------
-    def self.doc
-        @doc
-    end
-    #---------------------------------------------------------------
 end
 end