Fix bug #28584: DOMText::splitText() does not split text properly (benjcarson)

Prototype fixes

20 files changed, 157 insertions, 171 deletions

diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index b574b1abec..ceb97b5940 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -31,7 +31,7 @@
 
 
 /*
-* class domattr extends domnode 
+* class DOMAttr extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-637646024
 * Since: 
@@ -43,7 +43,7 @@ zend_function_entry php_dom_attr_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomAttr::__construct(string name, [string value]); */
+/* {{{ proto void DOMAttr::__construct(string name, [string value]); */
 PHP_METHOD(domattr, __construct)
 {
 
@@ -85,7 +85,7 @@ PHP_METHOD(domattr, __construct)
 	}
 }
 
-/* }}} end DomAttr::__construct */
+/* }}} end DOMAttr::__construct */
 
 
 /* {{{ proto name	string	
@@ -200,7 +200,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto ownerElement	element	
+/* {{{ proto ownerElement	DOMElement	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
 Since: DOM Level 2
@@ -236,7 +236,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto schemaTypeInfo	typeinfo	
+/* {{{ proto schemaTypeInfo	DOMTypeInfo	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
 Since: DOM Level 3
diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index fde9ea5670..b5b15fe9fe 100644
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domcdatasection extends domtext 
+* class DOMCdataSection extends DOMText 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-667469212
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_cdatasection_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomCDataSection::__construct(string value); */
+/* {{{ proto void DOMCdataSection::__construct(string value); */
 PHP_METHOD(domcdatasection, __construct)
 {
 
@@ -73,6 +73,6 @@ PHP_METHOD(domcdatasection, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomCDataSection::__construct */
+/* }}} end DOMCdataSection::__construct */
 
 #endif
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index d917ede44b..7eba640c08 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domcharacterdata extends domnode 
+* class DOMCharacterData extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-FF21A306
 * Since: 
@@ -105,7 +105,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 /* }}} */
 
-/* {{{ proto length	unsigned long	
+/* {{{ proto length	long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C
 Since: 
@@ -140,7 +140,7 @@ int dom_characterdata_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto domstring dom_characterdata_substring_data(unsigned long offset, unsigned long count);
+/* {{{ proto string dom_characterdata_substring_data(long offset, long count);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
 Since: 
 */
@@ -190,7 +190,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)
 /* }}} end dom_characterdata_substring_data */
 
 
-/* {{{ proto dom_void dom_characterdata_append_data(string arg);
+/* {{{ proto void dom_characterdata_append_data(string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
 Since: 
 */
@@ -215,7 +215,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
 /* }}} end dom_characterdata_append_data */
 
 
-/* {{{ proto dom_void dom_characterdata_insert_data(unsigned long offset, string arg);
+/* {{{ proto void dom_characterdata_insert_data(long offset, string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
 Since: 
 */
@@ -264,7 +264,7 @@ PHP_FUNCTION(dom_characterdata_insert_data)
 /* }}} end dom_characterdata_insert_data */
 
 
-/* {{{ proto dom_void dom_characterdata_delete_data(unsigned long offset, unsigned long count);
+/* {{{ proto void dom_characterdata_delete_data(long offset, long count);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
 Since: 
 */
@@ -320,7 +320,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)
 /* }}} end dom_characterdata_delete_data */
 
 
-/* {{{ proto dom_void dom_characterdata_replace_data(unsigned long offset, unsigned long count, string arg);
+/* {{{ proto void dom_characterdata_replace_data(long offset, long count, string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
 Since: 
 */
