Merge in r649-656, prompted by changing two of Encoder's functions to static.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@657 48356398-32a2-884e-a903-53898d9a118a

library/HTMLPurifier/Config.php

@@ -46,6 +46,7 @@ class HTMLPurifier_Config
     
     /**
      * Convenience constructor that creates a config object based on a mixed var
+     * @static
      * @param mixed $config Variable that defines the state of the config
      *                      object. Can be: a HTMLPurifier_Config() object or
      *                      an array of directives based on loadArray().
@@ -60,6 +61,7 @@ class HTMLPurifier_Config
     
     /**
      * Convenience constructor that creates a default configuration object.
+     * @static
      * @return Default HTMLPurifier_Config object.
      */
     static function createDefault() {
@@ -178,4 +180,4 @@ class HTMLPurifier_Config
     
 }
 
-?>
+?>