svn: /phpdoc/en/trunk/ install/windows/index.xml language/predefined/variables/argc.xml language/wrappers/http.xml
reference/exif/functions/exif-read-data.xml reference/info/constants.xml
| From: | Nikola Smolenski | Date: | Sat, 02 Apr 2011 04:32:17 +0000 |
| Subject: | svn: /phpdoc/en/trunk/ install/windows/index.xml language/predefined/variables/argc.xml language/wrappers/http.xml reference/exif/functions/exif-read-data.xml reference/info/constants.xml |
||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7911@lists.php.net to get a copy of this message | ||
nikola Sat, 02 Apr 2011 04:32:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309893
Log:
- register_argc_argv is on by default therefore it makes more sense to
say what will happen if it is off.
- Custom headers may be sent with an HTTP request in PHP 5 as well (as a
latter sentence confirms).
- Equalize spelling of Windows Me.
Changed paths:
U phpdoc/en/trunk/install/windows/index.xml
U phpdoc/en/trunk/language/predefined/variables/argc.xml
U phpdoc/en/trunk/language/wrappers/http.xml
U phpdoc/en/trunk/reference/exif/functions/exif-read-data.xml
U phpdoc/en/trunk/reference/info/constants.xml
Modified: phpdoc/en/trunk/install/windows/index.xml
===================================================================
--- phpdoc/en/trunk/install/windows/index.xml 2011-04-02 01:24:53 UTC (rev 309892)
+++ phpdoc/en/trunk/install/windows/index.xml 2011-04-02 04:32:17 UTC (rev 309893)
@@ -10,7 +10,7 @@
</para>
<note>
<para>
- Windows 98/ME/NT4 is no longer supported as of PHP 5.3.0.
+ Windows 98/Me/NT4 is no longer supported as of PHP 5.3.0.
</para>
</note>
<note>
@@ -37,7 +37,7 @@
<para>
There are several all-in-one installers over the Internet, but none of
those are endorsed by PHP.net, as we believe that using one of
- the official windows packages from
+ the official Windows packages from
<link
xlink:href="&url.php.downloads;">&url.php.downloads;</link>
is the best choice to have your system secure and optimized.
</para>
Modified: phpdoc/en/trunk/language/predefined/variables/argc.xml
===================================================================
--- phpdoc/en/trunk/language/predefined/variables/argc.xml 2011-04-02 01:24:53 UTC (rev 309892)
+++ phpdoc/en/trunk/language/predefined/variables/argc.xml 2011-04-02 04:32:17 UTC (rev 309893)
@@ -21,8 +21,8 @@
</note>
<note>
<simpara>
- This variable is only available when <link
linkend="ini.register-argc-argv">register_argc_argv</link>
- is enabled.
+ This variable is not available when <link
linkend="ini.register-argc-argv">register_argc_argv</link>
+ is disabled.
</simpara>
</note>
</refsect1>
Modified: phpdoc/en/trunk/language/wrappers/http.xml
===================================================================
--- phpdoc/en/trunk/language/wrappers/http.xml 2011-04-02 01:24:53 UTC (rev 309892)
+++ phpdoc/en/trunk/language/wrappers/http.xml 2011-04-02 04:32:17 UTC (rev 309893)
@@ -173,8 +173,8 @@
<example xml:id="wrappers.http.example.custom.headers"> <!-- {{{ -->
<title>Sending custom headers with an HTTP request</title>
<para>
- Custom headers may be sent with an HTTP request prior to
- version 5 by taking advantage of a side-effect in the
+ Custom headers may be sent with an HTTP request
+ by taking advantage of a side-effect in the
handling of the <literal>user_agent</literal> INI setting.
Set <literal>user_agent</literal> to any valid string
(such as the default <literal>PHP/version</literal> setting)
Modified: phpdoc/en/trunk/reference/exif/functions/exif-read-data.xml
===================================================================
--- phpdoc/en/trunk/reference/exif/functions/exif-read-data.xml 2011-04-02 01:24:53 UTC (rev 309892)
+++ phpdoc/en/trunk/reference/exif/functions/exif-read-data.xml 2011-04-02 04:32:17 UTC (rev 309893)
@@ -62,7 +62,7 @@
</para>
<note>
<para>
- Windows ME/XP can both wipe the Exif headers when connecting to a camera.
+ Windows Me/XP can both wipe the Exif headers when connecting to a camera.
</para>
</note>
</refsect1>
Modified: phpdoc/en/trunk/reference/info/constants.xml
===================================================================
--- phpdoc/en/trunk/reference/info/constants.xml 2011-04-02 01:24:53 UTC (rev 309892)
+++ phpdoc/en/trunk/reference/info/constants.xml 2011-04-02 04:32:17 UTC (rev 309893)
@@ -229,7 +229,7 @@
<row>
<entry><constant>PHP_WINDOWS_VERSION_MAJOR</constant></entry>
<entry>
- The major version of Windows, this can be either <literal>4</literal>
(NT4/ME/98/95),
+ The major version of Windows, this can be either <literal>4</literal>
(NT4/Me/98/95),
<literal>5</literal> (XP/2003 R2/2003/2000) or <literal>6</literal>
(Vista/2008).
</entry>
</row>