diff --git a/ext/dom/comment.c b/ext/dom/comment.c
index be921a8fad..5b231cb098 100644
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domcomment extends domcharacterdata 
+* class DOMComment extends DOMCharacterData 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1728279322
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_comment_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomComment::__construct([string value]); */
+/* {{{ proto void DOMComment::__construct([string value]); */
 PHP_METHOD(domcomment, __construct)
 {
 
@@ -73,5 +73,5 @@ PHP_METHOD(domcomment, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomComment::__construct */
+/* }}} end DOMComment::__construct */
 #endif
diff --git a/ext/dom/document.c b/ext/dom/document.c
index c23566fad7..0be049fea6 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -42,7 +42,7 @@ struct _idsIterator {
 #define DOM_LOAD_FILE 1
 
 /*
-* class domdocument extends domnode 
+* class DOMDocument extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-i-Document
 * Since: 
@@ -88,7 +88,7 @@ zend_function_entry php_dom_document_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto doctype	documenttype	
+/* {{{ proto docType	DOMDocumentType	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31
 Since: 
@@ -124,7 +124,7 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto implementation	domimplementation	
+/* {{{ proto implementation	DOMImplementation	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
 Since: 
@@ -140,7 +140,7 @@ int dom_document_implementation_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domelement document_element	documentElement	
+/* {{{ proto documentElement	DOMElement	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
 Since: 
@@ -174,7 +174,7 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto actual_encoding	string	
+/* {{{ proto actualEncoding	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-actualEncoding
 Since: DOM Level 3
@@ -399,7 +399,7 @@ int dom_document_version_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 /* }}} */
 
-/* {{{ proto strict_error_checking	boolean	
+/* {{{ proto strictErrorChecking	boolean	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking
 Since: DOM Level 3
@@ -486,7 +486,7 @@ int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ proto validateonParse	boolean	
+/* {{{ proto validateOnParse	boolean	
 readonly=no
 */
 int	dom_document_validate_on_parse_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -658,7 +658,7 @@ int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_D
 /* }}} */
 
 
-/* {{{ proto document_uri	string	
+/* {{{ proto documentURI	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI
 Since: DOM Level 3
@@ -724,7 +724,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto config	domconfiguration	
+/* {{{ proto config	DOMConfiguration	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config
 Since: DOM Level 3
@@ -740,7 +740,7 @@ int dom_document_config_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domelement dom_document_create_element(string tagName [, string value]);
+/* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
 Since: 
 */
@@ -774,7 +774,7 @@ PHP_FUNCTION(dom_document_create_element)
 /* }}} end dom_document_create_element */
 
 
-/* {{{ proto domdocumentfragment dom_document_create_document_fragment();
+/* {{{ proto DOMDocumentFragment dom_document_create_document_fragment();
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
 Since: 
 */
@@ -802,7 +802,7 @@ PHP_FUNCTION(dom_document_create_document_fragment)
 /* }}} end dom_document_create_document_fragment */
 
 
-/* {{{ proto domtext dom_document_create_text_node(string data);
+/* {{{ proto DOMText dom_document_create_text_node(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
 Since: 
 */
@@ -831,7 +831,7 @@ PHP_FUNCTION(dom_document_create_text_node)
 /* }}} end dom_document_create_text_node */
 
 
-/* {{{ proto domcomment dom_document_create_comment(string data);
+/* {{{ proto DOMComment dom_document_create_comment(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
 Since: 
 */
@@ -860,7 +860,7 @@ PHP_FUNCTION(dom_document_create_comment)
 /* }}} end dom_document_create_comment */
 
 
-/* {{{ proto domcdatasection dom_document_create_cdatasection(string data);
+/* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
 Since: 
 */
@@ -889,7 +889,7 @@ PHP_FUNCTION(dom_document_create_cdatasection)
 /* }}} end dom_document_create_cdatasection */
 
 
-/* {{{ proto domprocessinginstruction dom_document_create_processing_instruction(string target, string data);
+/* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
 Since: 
 */
@@ -925,7 +925,7 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
 /* }}} end dom_document_create_processing_instruction */
 
 
-/* {{{ proto domattr dom_document_create_attribute(string name);
+/* {{{ proto DOMAttr dom_document_create_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
 Since: 
 */
@@ -960,7 +960,7 @@ PHP_FUNCTION(dom_document_create_attribute)
 /* }}} end dom_document_create_attribute */
 
 
-/* {{{ proto domentityreference dom_document_create_entity_reference(string name);
+/* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
 Since: 
 */
@@ -994,7 +994,7 @@ PHP_FUNCTION(dom_document_create_entity_reference)
 /* }}} end dom_document_create_entity_reference */
 
 
-/* {{{ proto domnodelist dom_document_get_elements_by_tag_name(string tagname);
+/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
 Since: 
 */
@@ -1021,7 +1021,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
 /* }}} end dom_document_get_elements_by_tag_name */
 
 
-/* {{{ proto domnode dom_document_import_node(node importedNode, boolean deep);
+/* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, boolean deep);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
 Since: DOM Level 2
 */
@@ -1063,7 +1063,7 @@ PHP_FUNCTION(dom_document_import_node)
 /* }}} end dom_document_import_node */
 
 
-/* {{{ proto domelement dom_document_create_element_ns(string namespaceURI, string qualifiedName);
+/* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
 Since: DOM Level 2
 */
@@ -1127,7 +1127,7 @@ PHP_FUNCTION(dom_document_create_element_ns)
 /* }}} end dom_document_create_element_ns */
 
 
-/* {{{ proto domattr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName);
+/* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
 Since: DOM Level 2
 */
@@ -1193,7 +1193,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
 /* }}} end dom_document_create_attribute_ns */
 
 
-/* {{{ proto domnodelist dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
 Since: DOM Level 2
 */
@@ -1221,7 +1221,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
 /* }}} end dom_document_get_elements_by_tag_name_ns */
 
 
-/* {{{ proto domelement dom_document_get_element_by_id(string elementId);
+/* {{{ proto DOMElement dom_document_get_element_by_id(string elementId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
 Since: DOM Level 2
 */
@@ -1252,7 +1252,7 @@ PHP_FUNCTION(dom_document_get_element_by_id)
 /* }}} end dom_document_get_element_by_id */
 
 
-/* {{{ proto domnode dom_document_adopt_node(node source);
+/* {{{ proto DOMNode dom_document_adopt_node(DOMNode source);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
 Since: DOM Level 3
 */
@@ -1263,7 +1263,7 @@ PHP_FUNCTION(dom_document_adopt_node)
 /* }}} end dom_document_adopt_node */
 
 
-/* {{{ proto dom_void dom_document_normalize_document();
+/* {{{ proto void dom_document_normalize_document();
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
 Since: DOM Level 3
 */
@@ -1284,7 +1284,7 @@ PHP_FUNCTION(dom_document_normalize_document)
 /* }}} end dom_document_normalize_document */
 
 
-/* {{{ proto domnode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);
+/* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode
 Since: DOM Level 3
 */
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(dom_document_rename_node)
 }
 /* }}} end dom_document_rename_node */
 
-/* {{{ proto void DomDocument::__construct([string version], [string encoding]); */
+/* {{{ proto void DOMDocument::__construct([string version], [string encoding]); */
 PHP_METHOD(domdocument, __construct)
 {
 
@@ -1337,7 +1337,7 @@ PHP_METHOD(domdocument, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)docp, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end dom_document_document */
+/* }}} end DOMDocument::__construct */
 
 char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
 	xmlURI *uri;
@@ -1544,7 +1544,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 }
 /* }}} end dom_parser_document */
 
-/* {{{ proto boolean|domnode dom_document_load(string source);
+/* {{{ proto boolean|DOMNode dom_document_load(string source);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
 Since: DOM Level 3
 */
@@ -1554,7 +1554,7 @@ PHP_METHOD(domdocument, load)
 }
 /* }}} end dom_document_load */
 
-/* {{{ proto boolean|domnode dom_document_loadxml(string source);
+/* {{{ proto boolean|DOMNode dom_document_loadxml(string source);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
 Since: DOM Level 3
 */
@@ -1564,7 +1564,7 @@ PHP_METHOD(domdocument, loadXML)
 }
 /* }}} end dom_document_loadxml */
 
