From 0b4c5897dd4f9ca3ec78ac7e1be64ffe82b27d32 Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Wed, 7 Apr 2010 17:09:10 +0000
Subject: [PATCH] Commented out more PHP 6 documentation. Grep 'FIXME PHP_6' to
 fix. Helps close PHP Bug #51468

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297626 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/errorfunc/functions/error-reporting.xml          | 2 ++
 reference/exec/functions/proc-open.xml                     | 2 ++
 reference/filesystem/functions/file.xml                    | 4 ++++
 reference/network/functions/define-syslog-variables.xml    | 2 ++
 reference/outcontrol/functions/ob-start.xml                | 2 ++
 reference/stream/functions/stream-resolve-include-path.xml | 3 ++-
 reference/strings/functions/chr.xml                        | 4 ++--
 7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/reference/errorfunc/functions/error-reporting.xml b/reference/errorfunc/functions/error-reporting.xml
index 17e40b0df1..f6e4304b16 100644
--- a/reference/errorfunc/functions/error-reporting.xml
+++ b/reference/errorfunc/functions/error-reporting.xml
@@ -81,10 +81,12 @@
        <entry>5.3.0</entry>
        <entry><constant>E_DEPRECATED</constant> and <constant>E_USER_DEPRECATED</constant> introduced.</entry>
       </row>
+      <!-- FIXME PHP_6
       <row>
        <entry>6.0.0</entry>
        <entry><constant>E_STRICT</constant> became part of <constant>E_ALL</constant>.</entry>
       </row>
+      -->
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/exec/functions/proc-open.xml b/reference/exec/functions/proc-open.xml
index 07d45301f4..a90bf4c285 100644
--- a/reference/exec/functions/proc-open.xml
+++ b/reference/exec/functions/proc-open.xml
@@ -167,6 +167,7 @@
       </row>
      </thead>
      <tbody>
+      <!-- FIXME PHP_6
       <row>
        <entry>6.0.0</entry>
        <entry>
@@ -175,6 +176,7 @@
         <parameter>other_options</parameter> parameter.
        </entry>
       </row>
+      -->
       <row>
        <entry>5.2.1</entry>
        <entry>
diff --git a/reference/filesystem/functions/file.xml b/reference/filesystem/functions/file.xml
index c3b82eb06e..f817f1e8c0 100644
--- a/reference/filesystem/functions/file.xml
+++ b/reference/filesystem/functions/file.xml
@@ -76,6 +76,7 @@
           </simpara>
          </listitem>
         </varlistentry>
+        <!-- FIXME PHP_6
         <varlistentry>
          <term>
           <constant>FILE_TEXT</constant>
@@ -99,6 +100,7 @@
           </simpara>
          </listitem>
         </varlistentry>
+        -->
        </variablelist>
       </para>
      </listitem>
@@ -149,6 +151,7 @@
       </row>
      </thead>
      <tbody>
+      <!-- FIXME PHP_6
       <row>
        <entry>6.0.0</entry>
        <entry>
@@ -162,6 +165,7 @@
         </note>
        </entry>
       </row>
+       -->
       <row>
        <entry>5.0.0</entry>
        <entry>
diff --git a/reference/network/functions/define-syslog-variables.xml b/reference/network/functions/define-syslog-variables.xml
index 60de6fb816..35dd4a00f5 100644
--- a/reference/network/functions/define-syslog-variables.xml
+++ b/reference/network/functions/define-syslog-variables.xml
@@ -269,12 +269,14 @@ openlog('', $LOG_ODELAY, $LOG_MAIL | $LOG_USER);
       </row>
      </thead>
      <tbody>
+      <!-- FIXME PHP_6
       <row>
        <entry>6.0.0</entry>
        <entry>
         This function was removed from PHP.
        </entry>
       </row>
+      -->
       <row>
        <entry>5.3.0</entry>
        <entry>
diff --git a/reference/outcontrol/functions/ob-start.xml b/reference/outcontrol/functions/ob-start.xml
index dead08a516..a252e26261 100644
--- a/reference/outcontrol/functions/ob-start.xml
+++ b/reference/outcontrol/functions/ob-start.xml
@@ -150,12 +150,14 @@
       </row>
      </thead>
      <tbody>
+      <!-- FIXME PHP_6
       <row>
        <entry>6.0.0</entry>
        <entry>
         Value 1 is no more special.
        </entry>
       </row>
+      -->
       <row>
        <entry>4.3.2</entry>
        <entry>
diff --git a/reference/stream/functions/stream-resolve-include-path.xml b/reference/stream/functions/stream-resolve-include-path.xml
index 99893add68..545707aeb3 100644
--- a/reference/stream/functions/stream-resolve-include-path.xml
+++ b/reference/stream/functions/stream-resolve-include-path.xml
@@ -76,6 +76,7 @@ unicode(10) "/var/www/html/test.php"
   </para>
  </refsect1>
 
+ <!-- FIXME PHP_6
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -99,7 +100,7 @@ unicode(10) "/var/www/html/test.php"
    </informaltable>
   </para>
  </refsect1>
-
+ -->
  </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/strings/functions/chr.xml b/reference/strings/functions/chr.xml
index 98a4143213..a421805954 100644
--- a/reference/strings/functions/chr.xml
+++ b/reference/strings/functions/chr.xml
@@ -43,7 +43,7 @@
    Returns the specified character.
   </para>
  </refsect1>
-
+<!-- FIXME PHP_6
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -67,7 +67,7 @@
    </informaltable>
   </para>
  </refsect1>
-
+-->
  <refsect1 role="examples">
   &reftitle.examples;
   <para>