diff --git a/ChangeLog b/ChangeLog
index 94aa7e1689..6ee9ddae12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 30 09:21:52 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cmath.rb:  Hide handle_no_method_error from RDoc.
+	* error.c:  Document or hide undocumented error classes.
+
 Thu Jun 30 07:49:04 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* hash.c:  Document ENV
diff --git a/error.c b/error.c
index 66ebbba2cc..aa87c29833 100644
--- a/error.c
+++ b/error.c
@@ -1464,6 +1464,12 @@ syserr_eqq(VALUE self, VALUE exc)
  *     Errno::ENOENT: No such file or directory - does/not/exist
  */
 
+/*
+ * Document-class: EncodingError
+ *
+ * EncodingError is the base class for encoding errors.
+ */
+
 /*
  *  Document-class: Encoding::CompatibilityError
  *
@@ -1471,6 +1477,18 @@ syserr_eqq(VALUE self, VALUE exc)
  *  incompatible with the target encoding.
  */
 
+/*
+ * Document-class: fatal
+ *
+ * fatal is an Exception that is raised when ruby has encountered a fatal
+ * error and must exit.  You are not able to rescue fatal.
+ */
+
+/*
+ * Document-class: NameError::message
+ * :nodoc:
+ */
+
 /*
  *  Descendants of class <code>Exception</code> are used to communicate
  *  between <code>raise</code> methods and <code>rescue</code>
diff --git a/lib/cmath.rb b/lib/cmath.rb
index eef1134ef3..14c2a9fce6 100644
--- a/lib/cmath.rb
+++ b/lib/cmath.rb
@@ -389,7 +389,7 @@ module CMath
   module_function :lgamma
 
   private
-  def handle_no_method_error
+  def handle_no_method_error # :nodoc:
     if $!.name == :real?
       raise TypeError, "Numeric Number required"
     else