-/* {{{ proto long|domnode dom_document_save(string file);
+/* {{{ proto long dom_document_save(string file);
 Convenience method to save to file
 */
 PHP_FUNCTION(dom_document_save)
@@ -1600,7 +1600,7 @@ PHP_FUNCTION(dom_document_save)
 }
 /* }}} end dom_document_save */
 
-/* {{{ proto string|domnode dom_document_savexml([node n]);
+/* {{{ proto string dom_document_savexml([node n]);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
 Since: DOM Level 3
 */
@@ -1729,7 +1729,7 @@ PHP_FUNCTION(dom_document_xinclude)
 }
 
 
-/* {{{ proto string|domnode dom_document_validate();
+/* {{{ proto boolean dom_document_validate();
 Since: DOM extended
 */
 PHP_FUNCTION(dom_document_validate)
@@ -1842,19 +1842,19 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 }
 
-/* {{{ proto boolean|domnode _dom_document_schema_validate(string filename); */
+/* {{{ proto boolean dom_document_schema_validate_file(string filename); */
 PHP_FUNCTION(dom_document_schema_validate_file)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
-/* }}} end _dom_document_schema_validate */
+/* }}} end dom_document_schema_validate_file */
 
-/* {{{ proto boolean|domnode _dom_document_schema_validate(string source); */
+/* {{{ proto boolean dom_document_schema_validate(string source); */
 PHP_FUNCTION(dom_document_schema_validate_xml)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
-/* }}} end _dom_document_schema_validate */
+/* }}} end dom_document_schema_validate */
 
 
 static void
@@ -1932,14 +1932,14 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 }
 
-/* {{{ proto boolean|domnode dom_document_relaxNG_validate_file(string filename); */
+/* {{{ proto boolean dom_document_relaxNG_validate_file(string filename); */
 PHP_FUNCTION(dom_document_relaxNG_validate_file)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_relaxNG_validate_file */
 
-/* {{{ proto boolean|domnode dom_document_relaxNG_validate_xml(string source); */
+/* {{{ proto boolean dom_document_relaxNG_validate_xml(string source); */
 PHP_FUNCTION(dom_document_relaxNG_validate_xml)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
@@ -2022,7 +2022,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 }
 
-/* {{{ proto boolean|domnode dom_document_load_html_file(string source);
+/* {{{ proto boolean|DOMNode dom_document_load_html_file(string source);
 Since: DOM extended
 */
 PHP_METHOD(domdocument, loadHTMLFile)
