From d7f1064f594d36beed29c69f5d1c5fa5c0e114c7 Mon Sep 17 00:00:00 2001
From: Christoph Michael Becker <cmb@php.net>
Date: Thu, 17 Dec 2015 11:03:26 +0000
Subject: [PATCH] fixed #70930: Namespaces FAQ is outdated

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@338281 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/namespaces.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/language/namespaces.xml b/language/namespaces.xml
index fcbf3d13ac..3039247ba0 100644
--- a/language/namespaces.xml
+++ b/language/namespaces.xml
@@ -1156,7 +1156,7 @@ A\B::foo();   // calls method "foo" of class "B" from namespace "A\A"
     </listitem>
     <listitem>
      <simpara>
-      <link linkend="language.namespaces.faq.nofuncconstantuse">Neither functions nor
+      <link linkend="language.namespaces.faq.nofuncconstantuse">Before PHP 5.6 neither functions nor
       constants can be imported via the <literal>use</literal>
       statement.</link>
      </simpara>
@@ -1501,12 +1501,12 @@ namespace my\stuff\nested {
    </para>
   </sect2>
   <sect2 xml:id="language.namespaces.faq.nofuncconstantuse">
-   <title>Neither functions nor constants can be imported via the <literal>use</literal>
+   <title>Before PHP 5.6 neither functions nor constants can be imported via the <literal>use</literal>
       statement.</title>
    <para>
-    The only elements that are affected by <literal>use</literal> statements are namespaces
+    Before PHP 5.6 the only elements that are affected by <literal>use</literal> statements are namespaces
     and class names.  In order to shorten a long constant or function, import its containing
-    namespace
+    namespace.
     <informalexample>
      <programlisting role="php">
      <![CDATA[
@@ -1520,6 +1520,7 @@ name\func();
      ]]>
      </programlisting>
     </informalexample>
+    As of PHP 5.6 aliasing or importing function and constant names is allowed.
    </para>
   </sect2>
   <sect2 xml:id="language.namespaces.faq.quote">