From a2590b092c616f15f70f1c898c45ffa8928b06e0 Mon Sep 17 00:00:00 2001
From: Chris Wright <daverandom@php.net>
Date: Thu, 27 Feb 2014 11:10:24 +0000
Subject: [PATCH] Remove CURLOPT_CLOSEPOLICY

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@332896 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/curl/constants.xml             | 12 ++++++------
 reference/curl/functions/curl-setopt.xml | 19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/reference/curl/constants.xml b/reference/curl/constants.xml
index 5c7ee06c7b..295e7baa97 100644
--- a/reference/curl/constants.xml
+++ b/reference/curl/constants.xml
@@ -833,7 +833,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -1273,7 +1273,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -1284,7 +1284,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -1295,7 +1295,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -1306,7 +1306,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -1317,7 +1317,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Removed in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml
index 97b550f61b..3deebe9fc6 100644
--- a/reference/curl/functions/curl-setopt.xml
+++ b/reference/curl/functions/curl-setopt.xml
@@ -439,13 +439,16 @@
           <row>
            <entry valign="top"><constant>CURLOPT_CLOSEPOLICY</constant></entry>
            <entry valign="top">
-            Either
-            <parameter>CURLCLOSEPOLICY_LEAST_RECENTLY_USED</parameter> or
-            <parameter>CURLCLOSEPOLICY_OLDEST</parameter>.
-            There are three other <literal>CURLCLOSEPOLICY_</literal>
-            constants, but cURL does not support them yet.
+            One of the <constant>CURLCLOSEPOLICY_*</constant> values.
+            <note>
+             <para>
+              This option is deprecated, as it was never implemented in cURL and
+              never had any effect.
+             </para>
+            </note>
            </entry>
            <entry valign="top">
+            Removed in PHP 5.6.0.
            </entry>
           </row>
           <row>
@@ -1423,6 +1426,12 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.6.0</entry>
+       <entry>
+        Removed <constant>CURLOPT_CLOSEPOLICY</constant> and associated values.
+       </entry>
+      </row>
       <row>
        <entry>5.5.0</entry>
        <entry>