From eb0258c07f46119793193e565236735dc7af48f7 Mon Sep 17 00:00:00 2001
From: Damien Seguy <dams@php.net>
Date: Wed, 12 Feb 2003 17:49:07 +0000
Subject: [PATCH] col => color, some constant retagging

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@115950 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/functions/imagearc.xml        |  4 ++--
 reference/image/functions/imagechar.xml       |  6 ++---
 reference/image/functions/imagecharup.xml     |  6 ++---
 reference/image/functions/imagedashedline.xml |  4 ++--
 reference/image/functions/imageellipse.xml    |  4 ++--
 reference/image/functions/imagefill.xml       |  6 ++---
 reference/image/functions/imagefilledarc.xml  | 24 +++++++++----------
 .../image/functions/imagefilledellipse.xml    |  4 ++--
 .../image/functions/imagefilledpolygon.xml    |  4 ++--
 .../image/functions/imagefilledrectangle.xml  |  6 ++---
 .../image/functions/imagefilltoborder.xml     |  6 ++---
 reference/image/functions/imagegd2.xml        |  7 ++++--
 reference/image/functions/imageline.xml       |  6 ++---
 reference/image/functions/imagepolygon.xml    |  4 ++--
 reference/image/functions/imagepsbbox.xml     | 10 ++++----
 reference/image/functions/imagepsfreefont.xml |  5 +++-
 reference/image/functions/imagesetpixel.xml   |  6 ++---
 reference/image/functions/imagettftext.xml    |  4 ++--
 reference/image/functions/imagetypes.xml      |  8 +++----
 19 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/reference/image/functions/imagearc.xml b/reference/image/functions/imagearc.xml
index 03f0efac2d..15d9971db6 100644
--- a/reference/image/functions/imagearc.xml
+++ b/reference/image/functions/imagearc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imagearc">
   <refnamediv>
@@ -17,7 +17,7 @@
      <methodparam><type>int</type><parameter>h</parameter></methodparam>
      <methodparam><type>int</type><parameter>s</parameter></methodparam>
      <methodparam><type>int</type><parameter>e</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
     </methodsynopsis>
    <para>
     <function>imagearc</function> draws a partial ellipse centered at
diff --git a/reference/image/functions/imagechar.xml b/reference/image/functions/imagechar.xml
index 4d5993506f..aa7f2c2eb2 100644
--- a/reference/image/functions/imagechar.xml
+++ b/reference/image/functions/imagechar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imagechar">
   <refnamediv>
@@ -15,14 +15,14 @@
      <methodparam><type>int</type><parameter>x</parameter></methodparam>
      <methodparam><type>int</type><parameter>y</parameter></methodparam>
      <methodparam><type>string</type><parameter>c</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
     </methodsynopsis>
    <para>
     <function>imagechar</function> draws the first character of
     <parameter>c</parameter> in the image identified by
     <parameter>id</parameter> with its upper-left at
     <parameter>x</parameter>,<parameter>y</parameter> (top left is 0,
-    0) with the color <parameter>col</parameter>. If <parameter>font</parameter>
+    0) with the color <parameter>color</parameter>. If <parameter>font</parameter>
     is 1, 2, 3, 4 or 5, a built-in font is used (with higher numbers
     corresponding to larger fonts).
    </para>
diff --git a/reference/image/functions/imagecharup.xml b/reference/image/functions/imagecharup.xml
index 2c7e4765bb..ae86b3a69f 100644
--- a/reference/image/functions/imagecharup.xml
+++ b/reference/image/functions/imagecharup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imagecharup">
   <refnamediv>
