diff options
author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/dom/notation.c | |
parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/dom/notation.c')
-rw-r--r-- | ext/dom/notation.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/dom/notation.c b/ext/dom/notation.c index cf4039f3ab..20d5d053d2 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -28,10 +28,10 @@ #include "php_dom.h" /* -* 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: +* Since: */ const zend_function_entry php_dom_notation_class_functions[] = { @@ -40,10 +40,10 @@ const zend_function_entry php_dom_notation_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ publicId string -readonly=yes +/* {{{ publicId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0 -Since: +Since: */ int dom_notation_public_id_read(dom_object *obj, zval *retval) { @@ -65,10 +65,10 @@ int dom_notation_public_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ systemId string -readonly=yes +/* {{{ systemId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 -Since: +Since: */ int dom_notation_system_id_read(dom_object *obj, zval *retval) { |