@@ -2031,7 +2031,7 @@ PHP_METHOD(domdocument, loadHTMLFile)
 }
 /* }}} end dom_document_load_html_file */
 
-/* {{{ proto boolean|domnode dom_document_load_html(string source);
+/* {{{ proto boolean|DOMNode dom_document_load_html(string source);
 Since: DOM extended
 */
 PHP_METHOD(domdocument, loadHTML)
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c
index d47fd725e6..14f761df89 100644
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domdocumentfragment extends domnode 
+* class DOMDocumentFragment extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-B63ED1A3
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_documentfragment_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomDocumentFragment::__construct(); */
+/* {{{ proto void DOMDocumentFragment::__construct(); */
 PHP_METHOD(domdocumentfragment, __construct)
 {
 
@@ -72,5 +72,5 @@ PHP_METHOD(domdocumentfragment, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomDocumentFragment::__construct */
+/* }}} end DOMDocumentFragment::__construct */
 #endif
diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
index 2e0323e810..bf3e5cf3be 100644
--- a/ext/dom/documenttype.c
+++ b/ext/dom/documenttype.c
@@ -28,7 +28,7 @@
 #include "php_dom.h"
 
 /*
-* class domdocumenttype extends domnode 
+* class DOMDocumentType extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-412266927
 * Since: 
@@ -38,8 +38,6 @@ zend_function_entry php_dom_documenttype_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
 /* {{{ proto name	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134
@@ -66,7 +64,7 @@ int dom_documenttype_name_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto entities	namednodemap	
+/* {{{ proto entities	DOMNamedNodeMap	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630
 Since: 
@@ -99,7 +97,7 @@ int dom_documenttype_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto notations	namednodemap	
+/* {{{ proto notations	DOMNamedNodeMap	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF
 Since: 
@@ -132,7 +130,7 @@ int dom_documenttype_notations_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto public_id	string	
+/* {{{ proto publicId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId
 Since: DOM Level 2
@@ -162,7 +160,7 @@ int dom_documenttype_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto system_id	string	
+/* {{{ proto systemId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId
 Since: DOM Level 2
@@ -191,7 +189,7 @@ int dom_documenttype_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto internal_subset	string	
+/* {{{ proto internalSubset	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset
 Since: DOM Level 2
diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c
index 860daab727..538bc682b6 100644
--- a/ext/dom/domexception.c
+++ b/ext/dom/domexception.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domexception 
+* class DOMException 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-17189187
 * Since: 
diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index c38ca3174b..5669bca3d4 100644
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -28,7 +28,7 @@
 #include "php_dom.h"
 
 /*
-* class domimplementation 
+* class DOMImplementation 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-102161490
 * Since: 
@@ -42,9 +42,6 @@ zend_function_entry php_dom_domimplementation_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-
 /* {{{ proto boolean dom_domimplementation_has_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7
 Since: 
@@ -67,7 +64,7 @@ PHP_METHOD(domimplementation, hasFeature)
 /* }}} end dom_domimplementation_has_feature */
 
 
-/* {{{ proto domdocumenttype dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);
+/* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
 Since: DOM Level 2
 */
@@ -121,7 +118,7 @@ PHP_METHOD(domimplementation, createDocumentType)
 /* }}} end dom_domimplementation_create_document_type */
 
 
-/* {{{ proto domdocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, documenttype doctype);
+/* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
 Since: DOM Level 2
 */
@@ -224,7 +221,7 @@ PHP_METHOD(domimplementation, createDocument)
 /* }}} end dom_domimplementation_create_document */
 
 
-/* {{{ proto domnode dom_domimplementation_get_feature(string feature, string version);
+/* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
 Since: DOM Level 3
 */
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 57ad3003e7..e5f15b02c5 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domelement extends domnode 
+* class DOMElement extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-745549614
 * Since: 
@@ -58,7 +58,7 @@ zend_function_entry php_dom_element_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomElement::__construct(string name, [string value], [string uri]); */
+/* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]); */
 PHP_METHOD(domelement, __construct)
 {
 
@@ -135,7 +135,7 @@ PHP_METHOD(domelement, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomElement::__construct */
+/* }}} end DOMElement::__construct */
 
 /* {{{ proto tagName	string	
 readonly=yes 
@@ -190,7 +190,7 @@ int dom_element_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domstring dom_element_get_attribute(string name);
+/* {{{ proto string dom_element_get_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
 Since:
 */
@@ -219,7 +219,7 @@ PHP_FUNCTION(dom_element_get_attribute)
 /* }}} end dom_element_get_attribute */
 
 
-/* {{{ proto dom_void dom_element_set_attribute(string name, string value);
+/* {{{ proto void dom_element_set_attribute(string name, string value);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
 Since: 
 */
@@ -265,7 +265,7 @@ PHP_FUNCTION(dom_element_set_attribute)
 /* }}} end dom_element_set_attribute */
 
 
-/* {{{ proto dom_void dom_element_remove_attribute(string name);
+/* {{{ proto void dom_element_remove_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
 Since:
 */
@@ -308,7 +308,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
 /* }}} end dom_element_remove_attribute */
 
 
-/* {{{ proto domattr dom_element_get_attribute_node(string name);
+/* {{{ proto DOMAttr dom_element_get_attribute_node(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
 Since: 
 */
@@ -337,7 +337,7 @@ PHP_FUNCTION(dom_element_get_attribute_node)
 /* }}} end dom_element_get_attribute_node */
 
 
-/* {{{ proto domattr dom_element_set_attribute_node(attr newAttr);
+/* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
 Since: 
 */
@@ -395,7 +395,7 @@ PHP_FUNCTION(dom_element_set_attribute_node)
 /* }}} end dom_element_set_attribute_node */
 
 
-/* {{{ proto domattr dom_element_remove_attribute_node(attr oldAttr);
+/* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
 Since: 
 */
@@ -433,7 +433,7 @@ PHP_FUNCTION(dom_element_remove_attribute_node)
 /* }}} end dom_element_remove_attribute_node */
 
 
-/* {{{ proto domnodelist dom_element_get_elements_by_tag_name(string name);
+/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
 Since: 
 */
@@ -460,7 +460,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
 /* }}} end dom_element_get_elements_by_tag_name */
 
 
-/* {{{ proto domstring dom_element_get_attribute_ns(string namespaceURI, string localName);
+/* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
 Since: DOM Level 2
 */
@@ -501,7 +501,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
 /* }}} end dom_element_get_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);
+/* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
 Since: DOM Level 2
 */
@@ -599,7 +599,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
 /* }}} end dom_element_set_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_remove_attribute_ns(string namespaceURI, string localName);
+/* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
 Since: DOM Level 2
 */
@@ -657,7 +657,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
 /* }}} end dom_element_remove_attribute_ns */
 
 
-/* {{{ proto domattr dom_element_get_attribute_node_ns(string namespaceURI, string localName);
+/* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
 Since: DOM Level 2
 */
@@ -688,7 +688,7 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns)
 /* }}} end dom_element_get_attribute_node_ns */
 
 
-/* {{{ proto domattr dom_element_set_attribute_node_ns(attr newAttr);
+/* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
 Since: DOM Level 2
 */
@@ -754,7 +754,7 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
 
 
 
-/* {{{ proto domnodelist dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
 Since: DOM Level 2
 */
@@ -850,7 +850,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns)
 /* }}} end dom_element_has_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute(string name, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute(string name, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
 Since: DOM Level 3
 */
@@ -861,7 +861,7 @@ PHP_FUNCTION(dom_element_set_id_attribute)
 /* }}} end dom_element_set_id_attribute */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
 Since: DOM Level 3
 */
@@ -872,7 +872,7 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns)
 /* }}} end dom_element_set_id_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute_node(attr idAttr, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
 Since: DOM Level 3
 */
diff --git a/ext/dom/entity.c b/ext/dom/entity.c
index 9e7420dac4..6da6b4e959 100644
--- a/ext/dom/entity.c
+++ b/ext/dom/entity.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domentity extends domnode 
+* class DOMEntity extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-527DCFF2
 * Since: 
@@ -39,9 +39,7 @@ zend_function_entry php_dom_entity_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-/* {{{ proto public_id	string	
+/* {{{ proto publicId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7303025
 Since: 
@@ -71,7 +69,7 @@ int dom_entity_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto system_id	string	
+/* {{{ proto systemId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E
 Since: 
@@ -101,7 +99,7 @@ int dom_entity_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto notation_name	string	
+/* {{{ proto notationName	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38
 Since: 
@@ -134,7 +132,7 @@ int dom_entity_notation_name_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto actual_encoding	string	
+/* {{{ proto actualEncoding	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding
 Since: DOM Level 3
diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c
index 7070172393..9ba69d7404 100644
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domentityreference extends domnode 
+* class DOMEntityReference extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-11C98490
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_entityreference_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomEntityReference::__construct(string name); */
+/* {{{ proto void DOMEntityReference::__construct(string name); */
 PHP_METHOD(domentityreference, __construct)
 {
 	zval *id;
@@ -81,5 +81,5 @@ PHP_METHOD(domentityreference, __construct)
 	}
 }
 
