diff --git a/configdoc/generate.php b/configdoc/generate.php
index f6b0c64f..b78b91bb 100644
--- a/configdoc/generate.php
+++ b/configdoc/generate.php
@@ -2,12 +2,12 @@
 
 /**
  * Generates XML and HTML documents describing configuration.
- * @note PHP 5 only!
+ * @note PHP 5.2+ only!
  */
 
 /*
 TODO:
-- make XML format richer (see XMLSerializer_ConfigSchema)
+- make XML format richer
 - extend XSLT transformation (see the corresponding XSLT file)
 - allow generation of packaged docs that can be easily moved
 - multipage documentation
diff --git a/library/HTMLPurifier/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema.php
index a55a9b79..7909db22 100644
--- a/library/HTMLPurifier/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema.php
@@ -4,22 +4,6 @@ if (!defined('HTMLPURIFIER_SCHEMA_STRICT')) define('HTMLPURIFIER_SCHEMA_STRICT',
 
 /**
  * Configuration definition, defines directives and their defaults.
- * @note If you update this, please update Printer_ConfigForm
- * @todo The ability to define things multiple times is confusing and should
- *       be factored out to its own function named registerDependency() or 
- *       addNote(), where only the namespace.name and an extra descriptions
- *       documenting the nature of the dependency are needed.  Since it's
- *       possible that the dependency is registered before the configuration
- *       is defined, deferring it to some sort of cache until it actually
- *       gets defined would be wise, keeping it opaque until it does get
- *       defined. We could add a finalize() method which would cause it to
- *       error out if we get a dangling dependency.  It's difficult, however,
- *       to know whether or not it's a dependency, or a codependency, that is
- *       neither of them fully depends on it. Where does the configuration go
- *       then?  This could be partially resolved by allowing blanket definitions
- *       and then splitting them up into finer-grained versions, however, there
- *       might be implementation difficulties in ini files regarding order of
- *       execution.
  */
 class HTMLPurifier_ConfigSchema {
     
diff --git a/library/HTMLPurifier/ConfigSchema/StringHashAdapter.php b/library/HTMLPurifier/ConfigSchema/StringHashAdapter.php
index 06cb5fcc..3a07a403 100644
--- a/library/HTMLPurifier/ConfigSchema/StringHashAdapter.php
+++ b/library/HTMLPurifier/ConfigSchema/StringHashAdapter.php
@@ -63,7 +63,7 @@ class HTMLPurifier_ConfigSchema_StringHashAdapter
             }
         }
         
-        // We don't use these yet, but there being used
+        // We don't use these yet, but they're specified
         if (isset($hash['VERSION'])) $hash->offsetGet('VERSION');
         if (isset($hash['DEPRECATED-USE'])) $hash->offsetGet('DEPRECATED-USE');
         if (isset($hash['DEPRECATED-VERSION'])) $hash->offsetGet('DEPRECATED-VERSION');