Adding an Indirection reference, along with the work

necessary to support it.

6 files changed, 13 insertions, 6 deletions

diff --git a/lib/puppet/indirector/node/exec.rb b/lib/puppet/indirector/node/exec.rb
index c6dde484c..ed76bce94 100644
--- a/lib/puppet/indirector/node/exec.rb
+++ b/lib/puppet/indirector/node/exec.rb
@@ -2,7 +2,8 @@ require 'puppet/node'
 require 'puppet/indirector/exec'
 
 class Puppet::Node::Exec < Puppet::Indirector::Exec
-    desc "Call an external program to get node information."
+    desc "Call an external program to get node information.  See
+    the `ExternalNodes`:trac: page for more information."
     include Puppet::Util
 
     def command
diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb
index a1c3c3a71..dd11f4e9b 100644
--- a/lib/puppet/indirector/node/ldap.rb
+++ b/lib/puppet/indirector/node/ldap.rb
@@ -2,7 +2,8 @@ require 'puppet/node'
 require 'puppet/indirector/ldap'
 
 class Puppet::Node::Ldap < Puppet::Indirector::Ldap
-    desc "Search in LDAP for node configuration information."
+    desc "Search in LDAP for node configuration information.  See
+    the `LdapNodes`:trac: page for more information."
 
     # The attributes that Puppet class information is stored in.
     def class_attributes
diff --git a/lib/puppet/indirector/node/memory.rb b/lib/puppet/indirector/node/memory.rb
index 0710f82ac..de0ed8ab2 100644
--- a/lib/puppet/indirector/node/memory.rb
+++ b/lib/puppet/indirector/node/memory.rb
@@ -5,5 +5,6 @@ class Puppet::Node::Memory < Puppet::Indirector::Memory
     desc "Keep track of nodes in memory but nowhere else.  This is used for
         one-time compiles, such as what the stand-alone ``puppet`` does.
         To use this terminus, you must load it with the data you want it
-        to contain."
+        to contain; it is only useful for developers and should generally not
+        be chosen by a normal user."
 end
diff --git a/lib/puppet/indirector/node/null.rb b/lib/puppet/indirector/node/null.rb
index 4c5c1261b..f7c4d25ea 100644
--- a/lib/puppet/indirector/node/null.rb
+++ b/lib/puppet/indirector/node/null.rb
@@ -4,7 +4,10 @@ require 'puppet/indirector/null'
 class Puppet::Node::Null < Puppet::Indirector::Null
     desc "Always return an empty node object.  This is the node source you should
         use when you don't have some other, functional source you want to use,
-        as the compiler will not work without this node information."
+        as the compiler will not work without a valid node terminus.
+        
+        Note that class is responsible for merging the node's facts into the node
+        instance before it is returned."
 
     # Just return an empty node.
     def find(name)
diff --git a/lib/puppet/indirector/node/rest.rb b/lib/puppet/indirector/node/rest.rb
index ed78e5937..c5d2f97fb 100644
--- a/lib/puppet/indirector/node/rest.rb
+++ b/lib/puppet/indirector/node/rest.rb
@@ -2,6 +2,6 @@ require 'puppet/node'
 require 'puppet/indirector/rest'
 
 class Puppet::Node::REST < Puppet::Indirector::REST
-    desc "TODO: FIXME"
+    desc "This will eventually be a REST-based mechanism for finding nodes.  It is currently non-functional."
     # TODO/FIXME
 end
diff --git a/lib/puppet/indirector/node/yaml.rb b/lib/puppet/indirector/node/yaml.rb
index bb96b280a..f2873479d 100644
--- a/lib/puppet/indirector/node/yaml.rb
+++ b/lib/puppet/indirector/node/yaml.rb
@@ -2,5 +2,6 @@ require 'puppet/node'
 require 'puppet/indirector/yaml'
 
 class Puppet::Node::Yaml < Puppet::Indirector::Yaml
-    desc "Store node information as flat files, serialized using YAML."
+    desc "Store node information as flat files, serialized using YAML,
+        or deserialize stored YAML nodes."
 end