-/* }}} end DomEntityReference::__construct */
+/* }}} end DOMEntityReference::__construct */
 #endif
diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c
index 6e6c57f3b7..2bc585f018 100644
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domnamednodemap 
+* class DOMNamedNodeMap 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1780488922
 * Since: 
@@ -46,9 +46,7 @@ zend_function_entry php_dom_namednodemap_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-/* {{{ proto length	unsigned long	
+/* {{{ proto length	int	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E
 Since: 
@@ -90,7 +88,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domnode dom_namednodemap_get_named_item(string name);
+/* {{{ proto DOMNode dom_namednodemap_get_named_item(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
 Since: 
 */
@@ -140,7 +138,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item)
 /* }}} end dom_namednodemap_get_named_item */
 
 
-/* {{{ proto domnode dom_namednodemap_set_named_item(node arg);
+/* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788
 Since: 
 */
@@ -151,7 +149,7 @@ PHP_FUNCTION(dom_namednodemap_set_named_item)
 /* }}} end dom_namednodemap_set_named_item */
 
 
-/* {{{ proto domnode dom_namednodemap_remove_named_item(string name);
+/* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193
 Since: 
 */
@@ -162,7 +160,7 @@ PHP_FUNCTION(dom_namednodemap_remove_named_item)
 /* }}} end dom_namednodemap_remove_named_item */
 
 
