From 7d192049a08a4e8a2dc3caf7f42867aae6c08f61 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 20 Jun 2007 22:57:05 +0000
Subject: [PATCH] Fix few conflicts due to docbook5 upgrade

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@238164 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/gnupg/reference.xml                      | 12 +-----------
 reference/imagick/imagickdraw/settextantialias.xml |  7 +------
 reference/imagick/imagickdraw/setviewbox.xml       |  7 +------
 reference/imagick/imagickpixel/construct.xml       |  7 +------
 reference/imagick/imagickpixel/getcolor.xml        |  7 +------
 5 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/reference/gnupg/reference.xml b/reference/gnupg/reference.xml
index 88bc0be227..4757cf45cc 100644
--- a/reference/gnupg/reference.xml
+++ b/reference/gnupg/reference.xml
@@ -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>
 
diff --git a/reference/imagick/imagickdraw/settextantialias.xml b/reference/imagick/imagickdraw/settextantialias.xml
index 46f6139971..02c5fd3aad 100644
--- a/reference/imagick/imagickdraw/settextantialias.xml
+++ b/reference/imagick/imagickdraw/settextantialias.xml
@@ -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>
diff --git a/reference/imagick/imagickdraw/setviewbox.xml b/reference/imagick/imagickdraw/setviewbox.xml
index 65a205716e..f4df5557b0 100644
--- a/reference/imagick/imagickdraw/setviewbox.xml
+++ b/reference/imagick/imagickdraw/setviewbox.xml
@@ -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>
diff --git a/reference/imagick/imagickpixel/construct.xml b/reference/imagick/imagickpixel/construct.xml
index 274ef83c39..189bb73c7b 100644
--- a/reference/imagick/imagickpixel/construct.xml
+++ b/reference/imagick/imagickpixel/construct.xml
@@ -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>
diff --git a/reference/imagick/imagickpixel/getcolor.xml b/reference/imagick/imagickpixel/getcolor.xml
index dbbef6bafa..4fb420b587 100644
--- a/reference/imagick/imagickpixel/getcolor.xml
+++ b/reference/imagick/imagickpixel/getcolor.xml
@@ -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>