From 689d672e887f5673cfaeb42c638b2fbb6e7eb05c Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Mon, 14 Jun 2010 09:00:46 +0000
Subject: [PATCH] - we support jpeg 6b, 7 and 8 now

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@300426 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/configure.xml | 7 ++++---
 reference/image/setup.xml     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/reference/image/configure.xml b/reference/image/configure.xml
index a0c1913912..e858ccf82c 100644
--- a/reference/image/configure.xml
+++ b/reference/image/configure.xml
@@ -33,10 +33,11 @@
     </thead>
     <tbody>
      <row>
-      <entry><literal>jpeg-6b</literal></entry>
+      <entry><literal>jpeg</literal></entry>
       <entry>
-       To enable support for jpeg-6b add
-       <option role="configure">--with-jpeg-dir=DIR</option>.
+       To enable support for jpeg add
+       <option role="configure">--with-jpeg-dir=DIR</option>. Jpeg 6b, 7 or 8
+       are supported.
       </entry>
      </row>
      <row>
diff --git a/reference/image/setup.xml b/reference/image/setup.xml
index fe52b8ce72..fcc0050d29 100644
--- a/reference/image/setup.xml
+++ b/reference/image/setup.xml
@@ -63,10 +63,10 @@
        </entry>
       </row>
       <row>
-       <entry><literal>jpeg-6b</literal></entry>
+       <entry><literal>jpeg</literal></entry>
        <entry><link xlink:href="&url.jpeg;">&url.jpeg;</link></entry>
        <entry>
-        When building the jpeg-v6b library (prior to building PHP) you
+        When building the jpeg library (prior to building PHP) you
         must use the <option role="configure">--enable-shared</option>
         option in the configure step.  If you do not, you will receive
         an error saying <literal>libjpeg.(a|so) not found</literal>