From 65bbbd599b2a1f9bda0eb96373c04bfea9d97621 Mon Sep 17 00:00:00 2001
From: Daniel Egeberg <degeberg@php.net>
Date: Tue, 23 Mar 2010 18:38:54 +0000
Subject: [PATCH] Removed obsolete warnings about things that were removed in
 the old PHP 6.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@296686 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language-snippets.ent | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 13a62a3662..730336b920 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -73,8 +73,7 @@ to seed the random number generator with <function>srand</function> or
 <!ENTITY note.registerglobals '<note xmlns="http://docbook.org/ns/docbook"><title>register_globals: important
 note</title><para>As of PHP 4.2.0, the default value for the PHP directive
 <link linkend="ini.register-globals">register_globals</link> is <emphasis>
-off</emphasis>, and it was completely removed as of PHP 6.0.0. The PHP community
-discourages developers from relying on this directive, and encourages the use
+off</emphasis>. The PHP community discourages developers from relying on this directive, and encourages the use
 of other means, such as the &link.superglobals;.</para></note>'>
 
 <!ENTITY note.is-superglobal "<note xmlns='http://docbook.org/ns/docbook'><para>This is a 'superglobal', or
@@ -147,13 +146,13 @@ is highly discouraged.</simpara></warning>'>
 
 <!ENTITY warn.deprecated.feature-5-3-0.removed-6-0-0 '<warning
 xmlns="http://docbook.org/ns/docbook"><simpara>This feature has been
-<emphasis>DEPRECATED</emphasis> as of PHP 5.3.0 and <emphasis>REMOVED</emphasis> as of PHP 6.0.0.
-Relying on this feature is highly discouraged.</simpara></warning>'>
+<emphasis>DEPRECATED</emphasis> as of PHP 5.3.0. Relying on this feature is
+highly discouraged.</simpara></warning>'>
 
 <!ENTITY warn.deprecated.function-5-3-0.removed-6-0-0 '<warning
 xmlns="http://docbook.org/ns/docbook"><simpara>This function has been
-<emphasis>DEPRECATED</emphasis> as of PHP 5.3.0 and <emphasis>REMOVED</emphasis>
-as of PHP 6.0.0. Relying on this feature is highly discouraged.</simpara></warning>'>
+<emphasis>DEPRECATED</emphasis> as of PHP 5.3.0. Relying on this feature is
+highly discouraged.</simpara></warning>'>
 
 <!ENTITY warn.deprecated.function.removed-5-3-0 '<warning
 xmlns="http://docbook.org/ns/docbook"><simpara>This function has been