-/* {{{ proto domnode dom_namednodemap_item(unsigned long index);
+/* {{{ proto DOMNode dom_namednodemap_item(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
 Since: 
 */
@@ -217,7 +215,7 @@ PHP_FUNCTION(dom_namednodemap_item)
 /* }}} end dom_namednodemap_item */
 
 
-/* {{{ proto domnode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS
 Since: DOM Level 2
 */
@@ -267,7 +265,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns)
 /* }}} end dom_namednodemap_get_named_item_ns */
 
 
-/* {{{ proto domnode dom_namednodemap_set_named_item_ns(node arg);
+/* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS
 Since: DOM Level 2
 */
@@ -278,7 +276,7 @@ PHP_FUNCTION(dom_namednodemap_set_named_item_ns)
 /* }}} end dom_namednodemap_set_named_item_ns */
 
 
-/* {{{ proto domnode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS
 Since: DOM Level 2
 */
diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c
index fcbe85c052..c4462ef31b 100644
--- a/ext/dom/namelist.c
+++ b/ext/dom/namelist.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domnamelist 
+* class DOMNameList 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList
 * Since: DOM Level 3
@@ -41,9 +41,7 @@ zend_function_entry php_dom_namelist_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-/* {{{ proto length	unsigned long	
+/* {{{ proto length	int	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-length
 Since: 
@@ -60,7 +58,7 @@ int dom_namelist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domstring dom_namelist_get_name(unsigned long index);
+/* {{{ proto string dom_namelist_get_name(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName
 Since: 
 */
@@ -71,7 +69,7 @@ PHP_FUNCTION(dom_namelist_get_name)
 /* }}} end dom_namelist_get_name */
 
 
-/* {{{ proto domstring dom_namelist_get_namespace_uri(unsigned long index);
+/* {{{ proto string dom_namelist_get_namespace_uri(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI
 Since: 
 */
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 6964812d23..a93701f099 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -28,7 +28,7 @@
 #include "php_dom.h"
 
 /*
-* class domnode 
+* class DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1950641247
 * Since: 
@@ -260,7 +260,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto nodeType	unsigned short	
+/* {{{ proto nodeType	int
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558
 Since:
@@ -292,7 +292,7 @@ int dom_node_node_type_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto parentNode	node	
+/* {{{ proto parentNode	DomNode	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317
 Since: 
@@ -327,7 +327,7 @@ int dom_node_parent_node_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto childNodes	nodelist	
+/* {{{ proto childNodes	DomNodeList	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987
 Since: 
@@ -361,7 +361,7 @@ int dom_node_child_nodes_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto firstChild node	
+/* {{{ proto firstChild DomNode	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388
 Since: 
@@ -399,7 +399,7 @@ int dom_node_first_child_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto lastChild	node	
+/* {{{ proto lastChild	DomNode	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB
 Since: 
@@ -437,7 +437,7 @@ int dom_node_last_child_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto previousSibling	node	
+/* {{{ proto previousSibling	DomNode	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8
 Since: 
@@ -472,7 +472,7 @@ int dom_node_previous_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto nextSibling	node
+/* {{{ proto nextSibling	DomNode
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F
 Since:
@@ -507,7 +507,7 @@ int dom_node_next_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto attributes	namednodemap	
+/* {{{ proto attributes	DomNamedNodeMap	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096
 Since: 
@@ -541,7 +541,7 @@ int dom_node_attributes_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto ownerDocument	dom_document	
+/* {{{ proto ownerDocument	DomDocument	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc
 Since: 
@@ -858,7 +858,7 @@ int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto domnode dom_node_insert_before(node newChild, node refChild);
+/* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
 Since:
 */
