From 9dfd4d483bad2692b5087d319832862096fc2f77 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Thu, 1 Feb 2007 00:46:02 +0000 Subject: [PATCH] Removed use of PL, RC, and BETA from PHP versions as they go against our conventions. # Thanks to etienne and nuno for being regex masters ;-) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@228614 c90b9560-bf6c-de11-be94-00142212c4b1 --- appendices/ini.xml | 4 ++-- language/control-structures.xml | 6 +++--- reference/classobj/functions/get-declared-classes.xml | 4 ++-- reference/info/functions/get-included-files.xml | 4 ++-- reference/openssl/reference.xml | 4 ++-- reference/pcre/functions/preg-replace.xml | 4 ++-- reference/sdodasrel/reference.xml | 10 +++++----- reference/strings/functions/strip-tags.xml | 4 ++-- reference/strings/functions/strrpos.xml | 6 +++--- reference/zlib/functions/gzgetss.xml | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/appendices/ini.xml b/appendices/ini.xml index 531e39ce68..6d3691b5f1 100644 --- a/appendices/ini.xml +++ b/appendices/ini.xml @@ -1,5 +1,5 @@ - + &php.ini; directives @@ -3353,7 +3353,7 @@ - As of 4.0b4, PHP always outputs a character encoding by default in + As of 4.0.0, PHP always outputs a character encoding by default in the Content-type: header. To disable sending of the charset, simply set it to be empty. diff --git a/language/control-structures.xml b/language/control-structures.xml index 03fd81dfc3..200363e6b0 100644 --- a/language/control-structures.xml +++ b/language/control-structures.xml @@ -1,5 +1,5 @@ - + Control Structures @@ -1626,7 +1626,7 @@ function get_include_contents($filename) { - require_once was added in PHP 4.0.1pl2 + require_once was added in PHP 4.0.1 @@ -1693,7 +1693,7 @@ require_once("A.php"); // this will include a.php again on Windows! (PHP 4 only) - include_once was added in PHP 4.0.1pl2 + include_once was added in PHP 4.0.1 diff --git a/reference/classobj/functions/get-declared-classes.xml b/reference/classobj/functions/get-declared-classes.xml index 2b37fd6c10..c8a9ba4821 100644 --- a/reference/classobj/functions/get-declared-classes.xml +++ b/reference/classobj/functions/get-declared-classes.xml @@ -1,5 +1,5 @@ - + get_declared_classes @@ -23,7 +23,7 @@ - In PHP 4.0.1pl2, three extra classes are returned at the beginning of + In PHP 4.0.1, three extra classes are returned at the beginning of the array: stdClass (defined in Zend/zend.c), OverloadedTestClass (defined in diff --git a/reference/info/functions/get-included-files.xml b/reference/info/functions/get-included-files.xml index 8eb9e5e320..85794a8f16 100644 --- a/reference/info/functions/get-included-files.xml +++ b/reference/info/functions/get-included-files.xml @@ -1,5 +1,5 @@ - + @@ -72,7 +72,7 @@ test4.php - In PHP 4.0.1pl2 and previous versions + In PHP 4.0.1 and previous versions get_included_files assumed that the required files ended in the extension .php; other extensions would not be returned. The array returned by diff --git a/reference/openssl/reference.xml b/reference/openssl/reference.xml index e95b25e9ab..7ed2341341 100644 --- a/reference/openssl/reference.xml +++ b/reference/openssl/reference.xml @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ In order to use the OpenSSL functions you need to install the OpenSSL package. PHP between versions 4.0.5 and 4.3.1 will work with OpenSSL >= 0.9.5. - Other versions (PHP <=4.0.4pl1 and >= 4.3.2) require OpenSSL >= + Other versions (PHP <=4.0.4 and >= 4.3.2) require OpenSSL >= 0.9.6. diff --git a/reference/pcre/functions/preg-replace.xml b/reference/pcre/functions/preg-replace.xml index 570d1393a6..a20a1a98c4 100644 --- a/reference/pcre/functions/preg-replace.xml +++ b/reference/pcre/functions/preg-replace.xml @@ -1,5 +1,5 @@ - + @@ -147,7 +147,7 @@ - 4.0.1pl2 + 4.0.1 Added the limit parameter diff --git a/reference/sdodasrel/reference.xml b/reference/sdodasrel/reference.xml index 13f900ed5e..8396e60afb 100644 --- a/reference/sdodasrel/reference.xml +++ b/reference/sdodasrel/reference.xml @@ -1,5 +1,5 @@ - + @@ -170,7 +170,7 @@ require_once 'SDO/DAS/Relational.php'; required levels of PHP should be found in the changelog for the package on PECL. At the time of writing, though, the Relational DAS requires the most recent beta level of PHP 5.1, that is - PHP 5.1.0b3. + PHP 5.1.0. The Relational DAS uses PDO to access the relational database, @@ -181,13 +181,13 @@ require_once 'SDO/DAS/Relational.php'; MySQL 4.1.14, on Windows. The Relational DAS operates correctly with the php_pdo_mysql - driver that comes with the pre-built binaries for PHP 5.1.0b3. + driver that comes with the pre-built binaries for PHP 5.1.0. MySQL 4.1.13, on Linux. It is necessary to have the most up-to-date - PDO driver for MySQL, which comes built in to PHP 5.1.0b3. + PDO driver for MySQL, which comes built in to PHP 5.1.0. It may be necessary to uninstall the usual driver that would have come from PECL using pear uninstall pdo_mysql @@ -200,7 +200,7 @@ require_once 'SDO/DAS/Relational.php'; DB2 8.2 Personal Edition, on Windows. The Relational DAS operates correctly with the php_pdo_odbc driver that comes with the pre-built binaries for - PHP 5.1.0b3. + PHP 5.1.0. diff --git a/reference/strings/functions/strip-tags.xml b/reference/strings/functions/strip-tags.xml index 7d607332d9..f6d998f222 100644 --- a/reference/strings/functions/strip-tags.xml +++ b/reference/strings/functions/strip-tags.xml @@ -1,5 +1,5 @@ - + @@ -25,7 +25,7 @@ allowable_tags was added in PHP 3.0.13 - and PHP 4.0b3. + and PHP 4.0.0. Since PHP 4.3.0, HTML comments are also stripped. This is hardcoded and can diff --git a/reference/strings/functions/strrpos.xml b/reference/strings/functions/strrpos.xml index 24cf975fe1..d6eaeeacc3 100644 --- a/reference/strings/functions/strrpos.xml +++ b/reference/strings/functions/strrpos.xml @@ -1,5 +1,5 @@ - + @@ -36,13 +36,13 @@ - + gzgetss @@ -73,7 +73,7 @@ - 3.0.13 and 4.0b3 + 3.0.13 and 4.0.0 allowable_tags was added.