bjori Wed Jun 20 22:57:05 2007 UTC
Modified files:
/phpdoc/en/reference/gnupg reference.xml
/phpdoc/en/reference/imagick/imagickdraw settextantialias.xml
setviewbox.xml
/phpdoc/en/reference/imagick/imagickpixel construct.xml
getcolor.xml
Log:
Fix few conflicts due to docbook5 upgrade
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/gnupg/reference.xml?r1=1.8&r2=1.9&diff_format=u
Index: phpdoc/en/reference/gnupg/reference.xml
diff -u phpdoc/en/reference/gnupg/reference.xml:1.8
phpdoc/en/reference/gnupg/reference.xml:1.9
--- phpdoc/en/reference/gnupg/reference.xml:1.8 Wed Jun 20 22:24:31 2007
+++ phpdoc/en/reference/gnupg/reference.xml Wed Jun 20 22:57:05 2007
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- Purpose: utilspec.nontext -->
<!-- Membership: pecl -->
-<<<<<<< reference.xml
<!-- State: beta -->
<reference xml:id="ref.gnupg" xmlns="http://docbook.org/ns/docbook";
xmlns:xlink="http://www.w3.org/1999/xlink";>
-=======
-<reference id="ref.gnupg">
->>>>>>> 1.7
<title>gnupg &Functions;</title>
<titleabbrev>gnupg</titleabbrev>
@@ -15,14 +11,8 @@
<section xml:id="gnupg.intro">
&reftitle.intro;
<para>
-<<<<<<< reference.xml
This module allows you to interact with <link
xlink:href="http://www.gnupg.org/";>gnupg</link>.
- &warn.experimental;
-=======
- This module allows you to interact with <ulink
- url="http://www.gnupg.org/";>gnupg</ulink>.
->>>>>>> 1.7
</para>
</section>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml
diff -u phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml:1.5
phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml:1.6
--- phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml:1.5 Wed Jun
20 22:24:42 2007
+++ phpdoc/en/reference/imagick/imagickdraw/settextantialias.xml Wed Jun
20 22:57:05 2007
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<<<<<<< settextantialias.xml
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry xmlns="http://docbook.org/ns/docbook";
xml:id="function.imagickdraw-settextantialias">
-=======
-<!-- $Revision: 1.5 $ -->
-<refentry id="function.imagickdraw-settextantialias">
->>>>>>> 1.4
<refnamediv>
<refname>ImagickDraw::setTextAntialias</refname>
<refpurpose>Controls whether text is antialiased</refpurpose>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml
diff -u phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml:1.5
phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml:1.6
--- phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml:1.5 Wed Jun 20
22:24:42 2007
+++ phpdoc/en/reference/imagick/imagickdraw/setviewbox.xml Wed Jun 20
22:57:05 2007
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<<<<<<< setviewbox.xml
-<!-- $Revision: 1.5 $ -->
-<refentry xmlns="http://docbook.org/ns/docbook";
xml:id="function.imagickdraw-setviewbox">
-=======
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.imagickdraw-setviewbox">
->>>>>>> 1.4
<refnamediv>
<refname>ImagickDraw::setViewbox</refname>
<refpurpose>Sets the overall canvas size</refpurpose>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/imagick/imagickpixel/construct.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/imagick/imagickpixel/construct.xml
diff -u phpdoc/en/reference/imagick/imagickpixel/construct.xml:1.5
phpdoc/en/reference/imagick/imagickpixel/construct.xml:1.6
--- phpdoc/en/reference/imagick/imagickpixel/construct.xml:1.5 Wed Jun 20
22:24:43 2007
+++ phpdoc/en/reference/imagick/imagickpixel/construct.xml Wed Jun 20
22:57:05 2007
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<<<<<<< construct.xml
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry xmlns="http://docbook.org/ns/docbook";
xml:id="function.imagickpixel-construct">
-=======
-<!-- $Revision: 1.5 $ -->
-<refentry id="function.imagickpixel-construct">
->>>>>>> 1.4
<refnamediv>
<refname>ImagickPixel::__construct</refname>
<refpurpose>The ImagickPixel constructor</refpurpose>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/imagick/imagickpixel/getcolor.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/reference/imagick/imagickpixel/getcolor.xml
diff -u phpdoc/en/reference/imagick/imagickpixel/getcolor.xml:1.4
phpdoc/en/reference/imagick/imagickpixel/getcolor.xml:1.5
--- phpdoc/en/reference/imagick/imagickpixel/getcolor.xml:1.4 Wed Jun 20
22:24:43 2007
+++ phpdoc/en/reference/imagick/imagickpixel/getcolor.xml Wed Jun 20
22:57:05 2007
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<<<<<<< getcolor.xml
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry xmlns="http://docbook.org/ns/docbook";
xml:id="function.imagickpixel-getcolor">
-=======
-<!-- $Revision: 1.4 $ -->
-<refentry id="function.imagickpixel-getcolor">
->>>>>>> 1.3
<refnamediv>
<refname>ImagickPixel::getColor</refname>
<refpurpose>Returns the color</refpurpose>
