Miscellaneous updates. This commit spans en/language/predefined/* and

includes updates for typos, grammar, markup, and new see also links.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@257630 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Philip Olson 2008-04-15 23:19:15 +00:00
parent 70b4a8b596
commit b2bf9eca02
13 changed files with 96 additions and 48 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<reference xml:id="class.exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Exception</title>
@ -38,7 +38,7 @@
<varname linkend="exception.props.message">message</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>pivate</modifier>
<modifier>private</modifier>
<type>string</type>
<varname linkend="exception.props.string">string</varname>
</fieldsynopsis>
@ -58,7 +58,7 @@
<varname linkend="exception.props.line">line</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>pivate</modifier>
<modifier>private</modifier>
<type>array</type>
<varname linkend="exception.props.trace">trace</varname>
</fieldsynopsis>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<reference xml:id="reserved.variables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Predefined variables</title>
@ -10,7 +10,7 @@
PHP provides a large number of predefined variables to any script. The
variables represent everything from
<link linkend="language.variables.external">external variables</link> to
built-in enviroment variables, last error messages to last retrieved
built-in environment variables, last error messages to last retrieved
headers.
</para>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.argc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -11,16 +11,16 @@
&reftitle.description;
<para>
Contains the number of arguments passed to the current script when running
from the command line.
from the <link linkend="features.commandline">command line</link>.
</para>
<note>
<simpara>
The script's filename is always passed as an argument to the script
The script's filename is always passed as an argument to the script.
</simpara>
</note>
<note>
<simpara>
This variable is only available when <literal>register_argc_argv</literal>
This variable is only available when <link linkend="ini.register-argc-argv">register_argc_argv</link>
is enabled in <filename>php.ini</filename>.
</simpara>
</note>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.argv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -10,8 +10,8 @@
<refsect1 role="description">
&reftitle.description;
<para>
Contains an array of all the arguments passed to the script when running
from the command line.
Contains an <type>array</type> of all the arguments passed to the script when running
from the <link linkend="features.commandline">command line</link>.
</para>
<note>
<simpara>
@ -20,7 +20,7 @@
</note>
<note>
<simpara>
This variable is only available when <literal>register_argc_argv</literal>
This variable is only available when <link linkend="ini.register-argc-argv">register_argc_argv</link>
is enabled in <filename>php.ini</filename>.
</simpara>
</note>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.cookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<para>
An associative array of variables passed to the current script
An associative <type>array</type> of variables passed to the current script
via HTTP Cookies.
</para>
@ -52,8 +52,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_COOKIE</varname>.
In previous the <varname>$HTTP_COOKIE_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_COOKIE_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -91,7 +91,17 @@ Hello Hannes!
&reftitle.notes;
&note.is-superglobal;
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member>setcookie</member>
<member><link linkend="language.variables.external">Handling external variables</link></member>
</simplelist>
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.environment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<para>
An associative array of variables passed to the current script
An associative <type>array</type> of variables passed to the current script
via the environment method.
</para>
@ -67,8 +67,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_ENV</varname>.
In previous the <varname>$HTTP_ENV_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_ENV_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -106,7 +106,16 @@ My username is bjori!
&reftitle.notes;
&note.is-superglobal;
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member><function>getenv</function></member>
</simplelist>
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.files" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<para>
An associative array of items uploaded to the current script
An associative <type>array</type> of items uploaded to the current script
via the HTTP POST method.
</para>
@ -52,8 +52,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_FILES</varname>.
In previous the <varname>$HTTP_POST_FILES</varname>
contained these information.
Note that the deprecated <varname>$HTTP_POST_FILES</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -66,7 +66,17 @@
&reftitle.notes;
&note.is-superglobal;
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member><function>move_uploaded_file</function></member>
<member><link linkend="features.file-upload">Handling File Uploads</link></member>
</simplelist>
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -52,8 +52,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_GET</varname>.
In previous the <varname>$HTTP_GET_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_GET_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -91,7 +91,16 @@ Hello Hannes!
&reftitle.notes;
&note.is-superglobal;
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member><link linkend="language.variables.external">Handling external variables</link></member>
</simplelist>
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.httpresponseheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -10,9 +10,9 @@
<refsect1 role="description">
&reftitle.description;
<para>
The <varname>$http_response_header</varname> array is similiar to the
The <varname>$http_response_header</varname> <type>array</type> is similar to the
<function>get_headers</function> function. When using the
<link linkend="wrappers.http">HTTP wrapper</link>
<link linkend="wrappers.http">HTTP wrapper</link>,
<varname>$http_response_header</varname> will be populated with the HTTP
response headers.
</para>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.post" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -52,8 +52,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_POST</varname>.
In previous the <varname>$HTTP_POST_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_POST_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -91,7 +91,16 @@ Hello Hannes!
&reftitle.notes;
&note.is-superglobal;
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member><link linkend="language.variables.external">Handling external variables</link></member>
</simplelist>
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.request" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -85,6 +85,7 @@
&reftitle.seealso;
<simplelist>
<member><function>import_request_variables</function></member>
<member><link linkend="language.variables.external">Handling external variables</link></member>
</simplelist>
</refsect1>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.server" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -498,8 +498,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_SERVER</varname>.
In previous versions the <varname>$HTTP_SERVER_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_SERVER_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>
@ -516,14 +516,14 @@
<programlisting role="php">
<![CDATA[
<?php
var_dump($_SERVER["SERVER_NAME"]);
echo $_SERVER['SERVER_NAME'];
?>
]]>
</programlisting>
&example.outputs.similar;
<screen>
<![CDATA[
www.php.net
www.example.com
]]>
</screen>
</example>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 1.1 $ -->
<!-- $Revision: 1.2 $ -->
<refentry xml:id="reserved.variables.session" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@ -54,8 +54,8 @@
<entry>4.1.0</entry>
<entry>
Introduced <varname>$_SESSION</varname>.
In previous the <varname>$HTTP_SESSION_VARS</varname>
contained these information.
Note that the deprecated <varname>$HTTP_SESSION_VARS</varname>
did exist previously.
</entry>
</row>
</tbody>