From 4ca59ff030d493eadfb1d265f74a27018d491fd5 Mon Sep 17 00:00:00 2001
From: Christoph Michael Becker <cmb@php.net>
Date: Sun, 14 Aug 2016 12:48:17 +0000
Subject: [PATCH] Fix misinformation regarding the bundled GD

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@339877 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language-snippets.ent                          |  3 ---
 reference/image/book.xml                       |  2 +-
 reference/image/functions/imageconvolution.xml |  4 +++-
 reference/image/functions/imageflip.xml        |  4 ----
 reference/image/functions/imagelayereffect.xml | 12 ++++++++++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index b9aac2b27d..3e5dad60ce 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -515,9 +515,6 @@ function.</simpara></warning>'>
 if PHP is compiled using <option role="configure">--with-t1lib[=DIR]</option>.
 </simpara></note>'>
 
-<!ENTITY note.bundled.gd '<note xmlns="http://docbook.org/ns/docbook"><simpara>This function is only available if
-PHP is compiled with the bundled version of the GD library.</simpara></note>'>
-
 <!ENTITY note.freetype '<note xmlns="http://docbook.org/ns/docbook"><simpara>This function is only available if
 PHP is compiled with freetype support (<option role="configure">--with-freetype-dir=DIR</option>)
 </simpara></note>'>
diff --git a/reference/image/book.xml b/reference/image/book.xml
index 21aa59479d..fb54668d57 100644
--- a/reference/image/book.xml
+++ b/reference/image/book.xml
@@ -94,7 +94,7 @@
        <entry>XPM</entry>
        <entry>&true;</entry>
        <entry>&false;</entry>
-       <entry>Read support available on Windows as of PHP 5.3.19. Requires bundled version of GD</entry>
+       <entry>Read support available on Windows as of PHP 5.3.19.</entry>
       </row>
       <row>
        <entry>WBMP</entry>
diff --git a/reference/image/functions/imageconvolution.xml b/reference/image/functions/imageconvolution.xml
index 7e6053c9c6..5abd40ae98 100644
--- a/reference/image/functions/imageconvolution.xml
+++ b/reference/image/functions/imageconvolution.xml
@@ -115,7 +115,9 @@ imagepng($image, null, 9);
  </refsect1>
  <refsect1 role="notes">
   &reftitle.notes;
-  &note.bundled.gd;
+  <para>
+   This function requires GD 2.1.0 or higher.
+  </para>
  </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/image/functions/imageflip.xml b/reference/image/functions/imageflip.xml
index 921972141b..033aa6fd6c 100644
--- a/reference/image/functions/imageflip.xml
+++ b/reference/image/functions/imageflip.xml
@@ -152,10 +152,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.bundled.gd;
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/image/functions/imagelayereffect.xml b/reference/image/functions/imagelayereffect.xml
index f9e48586dc..6a432e99da 100644
--- a/reference/image/functions/imagelayereffect.xml
+++ b/reference/image/functions/imagelayereffect.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.imagelayereffect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagelayereffect</refname>
-  <refpurpose>Set the alpha blending flag to use the bundled libgd layering effects</refpurpose>
+  <refpurpose>Set the alpha blending flag to use layering effects</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam><type>int</type><parameter>effect</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Set the alpha blending flag to use the bundled libgd layering effects.
+   Set the alpha blending flag to use layering effects.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -115,6 +115,14 @@ imagedestroy($im);
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <simpara>
+   Before PHP 5.5.0, this function is only available if PHP is compiled with the
+   bundled version of the GD library.
+  </simpara>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file