@@ -15,14 +15,14 @@
      <methodparam><type>int</type><parameter>x</parameter></methodparam>
      <methodparam><type>int</type><parameter>y</parameter></methodparam>
      <methodparam><type>string</type><parameter>c</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
     </methodsynopsis>
    <para>
     <function>imagecharup</function> draws the character
     <parameter>c</parameter> vertically in the image identified by
     <parameter>image</parameter> at coordinates
     <parameter>x</parameter>, <parameter>y</parameter> (top left is
-    0, 0) with the color <parameter>col</parameter>.
+    0, 0) with the color <parameter>color</parameter>.
     If <parameter>font</parameter> is 1, 2, 3, 4 or 5, a built-in font is
     used.
    </para>
diff --git a/reference/image/functions/imagedashedline.xml b/reference/image/functions/imagedashedline.xml
index f29631c419..2215031106 100644
--- a/reference/image/functions/imagedashedline.xml
+++ b/reference/image/functions/imagedashedline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagedashedline">
    <refnamediv>
@@ -15,7 +15,7 @@
       <methodparam><type>int</type><parameter>y1</parameter></methodparam>
       <methodparam><type>int</type><parameter>x2</parameter></methodparam>
       <methodparam><type>int</type><parameter>y2</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function is deprecated. Use combination of
diff --git a/reference/image/functions/imageellipse.xml b/reference/image/functions/imageellipse.xml
index b2d877e318..5a5fca4856 100644
--- a/reference/image/functions/imageellipse.xml
+++ b/reference/image/functions/imageellipse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imageellipse">
   <refnamediv>
@@ -15,7 +15,7 @@
      <methodparam><type>int</type><parameter>cy</parameter></methodparam>
      <methodparam><type>int</type><parameter>w</parameter></methodparam>
      <methodparam><type>int</type><parameter>h</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
     </methodsynopsis>
    <para>
     <function>imageellipse</function> draws an ellipse centered at
diff --git a/reference/image/functions/imagefill.xml b/reference/image/functions/imagefill.xml
index 3ac9733c34..8235d4337d 100644
--- a/reference/image/functions/imagefill.xml
+++ b/reference/image/functions/imagefill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagefill">
    <refnamediv>
@@ -13,12 +13,12 @@
       <methodparam><type>resource</type><parameter>image</parameter></methodparam>
       <methodparam><type>int</type><parameter>x</parameter></methodparam>
       <methodparam><type>int</type><parameter>y</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagefill</function> performs a flood fill starting at
      coordinate <parameter>x</parameter>, <parameter>y</parameter>
-     (top left is 0, 0) with color <parameter>col</parameter> in the
+     (top left is 0, 0) with color <parameter>color</parameter> in the
      image <parameter>image</parameter>.
     </para>
    </refsect1>
diff --git a/reference/image/functions/imagefilledarc.xml b/reference/image/functions/imagefilledarc.xml
index a83d721ac0..26898664f7 100644
--- a/reference/image/functions/imagefilledarc.xml
+++ b/reference/image/functions/imagefilledarc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imagefilledarc">
   <refnamediv>
@@ -17,7 +17,7 @@
      <methodparam><type>int</type><parameter>h</parameter></methodparam>
      <methodparam><type>int</type><parameter>s</parameter></methodparam>
      <methodparam><type>int</type><parameter>e</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
      <methodparam><type>int</type><parameter>style</parameter></methodparam>
     </methodsynopsis>
    <para>
@@ -31,18 +31,18 @@
     <parameter>e</parameter> arguments.
     <parameter>style</parameter> is a bitwise OR of the following possibilities:
     <orderedlist>
-     <listitem><simpara><literal>IMG_ARC_PIE</literal></simpara></listitem>
-     <listitem><simpara><literal>IMG_ARC_CHORD</literal></simpara></listitem>
-     <listitem><simpara><literal>IMG_ARC_NOFILL</literal></simpara></listitem>
-     <listitem><simpara><literal>IMG_ARC_EDGED</literal></simpara></listitem>
+     <listitem><simpara><constant>IMG_ARC_PIE</constant></simpara></listitem>
+     <listitem><simpara><constant>IMG_ARC_CHORD</constant></simpara></listitem>
+     <listitem><simpara><constant>IMG_ARC_NOFILL</constant></simpara></listitem>
+     <listitem><simpara><constant>IMG_ARC_EDGED</constant></simpara></listitem>
     </orderedlist>
