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/processinginstruction.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/processinginstruction.c')
| -rw-r--r-- | ext/dom/processinginstruction.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index df66fb0bef..804a371635 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -36,10 +36,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* 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: +* Since: */ const zend_function_entry php_dom_processinginstruction_class_functions[] = { @@ -88,10 +88,10 @@ PHP_METHOD(domprocessinginstruction, __construct) } /* }}} end DOMProcessingInstruction::__construct */ -/* {{{ target string -readonly=yes +/* {{{ target string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1478689192 -Since: +Since: */ int dom_processinginstruction_target_read(dom_object *obj, zval *retval) { @@ -109,10 +109,10 @@ int dom_processinginstruction_target_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ data string -readonly=no +/* {{{ data string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393 -Since: +Since: */ int dom_processinginstruction_data_read(dom_object *obj, zval *retval) { |