From 15336f473dbea81f96821d921c5b764d95f3d870 Mon Sep 17 00:00:00 2001
From: Damien Seguy <dams@php.net>
Date: Wed, 15 Apr 2009 07:54:17 +0000
Subject: [PATCH] entity usage

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@278735 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/functions/getimagesize.xml    | 20 ++++++++++---------
 .../functions/image-type-to-extension.xml     | 20 +++++++++----------
 .../functions/image-type-to-mime-type.xml     | 15 +++++++-------
 reference/image/functions/iptcembed.xml       | 17 ++++++++--------
 reference/image/functions/iptcparse.xml       | 12 +++++------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/reference/image/functions/getimagesize.xml b/reference/image/functions/getimagesize.xml
index a1451cfdbd..41cd09951e 100644
--- a/reference/image/functions/getimagesize.xml
+++ b/reference/image/functions/getimagesize.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.40 $ -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.41 $ -->
 <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.getimagesize">
  <refnamediv>
   <refname>getimagesize</refname>
@@ -39,6 +39,7 @@
    </simpara>
   </note>
  </refsect1>
+ 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -71,6 +72,7 @@
    </variablelist>
   </para>
  </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -137,6 +139,7 @@ if ($size && $fp) {
    On failure, &false; is returned.
   </para>
  </refsect1>
+ 
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
@@ -147,6 +150,7 @@ if ($size && $fp) {
    <constant>E_NOTICE</constant>.
   </para>
  </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -231,11 +235,12 @@ if ($size && $fp) {
    </informaltable>
   </para>
  </refsect1>
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
-    <title>getimagesize (file)</title>
+    <title><function>getimagesize</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -275,15 +280,12 @@ if (isset($info["APP13"])) {
    </example>
   </para>
  </refsect1>
+ 
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    The <function>getimagesize</function> function does not require the GD
-    image library.
-   </para>
-  </note>
+  &note.gd.notrequired;
  </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/image/functions/image-type-to-extension.xml b/reference/image/functions/image-type-to-extension.xml
index 1b307913d4..cd3cee0fde 100644
--- a/reference/image/functions/image-type-to-extension.xml
+++ b/reference/image/functions/image-type-to-extension.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.6 $ -->
+<?xml version='1.0' encoding='utf-8'?>
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.image-type-to-extension" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>image_type_to_extension</refname>
@@ -40,20 +40,14 @@
    </variablelist>
   </para>
  </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    A string with the extension corresponding to the given image type.
   </para>
  </refsect1>
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function does not require the GD image library.
-   </para>
-  </note>
- </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -74,6 +68,12 @@ imagedestroy($im);
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &note.gd.notrequired;
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/image/functions/image-type-to-mime-type.xml b/reference/image/functions/image-type-to-mime-type.xml
index 9166cd258c..b2c2860e85 100644
--- a/reference/image/functions/image-type-to-mime-type.xml
+++ b/reference/image/functions/image-type-to-mime-type.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.image-type-to-mime-type" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>image_type_to_mime_type</refname>
@@ -32,6 +32,7 @@
    </variablelist>
   </para>
  </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -125,7 +126,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>image_type_to_mime_type (file)</title>
+    <title><function>image_type_to_mime_type</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -136,14 +137,12 @@ header("Content-type: " . image_type_to_mime_type(IMAGETYPE_PNG));
    </example>
   </para>
  </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    This function does not require the GD image library.
-   </para>
-  </note>
+  &note.gd.notrequired;
  </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/image/functions/iptcembed.xml b/reference/image/functions/iptcembed.xml
index 059184a426..e11c7a4b1b 100644
--- a/reference/image/functions/iptcembed.xml
+++ b/reference/image/functions/iptcembed.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id='function.iptcembed' xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>iptcembed</refname>
-  <refpurpose>Embed binary IPTC data into a JPEG image</refpurpose>
+  <refpurpose>Embeds binary IPTC data into a JPEG image</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,6 +13,9 @@
    <methodparam><type>string</type><parameter>jpeg_file_name</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>spool</parameter></methodparam>
   </methodsynopsis>
+  <para>
+   Embeds binary IPTC data into a JPEG image.
+  </para>
  </refsect1>
  <refsect1 role="parameters">
   &reftitle.parameters;
@@ -118,14 +121,12 @@ $content = iptcembed($data, $path);
    </programlisting>
   </example>
  </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    This function does not require the GD image library.
-   </para>
-  </note>
+  &note.gd.notrequired;
  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/image/functions/iptcparse.xml b/reference/image/functions/iptcparse.xml
index 4062fdd5dc..89027e1d07 100644
--- a/reference/image/functions/iptcparse.xml
+++ b/reference/image/functions/iptcparse.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.6 $ -->
 <refentry xml:id="function.iptcparse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>iptcparse</refname>
@@ -57,14 +57,12 @@ if(isset($info['APP13']))
    </example>
   </para>
  </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    This function does not require the GD image library.
-   </para>
-  </note>
+  &note.gd.notrequired;
  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file