-    <literal>IMG_ARC_PIE</literal> and <literal>IMG_ARC_CHORD</literal> are 
-    mutually exclusive; <literal>IMG_ARC_CHORD</literal> just
+    <constant>IMG_ARC_PIE</constant> and <constant>IMG_ARC_CHORD</constant> are 
+    mutually exclusive; <constant>IMG_ARC_CHORD</constant> just
     connects the starting and ending angles with a straight line, while
-    <literal>IMG_ARC_PIE</literal> produces a rounded edge. 
-    <literal>IMG_ARC_NOFILL</literal> indicates that the arc
-    or chord should be outlined, not filled.  <literal>IMG_ARC_EDGED</literal>, 
-    used together with <literal>IMG_ARC_NOFILL</literal>, indicates that the 
+    <constant>IMG_ARC_PIE</constant> produces a rounded edge. 
+    <constant>IMG_ARC_NOFILL</constant> indicates that the arc
+    or chord should be outlined, not filled.  <constant>IMG_ARC_EDGED</constant>, 
+    used together with <constant>IMG_ARC_NOFILL</constant>, indicates that the 
     beginning and ending angles should be connected to the center - this is a 
     good way to outline (rather than fill) a 'pie slice'.
    </para>
diff --git a/reference/image/functions/imagefilledellipse.xml b/reference/image/functions/imagefilledellipse.xml
index 5a2dad07ba..ceec8cd6e9 100644
--- a/reference/image/functions/imagefilledellipse.xml
+++ b/reference/image/functions/imagefilledellipse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.imagefilledellipse">
   <refnamediv>
@@ -15,7 +15,7 @@
      <methodparam><type>int</type><parameter>cy</parameter></methodparam>
      <methodparam><type>int</type><parameter>w</parameter></methodparam>
      <methodparam><type>int</type><parameter>h</parameter></methodparam>
-     <methodparam><type>int</type><parameter>col</parameter></methodparam>
+     <methodparam><type>int</type><parameter>color</parameter></methodparam>
     </methodsynopsis>
    <para>
     <function>imagefilledellipse</function> draws an ellipse centered at
diff --git a/reference/image/functions/imagefilledpolygon.xml b/reference/image/functions/imagefilledpolygon.xml
index 3dbce9bb6f..91614a6882 100644
--- a/reference/image/functions/imagefilledpolygon.xml
+++ b/reference/image/functions/imagefilledpolygon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagefilledpolygon">
    <refnamediv>
@@ -13,7 +13,7 @@
       <methodparam><type>resource</type><parameter>image</parameter></methodparam>
       <methodparam><type>array</type><parameter>points</parameter></methodparam>
       <methodparam><type>int</type><parameter>num_points</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagefilledpolygon</function> creates a filled polygon
diff --git a/reference/image/functions/imagefilledrectangle.xml b/reference/image/functions/imagefilledrectangle.xml
index 0d5586bdc8..dcc331a984 100644
--- a/reference/image/functions/imagefilledrectangle.xml
+++ b/reference/image/functions/imagefilledrectangle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagefilledrectangle">
    <refnamediv>
@@ -15,11 +15,11 @@
       <methodparam><type>int</type><parameter>y1</parameter></methodparam>
       <methodparam><type>int</type><parameter>x2</parameter></methodparam>
       <methodparam><type>int</type><parameter>y2</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagefilledrectangle</function> creates a filled
-     rectangle of color <parameter>col</parameter> in image
+     rectangle of color <parameter>color</parameter> in image
      <parameter>image</parameter> starting at upper left coordinates
      <parameter>x1</parameter>, <parameter>y1</parameter> and ending
      at bottom right coordinates <parameter>x2</parameter>,
diff --git a/reference/image/functions/imagefilltoborder.xml b/reference/image/functions/imagefilltoborder.xml
index ba27537b47..1b5ac0c0f8 100644
--- a/reference/image/functions/imagefilltoborder.xml
+++ b/reference/image/functions/imagefilltoborder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagefilltoborder">
    <refnamediv>
@@ -14,14 +14,14 @@
       <methodparam><type>int</type><parameter>x</parameter></methodparam>
       <methodparam><type>int</type><parameter>y</parameter></methodparam>
       <methodparam><type>int</type><parameter>border</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagefilltoborder</function> performs a flood fill
      whose border color is defined by <parameter>border</parameter>.
      The starting point for the fill is <parameter>x</parameter>,
      <parameter>y</parameter> (top left is 0, 0) and the region is
-     filled with color <parameter>col</parameter>.
+     filled with color <parameter>color</parameter>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/image/functions/imagegd2.xml b/reference/image/functions/imagegd2.xml
index f76add08bd..73c58dc46c 100644
--- a/reference/image/functions/imagegd2.xml
+++ b/reference/image/functions/imagegd2.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.67 -->
   <refentry id='function.imagegd2'>
    <refnamediv>
     <refname>imagegd2</refname>
-    <refpurpose>Output GD2 image to browser or file</refpurpose>
+    <refpurpose>Output GD2 image</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
@@ -18,6 +18,9 @@
     <para>
      &warn.undocumented.func;
     </para>
+    <para>
+     <function>imagegd2</function> outputs GD2 image to browser or file.
+    </para>
     <para>
      The optional <parameter>type</parameter> parameter is either 
      <literal>raw</literal> or <literal>compressed</literal>.
diff --git a/reference/image/functions/imageline.xml b/reference/image/functions/imageline.xml
index 639a7e9685..e9cafcdead 100644
--- a/reference/image/functions/imageline.xml
+++ b/reference/image/functions/imageline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imageline">
    <refnamediv>
@@ -15,13 +15,13 @@
       <methodparam><type>int</type><parameter>y1</parameter></methodparam>
       <methodparam><type>int</type><parameter>x2</parameter></methodparam>
       <methodparam><type>int</type><parameter>y2</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imageline</function> draws a line from
      <parameter>x1</parameter>, <parameter>y1</parameter> to
      <parameter>x2</parameter>, <parameter>y2</parameter> (top left is
-     0, 0) in image im of color <parameter>col</parameter>.
+     0, 0) in image im of color <parameter>color</parameter>.
     </para>
     <para>
      See also <function>imagecreate</function> and
diff --git a/reference/image/functions/imagepolygon.xml b/reference/image/functions/imagepolygon.xml
index 7ae50ac417..18e2d691ed 100644
--- a/reference/image/functions/imagepolygon.xml
+++ b/reference/image/functions/imagepolygon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagepolygon">
    <refnamediv>
@@ -13,7 +13,7 @@
       <methodparam><type>resource</type><parameter>image</parameter></methodparam>
       <methodparam><type>array</type><parameter>points</parameter></methodparam>
       <methodparam><type>int</type><parameter>num_points</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagepolygon</function> creates a polygon in image id.
diff --git a/reference/image/functions/imagepsbbox.xml b/reference/image/functions/imagepsbbox.xml
index 278a9fc274..2075d65764 100644
--- a/reference/image/functions/imagepsbbox.xml
+++ b/reference/image/functions/imagepsbbox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagepsbbox">
    <refnamediv>
@@ -21,20 +21,20 @@
       <methodparam choice="opt"><type>float</type><parameter>angle</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <parameter>Size</parameter> is expressed in pixels.
+     <parameter>size</parameter> is expressed in pixels.
     </para>
     <para>
-     <parameter>Space</parameter> allows you to change the default
+     <parameter>space</parameter> allows you to change the default
      value of a space in a font.  This amount is added to the normal
      value and can also be negative.
     </para>
     <para>