@@ -1011,7 +1011,7 @@ PHP_FUNCTION(dom_node_insert_before)
 /* }}} end dom_node_insert_before */
 
 
-/* {{{ proto domnode dom_node_replace_child(node newChild, node oldChild);
+/* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307
 Since: 
 */
@@ -1092,7 +1092,7 @@ PHP_FUNCTION(dom_node_replace_child)
 /* }}} end dom_node_replace_child */
 
 
-/* {{{ proto domnode dom_node_remove_child(node oldChild);
+/* {{{ proto DomNode dom_node_remove_child(DomNode oldChild);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066
 Since: 
 */
@@ -1145,7 +1145,7 @@ PHP_FUNCTION(dom_node_remove_child)
 /* }}} end dom_node_remove_child */
 
 
-/* {{{ proto domnode dom_node_append_child(node newChild);
+/* {{{ proto DomNode dom_node_append_child(DomNode newChild);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107
 Since: 
 */
@@ -1275,7 +1275,7 @@ PHP_FUNCTION(dom_node_has_child_nodes)
 /* }}} end dom_node_has_child_nodes */
 
 
-/* {{{ proto domnode dom_node_clone_node(boolean deep);
+/* {{{ proto DomNode dom_node_clone_node(boolean deep);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4
 Since: 
 */
@@ -1339,7 +1339,7 @@ PHP_FUNCTION(dom_node_clone_node)
 
 
 
-/* {{{ proto dom_void dom_node_normalize();
+/* {{{ proto void dom_node_normalize();
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize
 Since: 
 */
@@ -1411,8 +1411,7 @@ PHP_FUNCTION(dom_node_has_attributes)
 }
 /* }}} end dom_node_has_attributes */
 
-
-/* {{{ proto short dom_node_compare_document_position(node other);
+/* {{{ proto short dom_node_compare_document_position(DomNode other);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-compareDocumentPosition
 Since: DOM Level 3
 */
@@ -1423,7 +1422,7 @@ PHP_FUNCTION(dom_node_compare_document_position)
 /* }}} end dom_node_compare_document_position */
 
 
-/* {{{ proto boolean dom_node_is_same_node(node other);
+/* {{{ proto boolean dom_node_is_same_node(DomNode other);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode
 Since: DOM Level 3
 */
@@ -1450,7 +1449,7 @@ PHP_FUNCTION(dom_node_is_same_node)
 /* }}} end dom_node_is_same_node */
 
 
-/* {{{ proto domstring dom_node_lookup_prefix(string namespaceURI);
+/* {{{ proto string dom_node_lookup_prefix(string namespaceURI);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix
 Since: DOM Level 3
 */
@@ -1532,7 +1531,7 @@ PHP_FUNCTION(dom_node_is_default_namespace)
 /* }}} end dom_node_is_default_namespace */
 
 
-/* {{{ proto domstring dom_node_lookup_namespace_uri(string prefix);
+/* {{{ proto string dom_node_lookup_namespace_uri(string prefix);
 URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI
 Since: DOM Level 3
 */
@@ -1563,7 +1562,7 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri)
 /* }}} end dom_node_lookup_namespace_uri */
 
 
-/* {{{ proto boolean dom_node_is_equal_node(node arg);
+/* {{{ proto boolean dom_node_is_equal_node(DomNode arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode
 Since: DOM Level 3
 */
@@ -1574,7 +1573,7 @@ PHP_FUNCTION(dom_node_is_equal_node)
 /* }}} end dom_node_is_equal_node */
 
 
-/* {{{ proto domnode dom_node_get_feature(string feature, string version);
+/* {{{ proto DomNode dom_node_get_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature
 Since: DOM Level 3
 */
@@ -1585,7 +1584,7 @@ PHP_FUNCTION(dom_node_get_feature)
 /* }}} end dom_node_get_feature */
 
 
-/* {{{ proto domuserdata dom_node_set_user_data(string key, domuserdata data, userdatahandler handler);
+/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data, userdatahandler handler);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
 Since: DOM Level 3
 */
@@ -1596,7 +1595,7 @@ PHP_FUNCTION(dom_node_set_user_data)
 /* }}} end dom_node_set_user_data */
 
 
-/* {{{ proto domuserdata dom_node_get_user_data(string key);
+/* {{{ proto DomUserData dom_node_get_user_data(string key);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
 Since: DOM Level 3
 */
diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c
index 10a7b6671d..72c388fc01 100644
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domnodelist 
+* class DOMNodeList 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-536297177
 * Since: 
