sigmasternchen/php-doc-en
1
0
Fork 0
mirror of https://github.com/sigmasternchen/php-doc-en synced 2025-03-15 16:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix few conflicts due to docbook5 upgrade

Browse source 
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@238164 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Hannes Magnusson 2007-06-20 22:57:05 +00:00
parent 60a49abb7a
commit 7d192049a0
5 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reference/gnupg/reference.xml
View file

@ -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>

7
reference/imagick/imagickdraw/settextantialias.xml
View file

@ -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>

7
reference/imagick/imagickdraw/setviewbox.xml
View file

@ -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>

7
reference/imagick/imagickpixel/construct.xml
View file

@ -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>

7
reference/imagick/imagickpixel/getcolor.xml
View file

@ -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>