cvs: phpdoc /en/reference/xdiff/functions xdiff-file-diff-binary.xml xdiff-file-diff.xml xdiff-file-merge3.xml xdiff-file-patch-binary.xml
xdiff-file-patch.xml xdiff-string-diff-binary.xml xdiff-string-diff.xml xdiff-string-merge3.xml xdiff-string-patch-binary.xml xdiff-string-patch.xml
| From: | Mehdi Achour | Date: | Mon, 19 Feb 2007 00:04:48 +0000 |
| Subject: | cvs: phpdoc /en/reference/xdiff/functions xdiff-file-diff-binary.xml xdiff-file-diff.xml xdiff-file-merge3.xml xdiff-file-patch-binary.xml xdiff-file-patch.xml xdiff-string-diff-binary.xml xdiff-string-diff.xml xdiff-string-merge3.xml xdiff-string-patch-binary.xml xdiff-string-patch.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969375519@lists.php.net to get a copy of this message | ||
didou Mon Feb 19 00:04:48 2007 UTC
Modified files:
/phpdoc/en/reference/xdiff/functions xdiff-file-diff-binary.xml
xdiff-file-diff.xml
xdiff-file-merge3.xml
xdiff-file-patch-binary.xml
xdiff-file-patch.xml
xdiff-string-diff-binary.xml
xdiff-string-diff.xml
xdiff-string-merge3.xml
xdiff-string-patch-binary.xml
xdiff-string-patch.xml
Log:
WS, prepare for new doc style
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.5 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,41 +1,40 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-diff-binary"> - <refnamediv> - <refname>xdiff_file_diff_binary</refname> - <refpurpose> - Make binary diff of two files - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_diff_binary</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-diff-binary"> + <refnamediv> + <refname>xdiff_file_diff_binary</refname> + <refpurpose>Make binary diff of two files</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_diff_binary</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_diff_binary</function> makes binary diff of files + <parameter>file1</parameter> and <parameter>file2</parameter> and stores + result in file <parameter>dest</parameter>. This function works with both text + and binary files. Resulting file is in binary format. + </para> + <note> + <para> + Both files will be loaded into memory so ensure that your memory_limit is set high enough. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_diff_binary</function> example</title> <para> - <function>xdiff_file_diff_binary</function> makes binary diff of files - <parameter>file1</parameter> and <parameter>file2</parameter> and stores - result in file <parameter>dest</parameter>. This function works with both text - and binary files. Resulting file is in binary format. + The following code makes binary diff of two archives. </para> - <note> - <para> - Both files will be loaded into memory so ensure that your memory_limit is set high enough. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_diff_binary</function> example</title> - <para> - The following code makes binary diff of two archives. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script_1.0.tgz'; @@ -44,13 +43,14 @@ xdiff_file_diff_binary($old_version, $new_version, 'my_script.bdiff'); ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_diff_binary</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_diff_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.4 phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.5 --- phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.4 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml Mon Feb 19 00:04:48 2007 @@ -1,47 +1,46 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-diff"> - <refnamediv> - <refname>xdiff_file_diff</refname> - <refpurpose> - Make unified diff of two files - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_diff</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-diff"> + <refnamediv> + <refname>xdiff_file_diff</refname> + <refpurpose>Make unified diff of two files</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_diff</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_diff</function> makes unified diff of files + <parameter>file1</parameter> and <parameter>file2</parameter> and stores + result in file <parameter>dest</parameter>. + <parameter>context</parameter> indicated how many lines of context you + want to include in diff result. Set <parameter>minimal</parameter> to + &true; if you want to minimalize size of diff (can take a long time). + Resulting file is human-readable. + </para> + <note> + <para> + This function doesn't work well with binary files. To make diff of binary + files use <function>xdiff_file_diff_binary</function>. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_diff</function> example</title> <para> - <function>xdiff_file_diff</function> makes unified diff of files - <parameter>file1</parameter> and <parameter>file2</parameter> and stores - result in file <parameter>dest</parameter>. - <parameter>context</parameter> indicated how many lines of context you - want to include in diff result. Set <parameter>minimal</parameter> to - &true; if you want to minimalize size of diff (can take a long time). - Resulting file is human-readable. + The following code makes unified diff of two php files. </para> - <note> - <para> - This function doesn't work well with binary files. To make diff of binary - files use <function>xdiff_file_diff_binary</function>. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_diff</function> example</title> - <para> - The following code makes unified diff of two php files. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script.php'; @@ -50,13 +49,14 @@ xdiff_file_diff($old_version, $new_version, 'my_script.diff', 2); ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_diff</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_diff</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.4 phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.5 --- phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.4 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml Mon Feb 19 00:04:48 2007 @@ -1,38 +1,37 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-merge3"> - <refnamediv> - <refname>xdiff_file_merge3</refname> - <refpurpose> - Merge 3 files into one - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_file_merge3</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>file3</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-merge3"> + <refnamediv> + <refname>xdiff_file_merge3</refname> + <refpurpose>Merge 3 files into one</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_file_merge3</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>file3</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_merge3</function> merges files + <parameter>file1</parameter>, <parameter>file2</parameter> and + <parameter>file3</parameter> into one and stores result in file + <parameter>dest</parameter>. + </para> + <para> + Returns &true; if merge was successful, string with rejected chunks if + it was not or &false; if an internal error happened. + </para> + <para> + <example> + <title><function>xdiff_file_merge3</function> example</title> <para> - <function>xdiff_file_merge3</function> merges files - <parameter>file1</parameter>, <parameter>file2</parameter> and - <parameter>file3</parameter> into one and stores result in file - <parameter>dest</parameter>. + The following code merges three files into one. </para> - <para> - Returns &true; if merge was successful, string with rejected chunks if - it was not or &false; if an internal error happened. - </para> - <example> - <title><function>xdiff_file_merge3</function> example</title> - <para> - The following code merges three files into one. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'original_script.php'; @@ -46,13 +45,14 @@ } ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_merge3</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_merge3</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.6 phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.7 --- phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.6 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,41 +1,40 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-patch-binary"> - <refnamediv> - <refname>xdiff_file_patch_binary</refname> - <refpurpose> - Patch a file with a binary diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_patch_binary</methodname> - <methodparam><type>string</type><parameter>file</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-patch-binary"> + <refnamediv> + <refname>xdiff_file_patch_binary</refname> + <refpurpose>Patch a file with a binary diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_patch_binary</methodname> + <methodparam><type>string</type><parameter>file</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_patch_binary</function> patches file + <parameter>file</parameter> with binary patch in file + <parameter>patch</parameter> and stores result in file + <parameter>dest</parameter>. + </para> + <note> + <para> + Both files (file and patch) will be loaded into memory so ensure that your memory_limit is set high enough. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_patch_binary</function> example</title> <para> - <function>xdiff_file_patch_binary</function> patches file - <parameter>file</parameter> with binary patch in file - <parameter>patch</parameter> and stores result in file - <parameter>dest</parameter>. + The following code applies binary diff to a file. </para> - <note> - <para> - Both files (file and patch) will be loaded into memory so ensure that your memory_limit is set high enough. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_patch_binary</function> example</title> - <para> - The following code applies binary diff to a file. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'archive-1.0.tgz'; @@ -50,13 +49,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_patch_binary</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_patch_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.5 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml Mon Feb 19 00:04:48 2007 @@ -1,43 +1,42 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-patch"> - <refnamediv> - <refname>xdiff_file_patch</refname> - <refpurpose> - Patch a file with an unified diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_file_patch</methodname> - <methodparam><type>string</type><parameter>file</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-patch"> + <refnamediv> + <refname>xdiff_file_patch</refname> + <refpurpose>Patch a file with an unified diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_file_patch</methodname> + <methodparam><type>string</type><parameter>file</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_patch</function> patches file + <parameter>file</parameter> with unified patch in file + <parameter>patch</parameter> and stores result in file + <parameter>dest</parameter>. + </para> + <para> + <parameter>flags</parameter> can be either + <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or + <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). + </para> + <para> + Returns &false; if an internal error happened, string with rejected + chunks of patch or &true; if patch has been successfully applied. + </para> + <para> + <example> + <title><function>xdiff_file_patch</function> example</title> <para> - <function>xdiff_file_patch</function> patches file - <parameter>file</parameter> with unified patch in file - <parameter>patch</parameter> and stores result in file - <parameter>dest</parameter>. + The following code applies unified diff to a file. </para> - <para> - <parameter>flags</parameter> can be either - <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or - <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). - </para> - <para> - Returns &false; if an internal error happened, string with rejected - chunks of patch or &true; if patch has been successfully applied. - </para> - <example> - <title><function>xdiff_file_patch</function> example</title> - <para> - The following code applies unified diff to a file. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script-1.0.php'; @@ -51,14 +50,14 @@ ?> ]]> - </programlisting> - </example> - <example> - <title>Patch reversing example</title> - <para> - The following code reverses a patch. - </para> - <programlisting role="php"> + </programlisting> + </example> + <example> + <title>Patch reversing example</title> + <para> + The following code reverses a patch. + </para> + <programlisting role="php"> <![CDATA[ <?php $new_version = 'my_script-1.1.php'; @@ -72,13 +71,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_patch</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_patch</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.5 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,32 +1,30 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-diff-binary"> - <refnamediv> - <refname>xdiff_string_diff_binary</refname> - <refpurpose> - Make binary diff of two strings - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_diff_binary</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_diff_binary</function> makes binary diff of - strings <parameter>str1</parameter> and <parameter>str2</parameter>. - </para> - <para> - Returns string with result or &false; if an internal error happened. - </para> - <para> - See also <function>xdiff_file_diff_binary</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-diff-binary"> + <refnamediv> + <refname>xdiff_string_diff_binary</refname> + <refpurpose>Make binary diff of two strings</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_diff_binary</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_diff_binary</function> makes binary diff of + strings <parameter>str1</parameter> and <parameter>str2</parameter>. + </para> + <para> + Returns string with result or &false; if an internal error happened. + </para> + <para> + See also <function>xdiff_file_diff_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.5 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml Mon Feb 19 00:04:48 2007 @@ -1,44 +1,43 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-diff"> - <refnamediv> - <refname>xdiff_string_diff</refname> - <refpurpose> - Make unified diff of two strings - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_diff</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-string-diff"> + <refnamediv> + <refname>xdiff_string_diff</refname> + <refpurpose>Make unified diff of two strings</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_diff</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_diff</function> makes unified diff of strings + <parameter>str1</parameter> and <parameter>str2</parameter>. + <parameter>context</parameter> indicated how many lines of context you + want to include in diff result. Set <parameter>minimal</parameter> to + &true; if you want to minimalize size of diff (can take a long time). + </para> + <note> + <para> + This function doesn't work well with binary strings. To make diff of binary + strings use <function>xdiff_string_diff_binary</function>. + </para> + </note> + <para> + Returns string with result or &false; if an internal error happened. + </para> + <para> + <example> + <title><function>xdiff_string_diff</function> example</title> <para> - <function>xdiff_string_diff</function> makes unified diff of strings - <parameter>str1</parameter> and <parameter>str2</parameter>. - <parameter>context</parameter> indicated how many lines of context you - want to include in diff result. Set <parameter>minimal</parameter> to - &true; if you want to minimalize size of diff (can take a long time). + The following code makes unified diff of two articles. </para> - <note> - <para> - This function doesn't work well with binary strings. To make diff of binary - strings use <function>xdiff_string_diff_binary</function>. - </para> - </note> - <para> - Returns string with result or &false; if an internal error happened. - </para> - <example> - <title><function>xdiff_string_diff</function> example</title> - <para> - The following code makes unified diff of two articles. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_article = file_get_contents('./old_article.txt'); @@ -52,13 +51,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_file_diff</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_file_diff</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.6 phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.7 --- phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.6 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml Mon Feb 19 00:04:48 2007 @@ -1,40 +1,38 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-merge3"> - <refnamediv> - <refname>xdiff_string_merge3</refname> - <refpurpose> - Merge 3 strings into one - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_string_merge3</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - <methodparam><type>string</type><parameter>str3</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_merge3</function> merges strings - <parameter>str1</parameter>, <parameter>str2</parameter> and - <parameter>str3</parameter> into one. - </para> - <para> - If <parameter>error</parameter> is passed then rejected parts are stored - inside this variable. - </para> - <para> - Returns merged string, &false; if an internal error happened, or &true; - if merged string is empty. - </para> - <para> - See also <function>xdiff_file_merge3</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-merge3"> + <refnamediv> + <refname>xdiff_string_merge3</refname> + <refpurpose>Merge 3 strings into one</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_string_merge3</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + <methodparam><type>string</type><parameter>str3</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_merge3</function> merges strings + <parameter>str1</parameter>, <parameter>str2</parameter> and + <parameter>str3</parameter> into one. + </para> + <para> + If <parameter>error</parameter> is passed then rejected parts are stored + inside this variable. + </para> + <para> + Returns merged string, &false; if an internal error happened, or &true; + if merged string is empty. + </para> + <para> + See also <function>xdiff_file_merge3</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.2 phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.3 --- phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.2 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,33 +1,31 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-patch-binary"> - <refnamediv> - <refname>xdiff_string_patch_binary</refname> - <refpurpose> - Patch a string with a binary diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_patch_binary</methodname> - <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_patch_binary</function> patches string - <parameter>str</parameter> with binary patch in string - <parameter>patch</parameter>. - </para> - <para> - Returns a patched string. - </para> - <para> - See also <function>xdiff_file_patch_binary</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-patch-binary"> + <refnamediv> + <refname>xdiff_string_patch_binary</refname> + <refpurpose>Patch a string with a binary diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_patch_binary</methodname> + <methodparam><type>string</type><parameter>str</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_patch_binary</function> patches string + <parameter>str</parameter> with binary patch in string + <parameter>patch</parameter>. + </para> + <para> + Returns a patched string. + </para> + <para> + See also <function>xdiff_file_patch_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.5 Wed Nov 10 08:30:48 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml Mon Feb 19 00:04:48 2007 @@ -1,42 +1,41 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-patch"> - <refnamediv> - <refname>xdiff_string_patch</refname> - <refpurpose> - Patch a string with an unified diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_patch</methodname> - <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-string-patch"> + <refnamediv> + <refname>xdiff_string_patch</refname> + <refpurpose>Patch a string with an unified diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_patch</methodname> + <methodparam><type>string</type><parameter>str</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_patch</function> patches string + <parameter>str</parameter> with unified patch in string + <parameter>patch</parameter>. + </para> + <para> + <parameter>flags</parameter> can be either + <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or + <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). + </para> + <para> + If <parameter>error</parameter> is passed then rejected parts are stored + inside this variable. + </para> + <para> + <example> + <title><function>xdiff_string_patch</function> example</title> <para> - <function>xdiff_string_patch</function> patches string - <parameter>str</parameter> with unified patch in string - <parameter>patch</parameter>. + The following code applies changes to some article. </para> - <para> - <parameter>flags</parameter> can be either - <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or - <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). - </para> - <para> - If <parameter>error</parameter> is passed then rejected parts are stored - inside this variable. - </para> - <example> - <title><function>xdiff_string_patch</function> example</title> - <para> - The following code applies changes to some article. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_article = file_get_contents('./old_article.txt'); @@ -57,16 +56,17 @@ ?> ]]> - </programlisting> - </example> - <para> - Returns a patched string. - </para> - <para> - See also <function>xdiff_file_patch</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + Returns a patched string. + </para> + <para> + See also <function>xdiff_file_patch</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables:
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml:1.5 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-diff-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,41 +1,40 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-diff-binary"> - <refnamediv> - <refname>xdiff_file_diff_binary</refname> - <refpurpose> - Make binary diff of two files - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_diff_binary</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-diff-binary"> + <refnamediv> + <refname>xdiff_file_diff_binary</refname> + <refpurpose>Make binary diff of two files</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_diff_binary</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_diff_binary</function> makes binary diff of files + <parameter>file1</parameter> and <parameter>file2</parameter> and stores + result in file <parameter>dest</parameter>. This function works with both text + and binary files. Resulting file is in binary format. + </para> + <note> + <para> + Both files will be loaded into memory so ensure that your memory_limit is set high enough. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_diff_binary</function> example</title> <para> - <function>xdiff_file_diff_binary</function> makes binary diff of files - <parameter>file1</parameter> and <parameter>file2</parameter> and stores - result in file <parameter>dest</parameter>. This function works with both text - and binary files. Resulting file is in binary format. + The following code makes binary diff of two archives. </para> - <note> - <para> - Both files will be loaded into memory so ensure that your memory_limit is set high enough. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_diff_binary</function> example</title> - <para> - The following code makes binary diff of two archives. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script_1.0.tgz'; @@ -44,13 +43,14 @@ xdiff_file_diff_binary($old_version, $new_version, 'my_script.bdiff'); ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_diff_binary</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_diff_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.4 phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.5 --- phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml:1.4 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-diff.xml Mon Feb 19 00:04:48 2007 @@ -1,47 +1,46 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-diff"> - <refnamediv> - <refname>xdiff_file_diff</refname> - <refpurpose> - Make unified diff of two files - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_diff</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-diff"> + <refnamediv> + <refname>xdiff_file_diff</refname> + <refpurpose>Make unified diff of two files</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_diff</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_diff</function> makes unified diff of files + <parameter>file1</parameter> and <parameter>file2</parameter> and stores + result in file <parameter>dest</parameter>. + <parameter>context</parameter> indicated how many lines of context you + want to include in diff result. Set <parameter>minimal</parameter> to + &true; if you want to minimalize size of diff (can take a long time). + Resulting file is human-readable. + </para> + <note> + <para> + This function doesn't work well with binary files. To make diff of binary + files use <function>xdiff_file_diff_binary</function>. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_diff</function> example</title> <para> - <function>xdiff_file_diff</function> makes unified diff of files - <parameter>file1</parameter> and <parameter>file2</parameter> and stores - result in file <parameter>dest</parameter>. - <parameter>context</parameter> indicated how many lines of context you - want to include in diff result. Set <parameter>minimal</parameter> to - &true; if you want to minimalize size of diff (can take a long time). - Resulting file is human-readable. + The following code makes unified diff of two php files. </para> - <note> - <para> - This function doesn't work well with binary files. To make diff of binary - files use <function>xdiff_file_diff_binary</function>. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_diff</function> example</title> - <para> - The following code makes unified diff of two php files. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script.php'; @@ -50,13 +49,14 @@ xdiff_file_diff($old_version, $new_version, 'my_script.diff', 2); ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_diff</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_diff</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.4 phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.5 --- phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml:1.4 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-merge3.xml Mon Feb 19 00:04:48 2007 @@ -1,38 +1,37 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-merge3"> - <refnamediv> - <refname>xdiff_file_merge3</refname> - <refpurpose> - Merge 3 files into one - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_file_merge3</methodname> - <methodparam><type>string</type><parameter>file1</parameter></methodparam> - <methodparam><type>string</type><parameter>file2</parameter></methodparam> - <methodparam><type>string</type><parameter>file3</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-merge3"> + <refnamediv> + <refname>xdiff_file_merge3</refname> + <refpurpose>Merge 3 files into one</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_file_merge3</methodname> + <methodparam><type>string</type><parameter>file1</parameter></methodparam> + <methodparam><type>string</type><parameter>file2</parameter></methodparam> + <methodparam><type>string</type><parameter>file3</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_merge3</function> merges files + <parameter>file1</parameter>, <parameter>file2</parameter> and + <parameter>file3</parameter> into one and stores result in file + <parameter>dest</parameter>. + </para> + <para> + Returns &true; if merge was successful, string with rejected chunks if + it was not or &false; if an internal error happened. + </para> + <para> + <example> + <title><function>xdiff_file_merge3</function> example</title> <para> - <function>xdiff_file_merge3</function> merges files - <parameter>file1</parameter>, <parameter>file2</parameter> and - <parameter>file3</parameter> into one and stores result in file - <parameter>dest</parameter>. + The following code merges three files into one. </para> - <para> - Returns &true; if merge was successful, string with rejected chunks if - it was not or &false; if an internal error happened. - </para> - <example> - <title><function>xdiff_file_merge3</function> example</title> - <para> - The following code merges three files into one. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'original_script.php'; @@ -46,13 +45,14 @@ } ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_merge3</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_merge3</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.6 phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.7 --- phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml:1.6 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-patch-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,41 +1,40 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-patch-binary"> - <refnamediv> - <refname>xdiff_file_patch_binary</refname> - <refpurpose> - Patch a file with a binary diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>bool</type><methodname>xdiff_file_patch_binary</methodname> - <methodparam><type>string</type><parameter>file</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-patch-binary"> + <refnamediv> + <refname>xdiff_file_patch_binary</refname> + <refpurpose>Patch a file with a binary diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>xdiff_file_patch_binary</methodname> + <methodparam><type>string</type><parameter>file</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_patch_binary</function> patches file + <parameter>file</parameter> with binary patch in file + <parameter>patch</parameter> and stores result in file + <parameter>dest</parameter>. + </para> + <note> + <para> + Both files (file and patch) will be loaded into memory so ensure that your memory_limit is set high enough. + </para> + </note> + <para> + &return.success; + </para> + <para> + <example> + <title><function>xdiff_file_patch_binary</function> example</title> <para> - <function>xdiff_file_patch_binary</function> patches file - <parameter>file</parameter> with binary patch in file - <parameter>patch</parameter> and stores result in file - <parameter>dest</parameter>. + The following code applies binary diff to a file. </para> - <note> - <para> - Both files (file and patch) will be loaded into memory so ensure that your memory_limit is set high enough. - </para> - </note> - <para> - &return.success; - </para> - <example> - <title><function>xdiff_file_patch_binary</function> example</title> - <para> - The following code applies binary diff to a file. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'archive-1.0.tgz'; @@ -50,13 +49,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_patch_binary</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_patch_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml:1.5 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-file-patch.xml Mon Feb 19 00:04:48 2007 @@ -1,43 +1,42 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-file-patch"> - <refnamediv> - <refname>xdiff_file_patch</refname> - <refpurpose> - Patch a file with an unified diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_file_patch</methodname> - <methodparam><type>string</type><parameter>file</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam><type>string</type><parameter>dest</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-file-patch"> + <refnamediv> + <refname>xdiff_file_patch</refname> + <refpurpose>Patch a file with an unified diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_file_patch</methodname> + <methodparam><type>string</type><parameter>file</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam><type>string</type><parameter>dest</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_file_patch</function> patches file + <parameter>file</parameter> with unified patch in file + <parameter>patch</parameter> and stores result in file + <parameter>dest</parameter>. + </para> + <para> + <parameter>flags</parameter> can be either + <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or + <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). + </para> + <para> + Returns &false; if an internal error happened, string with rejected + chunks of patch or &true; if patch has been successfully applied. + </para> + <para> + <example> + <title><function>xdiff_file_patch</function> example</title> <para> - <function>xdiff_file_patch</function> patches file - <parameter>file</parameter> with unified patch in file - <parameter>patch</parameter> and stores result in file - <parameter>dest</parameter>. + The following code applies unified diff to a file. </para> - <para> - <parameter>flags</parameter> can be either - <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or - <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). - </para> - <para> - Returns &false; if an internal error happened, string with rejected - chunks of patch or &true; if patch has been successfully applied. - </para> - <example> - <title><function>xdiff_file_patch</function> example</title> - <para> - The following code applies unified diff to a file. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_version = 'my_script-1.0.php'; @@ -51,14 +50,14 @@ ?> ]]> - </programlisting> - </example> - <example> - <title>Patch reversing example</title> - <para> - The following code reverses a patch. - </para> - <programlisting role="php"> + </programlisting> + </example> + <example> + <title>Patch reversing example</title> + <para> + The following code reverses a patch. + </para> + <programlisting role="php"> <![CDATA[ <?php $new_version = 'my_script-1.1.php'; @@ -72,13 +71,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_string_patch</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_string_patch</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml:1.5 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-diff-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,32 +1,30 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-diff-binary"> - <refnamediv> - <refname>xdiff_string_diff_binary</refname> - <refpurpose> - Make binary diff of two strings - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_diff_binary</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_diff_binary</function> makes binary diff of - strings <parameter>str1</parameter> and <parameter>str2</parameter>. - </para> - <para> - Returns string with result or &false; if an internal error happened. - </para> - <para> - See also <function>xdiff_file_diff_binary</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-diff-binary"> + <refnamediv> + <refname>xdiff_string_diff_binary</refname> + <refpurpose>Make binary diff of two strings</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_diff_binary</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_diff_binary</function> makes binary diff of + strings <parameter>str1</parameter> and <parameter>str2</parameter>. + </para> + <para> + Returns string with result or &false; if an internal error happened. + </para> + <para> + See also <function>xdiff_file_diff_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml:1.5 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-diff.xml Mon Feb 19 00:04:48 2007 @@ -1,44 +1,43 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-diff"> - <refnamediv> - <refname>xdiff_string_diff</refname> - <refpurpose> - Make unified diff of two strings - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_diff</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-string-diff"> + <refnamediv> + <refname>xdiff_string_diff</refname> + <refpurpose>Make unified diff of two strings</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_diff</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>context</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_diff</function> makes unified diff of strings + <parameter>str1</parameter> and <parameter>str2</parameter>. + <parameter>context</parameter> indicated how many lines of context you + want to include in diff result. Set <parameter>minimal</parameter> to + &true; if you want to minimalize size of diff (can take a long time). + </para> + <note> + <para> + This function doesn't work well with binary strings. To make diff of binary + strings use <function>xdiff_string_diff_binary</function>. + </para> + </note> + <para> + Returns string with result or &false; if an internal error happened. + </para> + <para> + <example> + <title><function>xdiff_string_diff</function> example</title> <para> - <function>xdiff_string_diff</function> makes unified diff of strings - <parameter>str1</parameter> and <parameter>str2</parameter>. - <parameter>context</parameter> indicated how many lines of context you - want to include in diff result. Set <parameter>minimal</parameter> to - &true; if you want to minimalize size of diff (can take a long time). + The following code makes unified diff of two articles. </para> - <note> - <para> - This function doesn't work well with binary strings. To make diff of binary - strings use <function>xdiff_string_diff_binary</function>. - </para> - </note> - <para> - Returns string with result or &false; if an internal error happened. - </para> - <example> - <title><function>xdiff_string_diff</function> example</title> - <para> - The following code makes unified diff of two articles. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_article = file_get_contents('./old_article.txt'); @@ -52,13 +51,14 @@ ?> ]]> - </programlisting> - </example> - <para> - See also <function>xdiff_file_diff</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + See also <function>xdiff_file_diff</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.6 phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.7 --- phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.6 Fri Jun 24 09:11:47 2005 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml Mon Feb 19 00:04:48 2007 @@ -1,40 +1,38 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-merge3"> - <refnamediv> - <refname>xdiff_string_merge3</refname> - <refpurpose> - Merge 3 strings into one - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>mixed</type><methodname>xdiff_string_merge3</methodname> - <methodparam><type>string</type><parameter>str1</parameter></methodparam> - <methodparam><type>string</type><parameter>str2</parameter></methodparam> - <methodparam><type>string</type><parameter>str3</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_merge3</function> merges strings - <parameter>str1</parameter>, <parameter>str2</parameter> and - <parameter>str3</parameter> into one. - </para> - <para> - If <parameter>error</parameter> is passed then rejected parts are stored - inside this variable. - </para> - <para> - Returns merged string, &false; if an internal error happened, or &true; - if merged string is empty. - </para> - <para> - See also <function>xdiff_file_merge3</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-merge3"> + <refnamediv> + <refname>xdiff_string_merge3</refname> + <refpurpose>Merge 3 strings into one</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>mixed</type><methodname>xdiff_string_merge3</methodname> + <methodparam><type>string</type><parameter>str1</parameter></methodparam> + <methodparam><type>string</type><parameter>str2</parameter></methodparam> + <methodparam><type>string</type><parameter>str3</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_merge3</function> merges strings + <parameter>str1</parameter>, <parameter>str2</parameter> and + <parameter>str3</parameter> into one. + </para> + <para> + If <parameter>error</parameter> is passed then rejected parts are stored + inside this variable. + </para> + <para> + Returns merged string, &false; if an internal error happened, or &true; + if merged string is empty. + </para> + <para> + See also <function>xdiff_file_merge3</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.2 phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.3 --- phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml:1.2 Fri Aug 20 09:37:01 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-patch-binary.xml Mon Feb 19 00:04:48 2007 @@ -1,33 +1,31 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-patch-binary"> - <refnamediv> - <refname>xdiff_string_patch_binary</refname> - <refpurpose> - Patch a string with a binary diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_patch_binary</methodname> - <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - </methodsynopsis> - <para> - <function>xdiff_string_patch_binary</function> patches string - <parameter>str</parameter> with binary patch in string - <parameter>patch</parameter>. - </para> - <para> - Returns a patched string. - </para> - <para> - See also <function>xdiff_file_patch_binary</function>. - </para> - </refsect1> - </refentry> +<refentry id="function.xdiff-string-patch-binary"> + <refnamediv> + <refname>xdiff_string_patch_binary</refname> + <refpurpose>Patch a string with a binary diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_patch_binary</methodname> + <methodparam><type>string</type><parameter>str</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_patch_binary</function> patches string + <parameter>str</parameter> with binary patch in string + <parameter>patch</parameter>. + </para> + <para> + Returns a patched string. + </para> + <para> + See also <function>xdiff_file_patch_binary</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.5 phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.6 --- phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml:1.5 Wed Nov 10 08:30:48 2004 +++ phpdoc/en/reference/xdiff/functions/xdiff-string-patch.xml Mon Feb 19 00:04:48 2007 @@ -1,42 +1,41 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. --> - <refentry id="function.xdiff-string-patch"> - <refnamediv> - <refname>xdiff_string_patch</refname> - <refpurpose> - Patch a string with an unified diff - </refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <methodsynopsis> - <type>string</type><methodname>xdiff_string_patch</methodname> - <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>string</type><parameter>patch</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> - </methodsynopsis> +<refentry id="function.xdiff-string-patch"> + <refnamediv> + <refname>xdiff_string_patch</refname> + <refpurpose>Patch a string with an unified diff</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <methodsynopsis> + <type>string</type><methodname>xdiff_string_patch</methodname> + <methodparam><type>string</type><parameter>str</parameter></methodparam> + <methodparam><type>string</type><parameter>patch</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam> + </methodsynopsis> + <para> + <function>xdiff_string_patch</function> patches string + <parameter>str</parameter> with unified patch in string + <parameter>patch</parameter>. + </para> + <para> + <parameter>flags</parameter> can be either + <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or + <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). + </para> + <para> + If <parameter>error</parameter> is passed then rejected parts are stored + inside this variable. + </para> + <para> + <example> + <title><function>xdiff_string_patch</function> example</title> <para> - <function>xdiff_string_patch</function> patches string - <parameter>str</parameter> with unified patch in string - <parameter>patch</parameter>. + The following code applies changes to some article. </para> - <para> - <parameter>flags</parameter> can be either - <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch) or - <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch). - </para> - <para> - If <parameter>error</parameter> is passed then rejected parts are stored - inside this variable. - </para> - <example> - <title><function>xdiff_string_patch</function> example</title> - <para> - The following code applies changes to some article. - </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $old_article = file_get_contents('./old_article.txt'); @@ -57,16 +56,17 @@ ?> ]]> - </programlisting> - </example> - <para> - Returns a patched string. - </para> - <para> - See also <function>xdiff_file_patch</function>. - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + <para> + Returns a patched string. + </para> + <para> + See also <function>xdiff_file_patch</function>. + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: