From 408baf15371b41dceadf8984a1ab121240594aa5 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Thu, 30 Jun 2011 13:41:29 +0000
Subject: [PATCH] Trunk became PHP 5.4.0

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312690 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/functions/imagecolorset.xml  | 5 +----
 reference/json/functions/json-decode.xml     | 5 +----
 reference/url/functions/http-build-query.xml | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/reference/image/functions/imagecolorset.xml b/reference/image/functions/imagecolorset.xml
index 9cfe0a29e3..32e4097342 100644
--- a/reference/image/functions/imagecolorset.xml
+++ b/reference/image/functions/imagecolorset.xml
@@ -60,9 +60,6 @@
       <para>
        Value of alpha component.
       </para>
-      <para>
-       &version.trunk.after.53;
-      </para>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -87,7 +84,7 @@
     </thead>
     <tbody>
      <row>
-      <entry>&version.trunk.changelog;</entry>
+      <entry>5.4.0</entry>
       <entry>
        The <parameter>alpha</parameter> parameter was added.
       </entry>
diff --git a/reference/json/functions/json-decode.xml b/reference/json/functions/json-decode.xml
index 1e87251d5d..289b5edf8e 100644
--- a/reference/json/functions/json-decode.xml
+++ b/reference/json/functions/json-decode.xml
@@ -60,9 +60,6 @@
        <constant>JSON_BIGINT_AS_STRING</constant>
        is supported (default is to cast large integers as floats)
       </para>
-      <para>
-       &version.trunk.after.53;
-      </para>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -282,7 +279,7 @@ string(20) "12345678901234567890"
      </thead>
      <tbody>
       <row>
-       <entry>&version.trunk.changelog;</entry>
+       <entry>5.4.0</entry>
        <entry>
         The <parameter>options</parameter> parameter was added.
        </entry>
diff --git a/reference/url/functions/http-build-query.xml b/reference/url/functions/http-build-query.xml
index d9c3416c3f..cc45347022 100644
--- a/reference/url/functions/http-build-query.xml
+++ b/reference/url/functions/http-build-query.xml
@@ -69,7 +69,6 @@
     <varlistentry>
      <term><parameter>enc_type</parameter></term>
      <listitem>
-      <para>&version.trunk.after.53;</para>
       <para>
        By default, <constant>PHP_QUERY_RFC1738</constant>.
       </para>
@@ -112,7 +111,7 @@
      </thead>
      <tbody>
       <row>
-       <entry>&version.trunk.changelog;</entry>
+       <entry>5.4.0</entry>
        <entry>
         The <parameter>enc_type</parameter> parameter was added.
        </entry>