cvs: phpdoc /en/reference/dom/functions dom-domdocument-construct.xml dom-domdocument-getelementbyid.xml dom-domdocument-getelementsbytagname.xml
dom-domdocument-importnode.xml dom-domdocument-load.xml dom-domdocument-loadhtml.xml dom-domdocument-loadhtmlfile.xml dom-domdocument-loadxml.xml
dom-domdocument-normalize.xml dom-domdocument-save.xml dom-domdocument-savexml.xml dom-domdocument-validate.xml dom-domdocument-xinclude.xml
| From: | Mehdi Achour | Date: | Fri, 31 Dec 2004 11:49:57 +0000 |
| Subject: | cvs: phpdoc /en/reference/dom/functions dom-domdocument-construct.xml dom-domdocument-getelementbyid.xml dom-domdocument-getelementsbytagname.xml dom-domdocument-importnode.xml dom-domdocument-load.xml dom-domdocument-loadhtml.xml dom-domdocument-loadhtmlfile.xml dom-domdocument-loadxml.xml dom-domdocument-normalize.xml dom-domdocument-save.xml dom-domdocument-savexml.xml dom-domdocument-validate.xml dom-domdocument-xinclude.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969365729@lists.php.net to get a copy of this message | ||
didou Fri Dec 31 06:49:57 2004 EDT
Modified files:
/phpdoc/en/reference/dom/functions dom-domdocument-construct.xml
dom-domdocument-getelementbyid.xml
dom-domdocument-getelementsbytagname.xml
dom-domdocument-importnode.xml
dom-domdocument-loadhtmlfile.xml
dom-domdocument-loadhtml.xml
dom-domdocument-load.xml
dom-domdocument-loadxml.xml
dom-domdocument-normalize.xml
dom-domdocument-save.xml
dom-domdocument-savexml.xml
dom-domdocument-validate.xml
dom-domdocument-xinclude.xml
Log:
Switch some files to the new structure, use xrefs, document parameters, fix protos
http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.2 phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.3 --- phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.2 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <refentry id='function.dom-domdocument-construct'> <refnamediv> - <refname>DOMDocument->__construct</refname> + <refname>DOMDocument->__construct()</refname> <refpurpose> Creates a new DOMDocument object </refpurpose> @@ -67,7 +67,7 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domimplementation-createdocument">DOMImplementation-createDocument()</link></member> + <member><xref linkend="function.dom-domimplementation-createdocument" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.6 phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.7 --- phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.6 Sun Dec 19 22:10:23 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml Fri Dec 31 06:49:57 2004 @@ -1,34 +1,59 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> - <refentry id="function.dom-domdocument-getelementbyid"> - <refnamediv> - <refname>DOMDocument->getElementById</refname> - <refpurpose>Searches for an element with a certain id</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMElement</type> - <methodname>getElementById</methodname> - <methodparam><type>string</type><parameter>elementId</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function is similar to - <link linkend="function.dom-domdocument-getelementsbytagname">DOMDocument->getElementsByTagName()</link> - but searches for an element with a given id. - </para> - <para> - According to the DOM standard this requires a DTD which defines the - attribute ID to be of type ID. You need to validate your document with - <link linkend="function.dom-domdocument-validate">DOMDocument->validate()</link> - or <literal>DOMDocument::validateOnParse</literal> before using this function. - </para> - <example> - <title>DOMDocument->getElementById() Example</title> - <programlisting role="php"> +<!-- $Revision: 1.7 $ --> +<refentry id="function.dom-domdocument-getelementbyid"> + <refnamediv> + <refname>DOMDocument->getElementById()</refname> + <refpurpose>Searches for an element with a certain id</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMElement</type> + <methodname>getElementById</methodname> + <methodparam><type>string</type><parameter>elementId</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function is similar to + <xref linkend="function.dom-domdocument-getelementsbytagname" /> but + searches for an element with a given id. + </para> + <para> + According to the DOM standard this requires a DTD which defines the + attribute ID to be of type ID. You need to validate your document with + <xref linkend="function.dom-domdocument-validate" /> + or <literal>DOMDocument->validateOnParse</literal> before using this function. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>elementId</parameter></term> + <listitem> + <para> + The unique id value for an element. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + Returns the <classname>DOMElement</classname> or &null; if the element is + not found. + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <example> + <title>DOMDocument->getElementById() Example</title> + <programlisting role="php"> <![CDATA[ <?php @@ -42,19 +67,24 @@ ?> ]]> - </programlisting> - &example.outputs; - <screen> + </programlisting> + &example.outputs; + <screen> <![CDATA[ The element whose id is books is: chapter ]]> - </screen> - </example> - <para> - See also <link linkend="function.dom-domdocument-getelementsbytagname">DOMDocument->getElementsByTagName()</link>. - </para> - </refsect1> - </refentry> + </screen> + </example> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-getelementsbytagname" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.5 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml Fri Dec 31 06:49:57 2004 @@ -1,28 +1,58 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> - <refentry id="function.dom-domdocument-getelementsbytagname"> - <refnamediv> - <refname>DOMDocument->getElementsByTagName</refname> - <refpurpose>Searches for all elements with given tag name</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMNodeList</type> - <methodname>getElementsByTagName</methodname> - <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function returns a new instance of class - <classname>DOMNodeList</classname> containing the elements with tagnames - matching the name parameter. Use "*" for the name to return all elements - within the document. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.6 $ --> +<refentry id="function.dom-domdocument-getelementsbytagname"> + <refnamediv> + <refname>DOMDocument->getElementsByTagName()</refname> + <refpurpose>Searches for all elements with given tag name</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMNodeList</type> + <methodname>getElementsByTagName</methodname> + <methodparam><type>string</type><parameter>name</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function returns a new instance of class + <classname>DOMNodeList</classname> containing the elements with a given + tag name. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem> + <para> + The name of the tag to match on. The special value <literal>*</literal> + matches all tags. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + A new <classname>DOMNodeList</classname> object containing all the matched + elements. + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-getelementsbytagnamens" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.7 phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.8 --- phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.7 Fri Dec 17 12:51:21 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml Fri Dec 31 06:49:57 2004 @@ -1,32 +1,63 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> - <refentry id="function.dom-domdocument-importnode"> - <refnamediv> - <refname>DOMDocument->importNode</refname> - <refpurpose>Import node into current document</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMNode</type> - <methodname>importNode</methodname> - <methodparam><type>DOMNode</type><parameter>importedNode</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>deep</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function returns a copy of the node to import and associates it with - the current document. <classname>DOMException</classname> is thrown if - node cannot be imported. - </para> - <para> - If <parameter>deep</parameter> is set to &true;, this method will recursively - import the subtree under the <parameter>importedNode</parameter>. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.8 $ --> +<refentry id="function.dom-domdocument-importnode"> + <refnamediv> + <refname>DOMDocument->importNode()</refname> + <refpurpose>Import node into current document</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMNode</type> + <methodname>importNode</methodname> + <methodparam><type>DOMNode</type><parameter>importedNode</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>deep</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function returns a copy of the node to import and associates it with + the current document. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>importedNode</parameter></term> + <listitem> + <para> + The node to import. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>deep</parameter></term> + <listitem> + <para> + If set to &true;, this method will recursively import the subtree under + the <parameter>importedNode</parameter>. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + The copied node. + </para> + </refsect1> + <refsect1 role="exceptions"> + &reftitle.exceptions; + <para> + <classname>DOMException</classname> is thrown if node cannot be imported. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml Fri Dec 31 06:49:57 2004 @@ -1,34 +1,61 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-loadhtmlfile"> - <refnamediv> - <refname>DOMDocument->loadHTMLFile</refname> - <refpurpose> - Load HTML from a file - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>mixed</type> - <methodname>loadHTMLFile</methodname> - <methodparam><type>string</type><parameter>filename</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - The function parses the HTML document in the file named - <parameter>filename</parameter>. Unlike loading XML, HTML does not have - to be well-formed to load.This function may also be called statically to - load and create a <classname>DOMDocument</classname> object. The static - invocation may be used when no <classname>DOMDocument</classname> - properties need to be set prior to loading. - </para> - <para> - <example> - <title>Creating a Document</title> - <programlisting role="php"> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-loadhtmlfile"> + <refnamediv> + <refname>DOMDocument->loadHTMLFile()</refname> + <refpurpose> + Load HTML from a file + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>bool</type> + <methodname>loadHTMLFile</methodname> + <methodparam><type>string</type><parameter>filename</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + The function parses the HTML document in the file named + <parameter>filename</parameter>. Unlike loading XML, HTML does not have + to be well-formed to load. + </para> + <para> + This function may also be called statically to load and create a + <classname>DOMDocument</classname> object. The static invocation may be + used when no <classname>DOMDocument</classname> properties need to be set + prior to loading. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>filename</parameter></term> + <listitem> + <para> + The path to the HTML file. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Creating a Document</title> + <programlisting role="php"> <![CDATA[ <?php $doc = DOMDocument::loadHTMLFile("filename.html"); @@ -39,16 +66,21 @@ print $doc->saveHTML(); ?> ]]> - </programlisting> - </example> - </para> - <para> - See also <link linkend="function.dom-domdocument-loadhtml">DOMDocument->loadHTML()</link>, - <link linkend="function.dom-domdocument-savehtml">DOMDocument->saveHTML()</link> and - <link linkend="function.dom-domdocument-savehtmlfile">DOMDocument->saveHTMLFile()</link>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-loadhtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtmlfile" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml Fri Dec 31 06:49:57 2004 @@ -1,54 +1,83 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-loadhtml"> - <refnamediv> - <refname>DOMDocument->loadHTML</refname> - <refpurpose> - Load HTML from a string - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>mixed</type> - <methodname>loadHTML</methodname> - <methodparam><type>string</type><parameter>source</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - The function parses the HTML contained in the string <parameter>source</parameter>. - Unlike loading XML, HTML does not have to be well-formed to load. This - function may also be called statically to load and create a - <classname>DOMDocument</classname> object. The static invocation may be - used when no <classname>DOMDocument</classname> properties need to be - set prior to loading. - </para> - <para> - <example> - <title>Creating a Document</title> - <programlisting role="php"> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-loadhtml"> + <refnamediv> + <refname>DOMDocument->loadHTML()</refname> + <refpurpose> + Load HTML from a string + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>bool</type> + <methodname>loadHTML</methodname> + <methodparam><type>string</type><parameter>source</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + The function parses the HTML contained in the string <parameter>source</parameter>. + Unlike loading XML, HTML does not have to be well-formed to load. This + function may also be called statically to load and create a + <classname>DOMDocument</classname> object. The static invocation may be + used when no <classname>DOMDocument</classname> properties need to be + set prior to loading. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>source</parameter></term> + <listitem> + <para> + The HTML string. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Creating a Document</title> + <programlisting role="php"> <![CDATA[ <?php $doc = DOMDocument::loadHTML("<html><body>Test<br></body></html>"); -print $doc->saveHTML(); +echo $doc->saveHTML(); $doc = new DOMDocument(); $doc->loadHTML("<html><body>Test<br></body></html>"); -print $doc->saveHTML(); +echo $doc->saveHTML(); ?> ]]> - </programlisting> - </example> - </para> - <para> - See also <link linkend="function.dom-domdocument-loadhtmlfile">DOMDocument->loadHTMLFile()</link>, - <link linkend="function.dom-domdocument-savehtml">DOMDocument->saveHTML()</link> and - <link linkend="function.dom-domdocument-savehtmlfile">DOMDocument->saveHTMLFile()</link>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-loadhtmlfile" /></member> + <member><xref linkend="function.dom-domdocument-savehtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtmlfile" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-load.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-load.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-load.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-load"> <refnamediv> - <refname>DOMDocument->load</refname> + <refname>DOMDocument->load()</refname> <refpurpose> Load XML from a file </refpurpose> @@ -12,7 +12,7 @@ <classsynopsis> <ooclass><classname>DOMDocument</classname></ooclass> <methodsynopsis> - <type>mixed</type> + <type>bool</type> <methodname>load</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> </methodsynopsis> @@ -42,6 +42,12 @@ </variablelist> </para> </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> @@ -66,9 +72,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-loadxml">DOMDocument->loadXML()</link></member> - <member><link linkend="function.dom-domdocument-save">DOMDocument->save()</link></member> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> + <member><xref linkend="function.dom-domdocument-loadxml" /></member> + <member><xref linkend="function.dom-domdocument-save" /></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-loadxml"> <refnamediv> - <refname>DOMDocument->loadXML</refname> + <refname>DOMDocument->loadXML()</refname> <refpurpose> Load XML from a string </refpurpose> @@ -12,7 +12,7 @@ <classsynopsis> <ooclass><classname>DOMDocument</classname></ooclass> <methodsynopsis> - <type>mixed</type> + <type>bool</type> <methodname>loadXML</methodname> <methodparam><type>string</type><parameter>source</parameter></methodparam> </methodsynopsis> @@ -42,6 +42,12 @@ </variablelist> </para> </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> @@ -66,9 +72,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-load">DOMDocument->load()</link></member> - <member><link linkend="function.dom-domdocument-save">DOMDocument->save()</link></member> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> + <member><xref linkend="function.dom-domdocument-load" /></member> + <member><xref linkend="function.dom-domdocument-save" /></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml Fri Dec 31 06:49:57 2004 @@ -1,27 +1,41 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-normalize"> - <refnamediv> - <refname>DOMDocument->normalize</refname> - <refpurpose> - Normalizes document - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>void</type> - <methodname>normalize</methodname> - <void/> - </methodsynopsis> - </classsynopsis> - <para> - Normalizes document. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-normalize"> + <refnamediv> + <refname>DOMDocument->normalize()</refname> + <refpurpose> + Normalizes the document + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <void/> + <methodname>normalize</methodname> + <void/> + </methodsynopsis> + </classsynopsis> + <para> + Normalizes the document. + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.void; + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domnode-normalize" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-save.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-save.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.4 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-save.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <refentry id="function.dom-domdocument-save"> <refnamediv> - <refname>DOMDocument->save</refname> + <refname>DOMDocument->save()</refname> <refpurpose> Dumps the internal XML tree back into a file </refpurpose> @@ -77,9 +77,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> - <member><link linkend="function.dom-domdocument-load">DOMDocument->load()</link></member> - <member><link linkend="function.dom-domdocument-loadxml">DOMDocument->loadXML()</link></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> + <member><xref linkend="function.dom-domdocument-load" /></member> + <member><xref linkend="function.dom-domdocument-loadxml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.1 phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.2 --- phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.1 Mon Dec 20 19:42:35 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml Fri Dec 31 06:49:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <refentry id="function.dom-domdocument-savexml"> <refnamediv> <refname>DOMDocument->saveXML()</refname> @@ -44,6 +44,13 @@ Returns the XML, or &false; if an error occured. </para> </refsect1> + <refsect1 role="exceptions"> + &reftitle.exceptions; + <para> + Throws <classname>DOMException</classname> if <parameter>node</parameter> + is from another document. + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.6 phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.7 --- phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.6 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <refentry id="function.dom-domdocument-validate"> <refnamediv> - <refname>DOMDocument->validate</refname> + <refname>DOMDocument->validate()</refname> <refpurpose> Validates the document based on its DTD </refpurpose> @@ -67,10 +67,10 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-schemavalidate">DOMDocument->schemaValidate()</link></member> - <member><link linkend="function.dom-domdocument-schemavalidatesource">DOMDocument->schemaValidateSource()</link></member> - <member><link linkend="function.dom-domdocument-relaxngvalidate">DOMDocument->relaxNGValidate()</link></member> - <member><link linkend="function.dom-domdocument-relaxngvalidatesource">DOMDocument->relaxNGValidateSource()</link></member> + <member><xref linkend="function.dom-domdocument-schemavalidate" /></member> + <member><xref linkend="function.dom-domdocument-schemavalidatesource" /></member> + <member><xref linkend="function.dom-domdocument-relaxngvalidate" /></member> + <member><xref linkend="function.dom-domdocument-relaxngvalidatesource" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-xinclude"> <refnamediv> - <refname>DOMDocument->xinclude</refname> + <refname>DOMDocument->xinclude()</refname> <refpurpose> Substitutes XIncludes in a DOMDocument Object </refpurpose>
http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.2 phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.3 --- phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml:1.2 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-construct.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <refentry id='function.dom-domdocument-construct'> <refnamediv> - <refname>DOMDocument->__construct</refname> + <refname>DOMDocument->__construct()</refname> <refpurpose> Creates a new DOMDocument object </refpurpose> @@ -67,7 +67,7 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domimplementation-createdocument">DOMImplementation-createDocument()</link></member> + <member><xref linkend="function.dom-domimplementation-createdocument" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.6 phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.7 --- phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml:1.6 Sun Dec 19 22:10:23 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-getelementbyid.xml Fri Dec 31 06:49:57 2004 @@ -1,34 +1,59 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> - <refentry id="function.dom-domdocument-getelementbyid"> - <refnamediv> - <refname>DOMDocument->getElementById</refname> - <refpurpose>Searches for an element with a certain id</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMElement</type> - <methodname>getElementById</methodname> - <methodparam><type>string</type><parameter>elementId</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function is similar to - <link linkend="function.dom-domdocument-getelementsbytagname">DOMDocument->getElementsByTagName()</link> - but searches for an element with a given id. - </para> - <para> - According to the DOM standard this requires a DTD which defines the - attribute ID to be of type ID. You need to validate your document with - <link linkend="function.dom-domdocument-validate">DOMDocument->validate()</link> - or <literal>DOMDocument::validateOnParse</literal> before using this function. - </para> - <example> - <title>DOMDocument->getElementById() Example</title> - <programlisting role="php"> +<!-- $Revision: 1.7 $ --> +<refentry id="function.dom-domdocument-getelementbyid"> + <refnamediv> + <refname>DOMDocument->getElementById()</refname> + <refpurpose>Searches for an element with a certain id</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMElement</type> + <methodname>getElementById</methodname> + <methodparam><type>string</type><parameter>elementId</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function is similar to + <xref linkend="function.dom-domdocument-getelementsbytagname" /> but + searches for an element with a given id. + </para> + <para> + According to the DOM standard this requires a DTD which defines the + attribute ID to be of type ID. You need to validate your document with + <xref linkend="function.dom-domdocument-validate" /> + or <literal>DOMDocument->validateOnParse</literal> before using this function. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>elementId</parameter></term> + <listitem> + <para> + The unique id value for an element. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + Returns the <classname>DOMElement</classname> or &null; if the element is + not found. + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <example> + <title>DOMDocument->getElementById() Example</title> + <programlisting role="php"> <![CDATA[ <?php @@ -42,19 +67,24 @@ ?> ]]> - </programlisting> - &example.outputs; - <screen> + </programlisting> + &example.outputs; + <screen> <![CDATA[ The element whose id is books is: chapter ]]> - </screen> - </example> - <para> - See also <link linkend="function.dom-domdocument-getelementsbytagname">DOMDocument->getElementsByTagName()</link>. - </para> - </refsect1> - </refentry> + </screen> + </example> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-getelementsbytagname" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml:1.5 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-getelementsbytagname.xml Fri Dec 31 06:49:57 2004 @@ -1,28 +1,58 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> - <refentry id="function.dom-domdocument-getelementsbytagname"> - <refnamediv> - <refname>DOMDocument->getElementsByTagName</refname> - <refpurpose>Searches for all elements with given tag name</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMNodeList</type> - <methodname>getElementsByTagName</methodname> - <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function returns a new instance of class - <classname>DOMNodeList</classname> containing the elements with tagnames - matching the name parameter. Use "*" for the name to return all elements - within the document. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.6 $ --> +<refentry id="function.dom-domdocument-getelementsbytagname"> + <refnamediv> + <refname>DOMDocument->getElementsByTagName()</refname> + <refpurpose>Searches for all elements with given tag name</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMNodeList</type> + <methodname>getElementsByTagName</methodname> + <methodparam><type>string</type><parameter>name</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function returns a new instance of class + <classname>DOMNodeList</classname> containing the elements with a given + tag name. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem> + <para> + The name of the tag to match on. The special value <literal>*</literal> + matches all tags. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + A new <classname>DOMNodeList</classname> object containing all the matched + elements. + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-getelementsbytagnamens" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.7 phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.8 --- phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml:1.7 Fri Dec 17 12:51:21 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-importnode.xml Fri Dec 31 06:49:57 2004 @@ -1,32 +1,63 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> - <refentry id="function.dom-domdocument-importnode"> - <refnamediv> - <refname>DOMDocument->importNode</refname> - <refpurpose>Import node into current document</refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>DOMNode</type> - <methodname>importNode</methodname> - <methodparam><type>DOMNode</type><parameter>importedNode</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>deep</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - This function returns a copy of the node to import and associates it with - the current document. <classname>DOMException</classname> is thrown if - node cannot be imported. - </para> - <para> - If <parameter>deep</parameter> is set to &true;, this method will recursively - import the subtree under the <parameter>importedNode</parameter>. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.8 $ --> +<refentry id="function.dom-domdocument-importnode"> + <refnamediv> + <refname>DOMDocument->importNode()</refname> + <refpurpose>Import node into current document</refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>DOMNode</type> + <methodname>importNode</methodname> + <methodparam><type>DOMNode</type><parameter>importedNode</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>deep</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + This function returns a copy of the node to import and associates it with + the current document. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>importedNode</parameter></term> + <listitem> + <para> + The node to import. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>deep</parameter></term> + <listitem> + <para> + If set to &true;, this method will recursively import the subtree under + the <parameter>importedNode</parameter>. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + The copied node. + </para> + </refsect1> + <refsect1 role="exceptions"> + &reftitle.exceptions; + <para> + <classname>DOMException</classname> is thrown if node cannot be imported. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadhtmlfile.xml Fri Dec 31 06:49:57 2004 @@ -1,34 +1,61 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-loadhtmlfile"> - <refnamediv> - <refname>DOMDocument->loadHTMLFile</refname> - <refpurpose> - Load HTML from a file - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>mixed</type> - <methodname>loadHTMLFile</methodname> - <methodparam><type>string</type><parameter>filename</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - The function parses the HTML document in the file named - <parameter>filename</parameter>. Unlike loading XML, HTML does not have - to be well-formed to load.This function may also be called statically to - load and create a <classname>DOMDocument</classname> object. The static - invocation may be used when no <classname>DOMDocument</classname> - properties need to be set prior to loading. - </para> - <para> - <example> - <title>Creating a Document</title> - <programlisting role="php"> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-loadhtmlfile"> + <refnamediv> + <refname>DOMDocument->loadHTMLFile()</refname> + <refpurpose> + Load HTML from a file + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>bool</type> + <methodname>loadHTMLFile</methodname> + <methodparam><type>string</type><parameter>filename</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + The function parses the HTML document in the file named + <parameter>filename</parameter>. Unlike loading XML, HTML does not have + to be well-formed to load. + </para> + <para> + This function may also be called statically to load and create a + <classname>DOMDocument</classname> object. The static invocation may be + used when no <classname>DOMDocument</classname> properties need to be set + prior to loading. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>filename</parameter></term> + <listitem> + <para> + The path to the HTML file. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Creating a Document</title> + <programlisting role="php"> <![CDATA[ <?php $doc = DOMDocument::loadHTMLFile("filename.html"); @@ -39,16 +66,21 @@ print $doc->saveHTML(); ?> ]]> - </programlisting> - </example> - </para> - <para> - See also <link linkend="function.dom-domdocument-loadhtml">DOMDocument->loadHTML()</link>, - <link linkend="function.dom-domdocument-savehtml">DOMDocument->saveHTML()</link> and - <link linkend="function.dom-domdocument-savehtmlfile">DOMDocument->saveHTMLFile()</link>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-loadhtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtmlfile" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadhtml.xml Fri Dec 31 06:49:57 2004 @@ -1,54 +1,83 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-loadhtml"> - <refnamediv> - <refname>DOMDocument->loadHTML</refname> - <refpurpose> - Load HTML from a string - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>mixed</type> - <methodname>loadHTML</methodname> - <methodparam><type>string</type><parameter>source</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - <para> - The function parses the HTML contained in the string <parameter>source</parameter>. - Unlike loading XML, HTML does not have to be well-formed to load. This - function may also be called statically to load and create a - <classname>DOMDocument</classname> object. The static invocation may be - used when no <classname>DOMDocument</classname> properties need to be - set prior to loading. - </para> - <para> - <example> - <title>Creating a Document</title> - <programlisting role="php"> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-loadhtml"> + <refnamediv> + <refname>DOMDocument->loadHTML()</refname> + <refpurpose> + Load HTML from a string + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <type>bool</type> + <methodname>loadHTML</methodname> + <methodparam><type>string</type><parameter>source</parameter></methodparam> + </methodsynopsis> + </classsynopsis> + <para> + The function parses the HTML contained in the string <parameter>source</parameter>. + Unlike loading XML, HTML does not have to be well-formed to load. This + function may also be called statically to load and create a + <classname>DOMDocument</classname> object. The static invocation may be + used when no <classname>DOMDocument</classname> properties need to be + set prior to loading. + </para> + </refsect1> + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>source</parameter></term> + <listitem> + <para> + The HTML string. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Creating a Document</title> + <programlisting role="php"> <![CDATA[ <?php $doc = DOMDocument::loadHTML("<html><body>Test<br></body></html>"); -print $doc->saveHTML(); +echo $doc->saveHTML(); $doc = new DOMDocument(); $doc->loadHTML("<html><body>Test<br></body></html>"); -print $doc->saveHTML(); +echo $doc->saveHTML(); ?> ]]> - </programlisting> - </example> - </para> - <para> - See also <link linkend="function.dom-domdocument-loadhtmlfile">DOMDocument->loadHTMLFile()</link>, - <link linkend="function.dom-domdocument-savehtml">DOMDocument->saveHTML()</link> and - <link linkend="function.dom-domdocument-savehtmlfile">DOMDocument->saveHTMLFile()</link>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domdocument-loadhtmlfile" /></member> + <member><xref linkend="function.dom-domdocument-savehtml" /></member> + <member><xref linkend="function.dom-domdocument-savehtmlfile" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-load.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-load.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-load.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-load.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-load"> <refnamediv> - <refname>DOMDocument->load</refname> + <refname>DOMDocument->load()</refname> <refpurpose> Load XML from a file </refpurpose> @@ -12,7 +12,7 @@ <classsynopsis> <ooclass><classname>DOMDocument</classname></ooclass> <methodsynopsis> - <type>mixed</type> + <type>bool</type> <methodname>load</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> </methodsynopsis> @@ -42,6 +42,12 @@ </variablelist> </para> </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> @@ -66,9 +72,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-loadxml">DOMDocument->loadXML()</link></member> - <member><link linkend="function.dom-domdocument-save">DOMDocument->save()</link></member> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> + <member><xref linkend="function.dom-domdocument-loadxml" /></member> + <member><xref linkend="function.dom-domdocument-save" /></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-loadxml.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-loadxml"> <refnamediv> - <refname>DOMDocument->loadXML</refname> + <refname>DOMDocument->loadXML()</refname> <refpurpose> Load XML from a string </refpurpose> @@ -12,7 +12,7 @@ <classsynopsis> <ooclass><classname>DOMDocument</classname></ooclass> <methodsynopsis> - <type>mixed</type> + <type>bool</type> <methodname>loadXML</methodname> <methodparam><type>string</type><parameter>source</parameter></methodparam> </methodsynopsis> @@ -42,6 +42,12 @@ </variablelist> </para> </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.success; + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> @@ -66,9 +72,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-load">DOMDocument->load()</link></member> - <member><link linkend="function.dom-domdocument-save">DOMDocument->save()</link></member> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> + <member><xref linkend="function.dom-domdocument-load" /></member> + <member><xref linkend="function.dom-domdocument-save" /></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml:1.4 Fri Dec 17 10:11:30 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-normalize.xml Fri Dec 31 06:49:57 2004 @@ -1,27 +1,41 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> - <refentry id="function.dom-domdocument-normalize"> - <refnamediv> - <refname>DOMDocument->normalize</refname> - <refpurpose> - Normalizes document - </refpurpose> - </refnamediv> - <refsect1> - &reftitle.description; - <classsynopsis> - <ooclass><classname>DOMDocument</classname></ooclass> - <methodsynopsis> - <type>void</type> - <methodname>normalize</methodname> - <void/> - </methodsynopsis> - </classsynopsis> - <para> - Normalizes document. - </para> - </refsect1> - </refentry> +<!-- $Revision: 1.5 $ --> +<refentry id="function.dom-domdocument-normalize"> + <refnamediv> + <refname>DOMDocument->normalize()</refname> + <refpurpose> + Normalizes the document + </refpurpose> + </refnamediv> + <refsect1 role="description"> + &reftitle.description; + <classsynopsis> + <ooclass><classname>DOMDocument</classname></ooclass> + <methodsynopsis> + <void/> + <methodname>normalize</methodname> + <void/> + </methodsynopsis> + </classsynopsis> + <para> + Normalizes the document. + </para> + </refsect1> + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + &return.void; + </para> + </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><xref linkend="function.dom-domnode-normalize" /></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-save.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-save.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.4 phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.5 --- phpdoc/en/reference/dom/functions/dom-domdocument-save.xml:1.4 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-save.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <refentry id="function.dom-domdocument-save"> <refnamediv> - <refname>DOMDocument->save</refname> + <refname>DOMDocument->save()</refname> <refpurpose> Dumps the internal XML tree back into a file </refpurpose> @@ -77,9 +77,9 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-savexml">DOMDocument->saveXML()</link></member> - <member><link linkend="function.dom-domdocument-load">DOMDocument->load()</link></member> - <member><link linkend="function.dom-domdocument-loadxml">DOMDocument->loadXML()</link></member> + <member><xref linkend="function.dom-domdocument-savexml" /></member> + <member><xref linkend="function.dom-domdocument-load" /></member> + <member><xref linkend="function.dom-domdocument-loadxml" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.1 phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.2 --- phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml:1.1 Mon Dec 20 19:42:35 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-savexml.xml Fri Dec 31 06:49:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <refentry id="function.dom-domdocument-savexml"> <refnamediv> <refname>DOMDocument->saveXML()</refname> @@ -44,6 +44,13 @@ Returns the XML, or &false; if an error occured. </para> </refsect1> + <refsect1 role="exceptions"> + &reftitle.exceptions; + <para> + Throws <classname>DOMException</classname> if <parameter>node</parameter> + is from another document. + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.6 phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.7 --- phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml:1.6 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-validate.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <refentry id="function.dom-domdocument-validate"> <refnamediv> - <refname>DOMDocument->validate</refname> + <refname>DOMDocument->validate()</refname> <refpurpose> Validates the document based on its DTD </refpurpose> @@ -67,10 +67,10 @@ &reftitle.seealso; <para> <simplelist> - <member><link linkend="function.dom-domdocument-schemavalidate">DOMDocument->schemaValidate()</link></member> - <member><link linkend="function.dom-domdocument-schemavalidatesource">DOMDocument->schemaValidateSource()</link></member> - <member><link linkend="function.dom-domdocument-relaxngvalidate">DOMDocument->relaxNGValidate()</link></member> - <member><link linkend="function.dom-domdocument-relaxngvalidatesource">DOMDocument->relaxNGValidateSource()</link></member> + <member><xref linkend="function.dom-domdocument-schemavalidate" /></member> + <member><xref linkend="function.dom-domdocument-schemavalidatesource" /></member> + <member><xref linkend="function.dom-domdocument-relaxngvalidate" /></member> + <member><xref linkend="function.dom-domdocument-relaxngvalidatesource" /></member> </simplelist> </para> </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml diff -u phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.5 phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.6 --- phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml:1.5 Mon Dec 20 10:57:48 2004 +++ phpdoc/en/reference/dom/functions/dom-domdocument-xinclude.xml Fri Dec 31 06:49:57 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.dom-domdocument-xinclude"> <refnamediv> - <refname>DOMDocument->xinclude</refname> + <refname>DOMDocument->xinclude()</refname> <refpurpose> Substitutes XIncludes in a DOMDocument Object </refpurpose>