-     <parameter>Tightness</parameter> allows you to control the amount
+     <parameter>tightness</parameter> allows you to control the amount
      of white space between characters. This amount is added to the
      normal character width and can also be negative.
     </para>
     <para>
-     <parameter>Angle</parameter> is in degrees.
+     <parameter>angle</parameter> is in degrees.
     </para>
     <para>
      Parameters <parameter>space</parameter> and
diff --git a/reference/image/functions/imagepsfreefont.xml b/reference/image/functions/imagepsfreefont.xml
index c5d4d95ec8..ded33e87c1 100644
--- a/reference/image/functions/imagepsfreefont.xml
+++ b/reference/image/functions/imagepsfreefont.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagepsfreefont">
    <refnamediv>
@@ -12,6 +12,9 @@
       <type>void</type><methodname>imagepsfreefont</methodname>
       <methodparam><type>int</type><parameter>fontindex</parameter></methodparam>
      </methodsynopsis>
+    <para>
+     <function>imagepsfreefont</function> frees memory used by a PostScript Type 1 font.
+    </para>    
     <para>
      See also <function>imagepsloadfont</function>.
     </para>
diff --git a/reference/image/functions/imagesetpixel.xml b/reference/image/functions/imagesetpixel.xml
index d8ee6149a3..5cdad87d58 100644
--- a/reference/image/functions/imagesetpixel.xml
+++ b/reference/image/functions/imagesetpixel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagesetpixel">
    <refnamediv>
@@ -13,13 +13,13 @@
       <methodparam><type>resource</type><parameter>image</parameter></methodparam>
       <methodparam><type>int</type><parameter>x</parameter></methodparam>
       <methodparam><type>int</type><parameter>y</parameter></methodparam>
-      <methodparam><type>int</type><parameter>col</parameter></methodparam>
+      <methodparam><type>int</type><parameter>color</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>imagesetpixel</function> draws a pixel at
      <parameter>x</parameter>, <parameter>y</parameter> (top left is
      0, 0) in image <parameter>image</parameter> of color
-     <parameter>col</parameter>.
+     <parameter>color</parameter>.
     </para>
     <para>
      See also <function>imagecreate</function> and
diff --git a/reference/image/functions/imagettftext.xml b/reference/image/functions/imagettftext.xml
index ae85412e68..4c244d2a6a 100644
--- a/reference/image/functions/imagettftext.xml
+++ b/reference/image/functions/imagettftext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagettftext">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>imagettftext</methodname>
-     <methodparam><type>resource</type><parameter>im</parameter></methodparam>
+     <methodparam><type>resource</type><parameter>image</parameter></methodparam>
      <methodparam><type>int</type><parameter>size</parameter></methodparam>
      <methodparam><type>int</type><parameter>angle</parameter></methodparam>
      <methodparam><type>int</type><parameter>x</parameter></methodparam>
diff --git a/reference/image/functions/imagetypes.xml b/reference/image/functions/imagetypes.xml
index aac410622c..95febdf0e7 100644
--- a/reference/image/functions/imagetypes.xml
+++ b/reference/image/functions/imagetypes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.61 -->
   <refentry id="function.imagetypes">
    <refnamediv>
@@ -15,11 +15,11 @@
     <para>
      This function returns a bit-field corresponding to the image
      formats supported by the version of GD linked into PHP.  The
-     following bits are returned, <literal>IMG_GIF</literal> | <literal>IMG_JPG</literal> 
-     | <literal>IMG_PNG</literal> | <literal>IMG_WBMP</literal>.  
+     following bits are returned, <constant>IMG_GIF</constant> | <constant>IMG_JPG</constant> 
+     | <constant>IMG_PNG</constant> | <constant>IMG_WBMP</constant>.  
      To check for PNG support, for example, do this:
      <example>
-      <title>imagetypes</title>
+      <title><function>imagetypes</function> example</title>
       <programlisting role="php">
 <![CDATA[
 <?php