@@ -40,9 +40,7 @@ zend_function_entry php_dom_nodelist_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-/* {{{ proto length	unsigned long	
+/* {{{ proto length	int	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-203510337
 Since: 
@@ -95,7 +93,7 @@ int dom_nodelist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto domnode dom_nodelist_item(unsigned long index);
+/* {{{ proto DOMNode dom_nodelist_item(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
 Since: 
 */
diff --git a/ext/dom/notation.c b/ext/dom/notation.c
index f43d6ae12c..6dfbfcb22f 100644
--- a/ext/dom/notation.c
+++ b/ext/dom/notation.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domnotation extends domnode 
+* class DOMNotation extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5431D1B9
 * Since: 
@@ -41,7 +41,7 @@ zend_function_entry php_dom_notation_class_functions[] = {
 
 /* {{{ attribute protos, not implemented yet */
 
-/* {{{ proto public_id	string	
+/* {{{ proto publicId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0
 Since: 
@@ -71,7 +71,7 @@ int dom_notation_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto system_id	string	
+/* {{{ proto systemId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0
 Since: 
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index c3b85a4445..23a3fe2900 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domprocessinginstruction extends domnode 
+* class DOMProcessingInstruction extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1004215813
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_processinginstruction_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomProcessingInstruction::__construct(string name, [string value]); */
+/* {{{ proto void DOMProcessingInstruction::__construct(string name, [string value]); */
 PHP_METHOD(domprocessinginstruction, __construct)
 {
 
@@ -80,7 +80,7 @@ PHP_METHOD(domprocessinginstruction, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomProcessingInstruction::__construct */
+/* }}} end DOMProcessingInstruction::__construct */
 
 /* {{{ proto target	string	
 readonly=yes 
diff --git a/ext/dom/text.c b/ext/dom/text.c
index e3c4f05a3c..ab89177065 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -29,7 +29,7 @@
 #include "dom_ce.h"
 
 /*
-* class domtext extends domcharacterdata 
+* class DOMText extends DOMCharacterData 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1312295772
 * Since: 
@@ -43,7 +43,7 @@ zend_function_entry php_dom_text_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomText::__construct([string value]); */
+/* {{{ proto void DOMText::__construct([string value]); */
 PHP_METHOD(domtext, __construct)
 {
 
@@ -76,7 +76,7 @@ PHP_METHOD(domtext, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomText::__construct */
+/* }}} end DOMText::__construct */
 
 /* {{{ proto wholeText	string	
 readonly=yes 
@@ -107,7 +107,7 @@ int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto domtext dom_text_split_text(unsigned long offset);
+/* {{{ proto DOMText dom_text_split_text(int offset);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D
 Since: 
 */
@@ -133,7 +133,7 @@ PHP_FUNCTION(dom_text_split_text)
 		RETURN_FALSE;
 	}
 
-	cur = xmlNodeListGetString(node->doc, node, 1);
+	cur = xmlNodeGetContent(node);
 	if (cur == NULL) {
 		RETURN_FALSE;
 	}
@@ -190,7 +190,7 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content)
 /* }}} end dom_text_is_whitespace_in_element_content */
 
 
-/* {{{ proto domtext dom_text_replace_whole_text(string content);
+/* {{{ proto DOMText dom_text_replace_whole_text(string content);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText
 Since: DOM Level 3
 */
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 9f0f59cc0d..6a43d75f18 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -29,7 +29,7 @@
 
 
 /*
-* class domxpath 
+* class DOMXPath 
 */
 
 #if defined(LIBXML_XPATH_ENABLED)
@@ -41,7 +41,7 @@ zend_function_entry php_dom_xpath_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomXPath::__construct(domDocument doc); */
+/* {{{ proto void DOMXPath::__construct(DOMDocument doc); */
 PHP_METHOD(domxpath, __construct)
 {
 	zval *id, *doc;
@@ -76,9 +76,9 @@ PHP_METHOD(domxpath, __construct)
 		php_libxml_increment_doc_ref((php_libxml_node_object *)intern, docp TSRMLS_CC);
 	}
 }
-/* }}} end DomXPath::__construct */
+/* }}} end DOMXPath::__construct */
 
-/* {{{ proto domdocument document	document */
+/* {{{ proto document DOMDocument*/
 int dom_xpath_document_read(dom_object *obj, zval **retval TSRMLS_DC)
 {
 	xmlDoc *docp = NULL;
@@ -136,7 +136,7 @@ static void dom_xpath_iter(zval *baseobj, dom_object *intern)
 
 }
 
-/* {{{ proto domnodelist dom_xpath_query(string expr [,domNode context]); */
+/* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */
 PHP_FUNCTION(dom_xpath_query)
 {
 	zval *id, *retval, *context = NULL;