From 265f2bbec9f825c48a1b6a69107175b5f700e863 Mon Sep 17 00:00:00 2001
From: Mikko Koppanen <mkoppanen@php.net>
Date: Sun, 2 Sep 2007 02:45:46 +0000
Subject: [PATCH] Fixed method parameters.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@242062 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/imagick/imagick/compositeimage.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/reference/imagick/imagick/compositeimage.xml b/reference/imagick/imagick/compositeimage.xml
index d399a4f147..e992c5aa79 100644
--- a/reference/imagick/imagick/compositeimage.xml
+++ b/reference/imagick/imagick/compositeimage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.imagick-compositeimage">
  <refnamediv>
   <refname>Imagick::compositeImage</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>Imagick::compositeImage</methodname>
-   <methodparam><type>Imagick</type><parameter>composite_wand</parameter></methodparam>
-   <methodparam><type>int</type><parameter>compose</parameter></methodparam>
+   <methodparam><type>Imagick</type><parameter>composite_object</parameter></methodparam>
+   <methodparam><type>int</type><parameter>composite</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>channel</parameter></methodparam>
@@ -28,9 +28,10 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>composite_wand</parameter></term>
+     <term><parameter>composite_object</parameter></term>
      <listitem>
       <para>
+	  Imagick object which holds the composite image
       </para>
      </listitem>
     </varlistentry>
@@ -38,6 +39,7 @@
      <term><parameter>compose</parameter></term>
      <listitem>
       <para>
+	  Composite operator. See <link linkend="imagick.constants.compositeop">Composite Operator Constants</link>
       </para>
      </listitem>
     </varlistentry>
@@ -45,6 +47,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
+	   The column offset of the composited image
       </para>
      </listitem>
     </varlistentry>
@@ -52,6 +55,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
+	   The row offset of the composited image
       </para>
      </listitem>
     </varlistentry>
@@ -59,6 +63,10 @@
      <term><parameter>channel</parameter></term>
      <listitem>
       <para>
+	   Provide any channel constant that is valid for your channel mode. To
+       apply to more than one channel, combine channeltype constants using
+       bitwise operators. Defaults to Imagick::CHANNEL_ALL. Refer to this
+       list of  <link linkend="imagick.constants.channel">channel constants</link>.
       </para>
      </listitem>
     </varlistentry>