cvs: phpdoc /en language-snippets.ent /en/appendices transports.xml wrappers.xml /en/chapters config.xml tutorial.xml /en/faq html.xml
/en/language control-structures.xml variables.xml /en/reference/curl configure.xml /en/reference/dir/functions opendir.xml /en/reference/errorfunc
ini.xml /en/reference/filesystem/functions copy.xml mkdir.xml rename.xml rmdir.xml unlink.xml /en/reference/image/functions exif-read-data.xml
imagettfbbox.xml /en/reference/misc/functions highlight-file.xml /en/reference/mnogosearch/functions udm-add-search-limit.xml udm-api-version.xml
/en/reference/session ini.xml /en/reference/stream/functions stream-socket-client.xml stream-socket-server.xml stream-wrapper-register.xml
/en/reference/strings/functions parse-str.xml /en/reference/url/functions http-build-query.xml urlencode.xml /en/security cgi-bin.xml
| From: | Dave | Date: | Thu, 29 Jan 2004 00:35:33 +0000 |
| Subject: | cvs: phpdoc /en language-snippets.ent /en/appendices transports.xml wrappers.xml /en/chapters config.xml tutorial.xml /en/faq html.xml /en/language control-structures.xml variables.xml /en/reference/curl configure.xml /en/reference/dir/functions opendir.xml /en/reference/errorfunc ini.xml /en/reference/filesystem/functions copy.xml mkdir.xml rename.xml rmdir.xml unlink.xml /en/reference/image/functions exif-read-data.xml imagettfbbox.xml /en/reference/misc/functions highlight-file.xml /en/reference/mnogosearch/functions udm-add-search-limit.xml udm-api-version.xml /en/reference/session ini.xml /en/reference/stream/functions stream-socket-client.xml stream-socket-server.xml stream-wrapper-register.xml /en/reference/strings/functions parse-str.xml /en/reference/url/functions http-build-query.xml urlencode.xml /en/security cgi-bin.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969358531@lists.php.net to get a copy of this message | ||
dave Wed Jan 28 19:35:33 2004 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/appendices transports.xml wrappers.xml
/phpdoc/en/chapters config.xml tutorial.xml
/phpdoc/en/faq html.xml
/phpdoc/en/language control-structures.xml variables.xml
/phpdoc/en/reference/curl configure.xml
/phpdoc/en/reference/dir/functions opendir.xml
/phpdoc/en/reference/errorfunc ini.xml
/phpdoc/en/reference/filesystem/functions copy.xml mkdir.xml
rename.xml rmdir.xml
unlink.xml
/phpdoc/en/reference/image/functions exif-read-data.xml
imagettfbbox.xml
/phpdoc/en/reference/misc/functions highlight-file.xml
/phpdoc/en/reference/mnogosearch/functions udm-add-search-limit.xml
udm-api-version.xml
/phpdoc/en/reference/session ini.xml
/phpdoc/en/reference/stream/functions stream-socket-client.xml
stream-socket-server.xml
stream-wrapper-register.xml
/phpdoc/en/reference/strings/functions parse-str.xml
/phpdoc/en/reference/url/functions http-build-query.xml
urlencode.xml
/phpdoc/en/security cgi-bin.xml
Log:
- s/url/URL/ where appropriate and "an URL" -> "a URL".
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.66&r2=1.67&ty=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.66 phpdoc/en/language-snippets.ent:1.67 --- phpdoc/en/language-snippets.ent:1.66 Mon Jan 26 15:23:25 2004 +++ phpdoc/en/language-snippets.ent Wed Jan 28 19:35:21 2004 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.66 $ --> +<!-- $Revision: 1.67 $ --> <!ENTITY warn.experimental '<warning><simpara>This extension is <emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension -- @@ -41,7 +41,7 @@ <!ENTITY tip.fopen-wrapper.stat '<tip><simpara>As of <literal>PHP 5.0.0</literal> this function can also be used with -<emphasis>some</emphasis> url wrappers. Refer to +<emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>stat</function> family of functionality.</simpara></tip>'> http://cvs.php.net/diff.php/phpdoc/en/appendices/transports.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/appendices/transports.xml diff -u phpdoc/en/appendices/transports.xml:1.6 phpdoc/en/appendices/transports.xml:1.7 --- phpdoc/en/appendices/transports.xml:1.6 Sat Dec 20 23:21:39 2003 +++ phpdoc/en/appendices/transports.xml Wed Jan 28 19:35:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix id="transports"> <title>List of Supported Socket Transports</title> <para> @@ -42,7 +42,7 @@ Internet Domain sockets expect a port number in addition to a target address. In the case of <function>fsockopen</function> this is specified in a second parameter and therefore does - not impact the formatting of transport url. With + not impact the formatting of transport URL. With <function>stream_socket_client</function> and related functions as with traditional URLs however, the port number is specified as a suffix of the transport URL delimited by a colon. http://cvs.php.net/diff.php/phpdoc/en/appendices/wrappers.xml?r1=1.33&r2=1.34&ty=u Index: phpdoc/en/appendices/wrappers.xml diff -u phpdoc/en/appendices/wrappers.xml:1.33 phpdoc/en/appendices/wrappers.xml:1.34 --- phpdoc/en/appendices/wrappers.xml:1.33 Tue Dec 30 06:31:52 2003 +++ phpdoc/en/appendices/wrappers.xml Wed Jan 28 19:35:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.33 $ --> +<!-- $Revision: 1.34 $ --> <appendix id="wrappers"> <title>List of Supported Protocols/Wrappers</title> <para> @@ -116,7 +116,7 @@ <simpara> Redirects have been supported since PHP 4.0.5; if you are using an earlier version you will need to include trailing slashes in - your URLs. If it's important to know the url of the resource where + your URLs. If it's important to know the URL of the resource where your document came from (after all redirects have been processed), you'll need to process the series of response headers returned by the stream. @@ -319,7 +319,7 @@ <title>Appending</title> <simpara> As of <literal>PHP 5.0.0</literal> files may be appended via the - <literal>ftp://</literal> url wrapper. In prior versions, attempting + <literal>ftp://</literal> URL wrapper. In prior versions, attempting to append to a file via <literal>ftp://</literal> will result in failure. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/chapters/config.xml?r1=1.114&r2=1.115&ty=u Index: phpdoc/en/chapters/config.xml diff -u phpdoc/en/chapters/config.xml:1.114 phpdoc/en/chapters/config.xml:1.115 --- phpdoc/en/chapters/config.xml:1.114 Sat Dec 20 23:21:40 2003 +++ phpdoc/en/chapters/config.xml Wed Jan 28 19:35:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.114 $ --> +<!-- $Revision: 1.115 $ --> <chapter id="configuration"> <title>Runtime Configuration</title> @@ -710,7 +710,7 @@ <para> Tells whether or not to register the EGPCS (Environment, GET, POST, Cookie, Server) variables as global variables. For example; - if register_globals = on, the url + if register_globals = on, the URL <literal>http://www.example.com/test.php?id=3</literal> will produce <varname>$id</varname>. Or, <varname>$DOCUMENT_ROOT</varname> from <varname>$_SERVER['DOCUMENT_ROOT']</varname>. You may want to turn http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.28&r2=1.29&ty=u Index: phpdoc/en/chapters/tutorial.xml diff -u phpdoc/en/chapters/tutorial.xml:1.28 phpdoc/en/chapters/tutorial.xml:1.29 --- phpdoc/en/chapters/tutorial.xml:1.28 Mon Jan 19 10:53:43 2004 +++ phpdoc/en/chapters/tutorial.xml Wed Jan 28 19:35:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.28 $ --> +<!-- $Revision: 1.29 $ --> <chapter id="tutorial"> <title>A simple tutorial</title> @@ -78,7 +78,7 @@ <simpara> Use your browser to access the file with your web server's URL, ending with the "/hello.php" file reference. When developing locally this - url will be something like <literal>http://localhost/hello.php</literal> + URL will be something like <literal>http://localhost/hello.php</literal> or <literal>http://127.0.0.1/hello.php</literal> but this depends on the web server's configuration. Although this is outside the scope of this tutorial, see also the <varname>DocumentRoot</varname> and http://cvs.php.net/diff.php/phpdoc/en/faq/html.xml?r1=1.25&r2=1.26&ty=u Index: phpdoc/en/faq/html.xml diff -u phpdoc/en/faq/html.xml:1.25 phpdoc/en/faq/html.xml:1.26 --- phpdoc/en/faq/html.xml:1.25 Tue Jan 6 09:35:35 2004 +++ phpdoc/en/faq/html.xml Wed Jan 28 19:35:23 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <chapter id="faq.html"> <title>PHP and HTML</title> <titleabbrev>PHP and HTML</titleabbrev> @@ -89,7 +89,7 @@ </simpara> </note> <example> - <title>In an URL</title> + <title>In a URL</title> <programlisting role="php"> <![CDATA[ <?php http://cvs.php.net/diff.php/phpdoc/en/language/control-structures.xml?r1=1.85&r2=1.86&ty=u Index: phpdoc/en/language/control-structures.xml diff -u phpdoc/en/language/control-structures.xml:1.85 phpdoc/en/language/control-structures.xml:1.86 --- phpdoc/en/language/control-structures.xml:1.85 Sat Jan 17 15:22:45 2004 +++ phpdoc/en/language/control-structures.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.85 $ --> +<!-- $Revision: 1.86 $ --> <chapter id="control-structures"> <title>Control Structures</title> @@ -1318,11 +1318,11 @@ <simpara> If "<link linkend="ini.allow-url-fopen">URL fopen wrappers</link>" are enabled in PHP (which they are in the default configuration), - you can specify the file to be included using an URL (via HTTP or + you can specify the file to be included using a URL (via HTTP or other supported wrapper - see <xref linkend="wrappers"/> for a list of protocols) instead of a local pathname. If the target server interprets the target file as PHP code, variables may be passed to the included - file using an URL request string as used with HTTP GET. This is + file using a URL request string as used with HTTP GET. This is not strictly speaking the same thing as including the file and having it inherit the parent file's variable scope; the script is actually being run on the remote server and the result is then being http://cvs.php.net/diff.php/phpdoc/en/language/variables.xml?r1=1.74&r2=1.75&ty=u Index: phpdoc/en/language/variables.xml diff -u phpdoc/en/language/variables.xml:1.74 phpdoc/en/language/variables.xml:1.75 --- phpdoc/en/language/variables.xml:1.74 Tue Jan 6 04:20:49 2004 +++ phpdoc/en/language/variables.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.74 $ --> +<!-- $Revision: 1.75 $ --> <chapter id="language.variables"> <title>Variables</title> @@ -854,7 +854,7 @@ <para> Using a GET form is similar except you'll use the appropriate GET predefined variable instead. GET also applies to the - QUERY_STRING (the information after the '?' in an URL). So, + QUERY_STRING (the information after the '?' in a URL). So, for example, <literal>http://www.example.com/test.php?id=3</literal> contains GET data which is accessible with <varname>$_GET['id']</varname>. See also <link linkend="reserved.variables.request">$_REQUEST</link> and http://cvs.php.net/diff.php/phpdoc/en/reference/curl/configure.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/curl/configure.xml diff -u phpdoc/en/reference/curl/configure.xml:1.5 phpdoc/en/reference/curl/configure.xml:1.6 --- phpdoc/en/reference/curl/configure.xml:1.5 Wed Dec 31 10:25:16 2003 +++ phpdoc/en/reference/curl/configure.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <section id="curl.installation"> &reftitle.install; <para> @@ -10,7 +10,7 @@ named "curl" which should contain the <filename>easy.h</filename> and <filename>curl.h</filename> files. There should be a file named <filename>libcurl.a</filename> located in the "lib" directory. Beginning - with PHP 4.3.0 you can configure PHP to use CURL for url streams + with PHP 4.3.0 you can configure PHP to use CURL for URL streams <option role="configure">--with-curlwrappers</option>. </para> <note> http://cvs.php.net/diff.php/phpdoc/en/reference/dir/functions/opendir.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/dir/functions/opendir.xml diff -u phpdoc/en/reference/dir/functions/opendir.xml:1.7 phpdoc/en/reference/dir/functions/opendir.xml:1.8 --- phpdoc/en/reference/dir/functions/opendir.xml:1.7 Mon Dec 15 11:48:51 2003 +++ phpdoc/en/reference/dir/functions/opendir.xml Wed Jan 28 19:35:25 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/dir.xml, last change in rev 1.2 --> <refentry id="function.opendir"> <refnamediv> @@ -52,9 +52,9 @@ <para> As of <literal>PHP 4.3.0</literal> <parameter>path</parameter> can also be any URL which supports directory listing, however only the <literal>file://</literal> - url wrapper supports this in <literal>PHP 4.3</literal>. As of + URL wrapper supports this in <literal>PHP 4.3</literal>. As of <literal>PHP 5.0.0</literal>, support for the <literal>ftp://</literal> - url wrapper is included as well. + URL wrapper is included as well. </para> <para> See also <function>is_dir</function>, http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/ini.xml?r1=1.19&r2=1.20&ty=u Index: phpdoc/en/reference/errorfunc/ini.xml diff -u phpdoc/en/reference/errorfunc/ini.xml:1.19 phpdoc/en/reference/errorfunc/ini.xml:1.20 --- phpdoc/en/reference/errorfunc/ini.xml:1.19 Sat Dec 20 23:21:45 2003 +++ phpdoc/en/reference/errorfunc/ini.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <section id="errorfunc.configuration"> &reftitle.runtime; &extension.runtime; @@ -309,7 +309,7 @@ <para> The new error format contains a reference to a page describing the error or function causing the error. In case of manual pages you can download the - manual in your language and set this ini directive to the url of your local + manual in your language and set this ini directive to the URL of your local copy. If your local copy of the manual can be reached by '/manual/' you can simply use <userinput>docref_root=/manual/</userinput>. Additional you have to set docref_ext to match the fileextensions of your copy http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/copy.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/copy.xml diff -u phpdoc/en/reference/filesystem/functions/copy.xml:1.7 phpdoc/en/reference/filesystem/functions/copy.xml:1.8 --- phpdoc/en/reference/filesystem/functions/copy.xml:1.7 Mon Dec 15 11:49:45 2003 +++ phpdoc/en/reference/filesystem/functions/copy.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.copy"> <refnamediv> @@ -34,7 +34,7 @@ As of PHP 4.3.0, both <parameter>source</parameter> and <parameter>dest</parameter> may be URLs if the "fopen wrappers" have been enabled. See <function>fopen</function> for more details. - If <parameter>dest</parameter> is an URL, the copy operation may + If <parameter>dest</parameter> is a URL, the copy operation may fail if the wrapper does not support overwriting of existing files. </para> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/mkdir.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/filesystem/functions/mkdir.xml diff -u phpdoc/en/reference/filesystem/functions/mkdir.xml:1.12 phpdoc/en/reference/filesystem/functions/mkdir.xml:1.13 --- phpdoc/en/reference/filesystem/functions/mkdir.xml:1.12 Tue Dec 16 12:22:43 2003 +++ phpdoc/en/reference/filesystem/functions/mkdir.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 --> <refentry id="function.mkdir"> <refnamediv> @@ -50,7 +50,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>mkdir</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>mkdir</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rename.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/rename.xml diff -u phpdoc/en/reference/filesystem/functions/rename.xml:1.7 phpdoc/en/reference/filesystem/functions/rename.xml:1.8 --- phpdoc/en/reference/filesystem/functions/rename.xml:1.7 Fri Dec 12 18:20:18 2003 +++ phpdoc/en/reference/filesystem/functions/rename.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rename"> <refnamediv> @@ -42,7 +42,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>rename</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rename</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rmdir.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/filesystem/functions/rmdir.xml diff -u phpdoc/en/reference/filesystem/functions/rmdir.xml:1.6 phpdoc/en/reference/filesystem/functions/rmdir.xml:1.7 --- phpdoc/en/reference/filesystem/functions/rmdir.xml:1.6 Tue Dec 16 12:22:43 2003 +++ phpdoc/en/reference/filesystem/functions/rmdir.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rmdir"> <refnamediv> @@ -21,7 +21,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>rmdir</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rmdir</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/unlink.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/filesystem/functions/unlink.xml diff -u phpdoc/en/reference/filesystem/functions/unlink.xml:1.6 phpdoc/en/reference/filesystem/functions/unlink.xml:1.7 --- phpdoc/en/reference/filesystem/functions/unlink.xml:1.6 Fri Dec 5 14:58:06 2003 +++ phpdoc/en/reference/filesystem/functions/unlink.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.unlink"> <refnamediv> @@ -20,7 +20,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>unlink</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>unlink</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/exif-read-data.xml?r1=1.18&r2=1.19&ty=u Index: phpdoc/en/reference/image/functions/exif-read-data.xml diff -u phpdoc/en/reference/image/functions/exif-read-data.xml:1.18 phpdoc/en/reference/image/functions/exif-read-data.xml:1.19 --- phpdoc/en/reference/image/functions/exif-read-data.xml:1.18 Thu Dec 18 12:44:49 2003 +++ phpdoc/en/reference/image/functions/exif-read-data.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <!-- splitted from ./en/functions/image.xml, last change in rev 1.78 --> <refentry id="function.exif-read-data"> <refnamediv> @@ -26,7 +26,7 @@ </para> <para> <parameter>filename</parameter> is the name of the file to read. This - cannot be an url. + cannot be a URL. </para> <para> <parameter>sections</parameter> is a comma separated list of sections that http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/imagettfbbox.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/image/functions/imagettfbbox.xml diff -u phpdoc/en/reference/image/functions/imagettfbbox.xml:1.3 phpdoc/en/reference/image/functions/imagettfbbox.xml:1.4 --- phpdoc/en/reference/image/functions/imagettfbbox.xml:1.3 Wed Dec 17 09:32:29 2003 +++ phpdoc/en/reference/image/functions/imagettfbbox.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 --> <refentry id="function.imagettfbbox"> <refnamediv> @@ -41,7 +41,7 @@ </term> <listitem> <simpara> - The name of the TrueType font file. (Can also be an URL.) Depending on + The name of the TrueType font file. (Can also be a URL.) Depending on which version of the GD library that PHP is using, it may attempt to search for files that do not begin with a leading '/' by appending '.ttf' to the filename and searching along a library-defined font path. http://cvs.php.net/diff.php/phpdoc/en/reference/misc/functions/highlight-file.xml?r1=1.13&r2=1.14&ty=u Index: phpdoc/en/reference/misc/functions/highlight-file.xml diff -u phpdoc/en/reference/misc/functions/highlight-file.xml:1.13 phpdoc/en/reference/misc/functions/highlight-file.xml:1.14 --- phpdoc/en/reference/misc/functions/highlight-file.xml:1.13 Thu Dec 18 12:45:41 2003 +++ phpdoc/en/reference/misc/functions/highlight-file.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 --> <refentry id="function.highlight-file"> <refnamediv> @@ -99,7 +99,7 @@ ]]> </programlisting> <simpara> - Then you can use an URL like the one below to display a colorized + Then you can use a URL like the one below to display a colorized version of a script located in "/path/to/script.php" in your web site. </simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml diff -u phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.5 phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.6 --- phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.5 Mon Dec 15 11:52:04 2003 +++ phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml Wed Jan 28 19:35:28 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/mnogosearch.xml, last change in rev 1.18 --> <refentry id="function.udm-add-search-limit"> <refnamediv> @@ -70,7 +70,7 @@ So it's id would be 0102. If VW had a sub category called 'Engine' then it's id would start at 01 again and it would get the 'VW' id 02 and 'Auto' id of 01, making it 010201. If you want to search for sites under that category - then you pass it cat=010201 in the url. + then you pass it cat=010201 in the URL. </simpara> </listitem> <listitem> http://cvs.php.net/diff.php/phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml diff -u phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.6 phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.7 --- phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.6 Tue Jan 6 04:21:00 2004 +++ phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml Wed Jan 28 19:35:28 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/mnogosearch.xml, last change in rev 1.18 --> <refentry id="function.udm-api-version"> <refnamediv> @@ -30,7 +30,7 @@ <![CDATA[ <?php if (udm_api_version() >= 30111) { - echo "Total number of urls in database: " . udm_get_doc_count($udm) . "<br />\n"; + echo "Total number of URLs in database: " . udm_get_doc_count($udm) . "<br />\n"; } ?> ]]> http://cvs.php.net/diff.php/phpdoc/en/reference/session/ini.xml?r1=1.18&r2=1.19&ty=u Index: phpdoc/en/reference/session/ini.xml diff -u phpdoc/en/reference/session/ini.xml:1.18 phpdoc/en/reference/session/ini.xml:1.19 --- phpdoc/en/reference/session/ini.xml:1.18 Fri Jan 16 11:08:35 2004 +++ phpdoc/en/reference/session/ini.xml Wed Jan 28 19:35:29 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <section id="session.configuration"> &reftitle.runtime; &extension.runtime; @@ -516,8 +516,8 @@ <simpara> URL based session management has additional security risks compared to cookie based session management. Users may send - an URL that contains an active session ID to their friends by - email or users may save an URL that contains a session ID to + a URL that contains an active session ID to their friends by + email or users may save a URL that contains a session ID to their bookmarks and access your site with the same session ID always, for example. </simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-client.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/stream/functions/stream-socket-client.xml diff -u phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.7 phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.8 --- phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.7 Sat Dec 20 23:22:00 2003 +++ phpdoc/en/reference/stream/functions/stream-socket-client.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <refentry id="function.stream-socket-client"> <refnamediv> <refname>stream_socket_client</refname> @@ -21,7 +21,7 @@ <para> Initiates a stream or datagram connection to the destination specified by <parameter>remote_socket</parameter>. The type of socket created - is determined by the transport specified using standard url formatting: + is determined by the transport specified using standard URL formatting: <literal>transport://target</literal>. For Internet Domain sockets (AF_INET) such as TCP and UDP, the <literal>target</literal> portion of the <parameter>remote_socket</parameter> parameter should consist of http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-server.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/stream/functions/stream-socket-server.xml diff -u phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.10 phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.11 --- phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.10 Tue Jan 27 23:33:27 2004 +++ phpdoc/en/reference/stream/functions/stream-socket-server.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <refentry id="function.stream-socket-server"> <refnamediv> <refname>stream_socket_server</refname> @@ -20,7 +20,7 @@ <para> Creates a stream or datagram socket on the specified <parameter>local_socket</parameter>. The type of socket created - is determined by the transport specified using standard url formatting: + is determined by the transport specified using standard URL formatting: <literal>transport://target</literal>. For Internet Domain sockets (AF_INET) such as TCP and UDP, the <literal>target</literal> portion of the <parameter>remote_socket</parameter> parameter should consist of http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-wrapper-register.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/stream/functions/stream-wrapper-register.xml diff -u phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.10 phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.11 --- phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.10 Thu Jan 15 07:43:25 2004 +++ phpdoc/en/reference/stream/functions/stream-wrapper-register.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <refentry id="function.stream-wrapper-register"> <refnamediv> <refname>stream_wrapper_register</refname> @@ -391,7 +391,7 @@ The example below implements a var:// protocol handler that allows read/write access to a named global variable using standard filesystem stream functions such as <function>fread</function>. - The var:// protocol implemented below, given the url + The var:// protocol implemented below, given the URL "var://foo" will read/write data to/from $GLOBALS["foo"]. <example> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/parse-str.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/strings/functions/parse-str.xml diff -u phpdoc/en/reference/strings/functions/parse-str.xml:1.4 phpdoc/en/reference/strings/functions/parse-str.xml:1.5 --- phpdoc/en/reference/strings/functions/parse-str.xml:1.4 Tue Feb 11 13:58:37 2003 +++ phpdoc/en/reference/strings/functions/parse-str.xml Wed Jan 28 19:35:31 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 --> <refentry id="function.parse-str"> <refnamediv> @@ -16,7 +16,7 @@ </methodsynopsis> <para> Parses <parameter>str</parameter> as if it were the query string - passed via an URL and sets variables in the current scope. If + passed via a URL and sets variables in the current scope. If the second parameter <parameter>arr</parameter> is present, variables are stored in this variable as array elements instead. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/http-build-query.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/url/functions/http-build-query.xml diff -u phpdoc/en/reference/url/functions/http-build-query.xml:1.6 phpdoc/en/reference/url/functions/http-build-query.xml:1.7 --- phpdoc/en/reference/url/functions/http-build-query.xml:1.6 Thu Jan 15 07:43:36 2004 +++ phpdoc/en/reference/url/functions/http-build-query.xml Wed Jan 28 19:35:32 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <refentry id="function.http-build-query"> <refnamediv> <refname>http_build_query</refname> - <refpurpose>Generate url-encoded query string</refpurpose> + <refpurpose>Generate URL-encoded query string</refpurpose> </refnamediv> <refsect1> <title>Description</title> @@ -14,7 +14,7 @@ </methodsynopsis> <simpara> - Generates a url-encoded query string from the associative (or indexed) array provided. + Generates a URL-encoded query string from the associative (or indexed) array provided. <parameter>formdata</parameter> may be an array or object containing properties. A <parameter>formdata</parameter> array may be a simple one-dimensional structure, or an array of arrays (who in turn may contain other arrays). If numeric indices http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/urlencode.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/url/functions/urlencode.xml diff -u phpdoc/en/reference/url/functions/urlencode.xml:1.6 phpdoc/en/reference/url/functions/urlencode.xml:1.7 --- phpdoc/en/reference/url/functions/urlencode.xml:1.6 Wed Jul 16 13:23:13 2003 +++ phpdoc/en/reference/url/functions/urlencode.xml Wed Jan 28 19:35:32 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 --> <refentry id="function.urlencode"> <refnamediv> @@ -24,7 +24,7 @@ <function>rawurlencode</function>) in that for historical reasons, spaces are encoded as plus (+) signs. This function is convenient when encoding a string to be used in a query part of - an URL, as a convenient way to pass variables to the next page: + a URL, as a convenient way to pass variables to the next page: <example> <title><function>urlencode</function> example</title> <programlisting role="php"> http://cvs.php.net/diff.php/phpdoc/en/security/cgi-bin.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/security/cgi-bin.xml diff -u phpdoc/en/security/cgi-bin.xml:1.1 phpdoc/en/security/cgi-bin.xml:1.2 --- phpdoc/en/security/cgi-bin.xml:1.1 Mon Jan 26 08:22:25 2004 +++ phpdoc/en/security/cgi-bin.xml Wed Jan 28 19:35:33 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <!-- splitted from ./index.xml, last change in rev 1.66 --> <sect1 id="security.cgi-bin"> <title>Installed as CGI binary</title> @@ -25,7 +25,7 @@ role="url">http://my.host/cgi-bin/php?/etc/passwd</filename> </simpara> <simpara> - The query information in a url after the question mark (?) is + The query information in a URL after the question mark (?) is passed as command line arguments to the interpreter by the CGI interface. Usually interpreters open and execute the file specified as the first argument on the command line. @@ -41,7 +41,7 @@ role="url">http://my.host/cgi-bin/php/secret/doc.html</filename> </simpara> <simpara> - The path information part of the url after the PHP binary name, + The path information part of the URL after the PHP binary name, <filename role="uri">/secret/doc.html</filename> is conventionally used to specify the name of the file to be opened and interpreted by the <acronym>CGI</acronym> program. @@ -104,7 +104,7 @@ <title>Case 2: using --enable-force-cgi-redirect</title> <simpara> This compile-time option prevents anyone from calling PHP - directly with a url like <filename + directly with a URL like <filename role="php">http://my.host/cgi-bin/php/secretdir/script.php</filename>. Instead, PHP will only parse in this mode if it has gone through a web server redirect rule. @@ -165,7 +165,7 @@ Another option usable here is <link linkend="ini.user-dir">user_dir</link>. When user_dir is unset, only thing controlling the opened file name is - <parameter>doc_root</parameter>. Opening an url like <filename + <parameter>doc_root</parameter>. Opening a URL like <filename role="url">http://my.host/~user/doc.php</filename> does not result in opening a file under users home directory, but a file called <filename role="uri">~user/doc.php</filename> under
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.66&r2=1.67&ty=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.66 phpdoc/en/language-snippets.ent:1.67 --- phpdoc/en/language-snippets.ent:1.66 Mon Jan 26 15:23:25 2004 +++ phpdoc/en/language-snippets.ent Wed Jan 28 19:35:21 2004 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.66 $ --> +<!-- $Revision: 1.67 $ --> <!ENTITY warn.experimental '<warning><simpara>This extension is <emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension -- @@ -41,7 +41,7 @@ <!ENTITY tip.fopen-wrapper.stat '<tip><simpara>As of <literal>PHP 5.0.0</literal> this function can also be used with -<emphasis>some</emphasis> url wrappers. Refer to +<emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>stat</function> family of functionality.</simpara></tip>'> http://cvs.php.net/diff.php/phpdoc/en/appendices/transports.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/appendices/transports.xml diff -u phpdoc/en/appendices/transports.xml:1.6 phpdoc/en/appendices/transports.xml:1.7 --- phpdoc/en/appendices/transports.xml:1.6 Sat Dec 20 23:21:39 2003 +++ phpdoc/en/appendices/transports.xml Wed Jan 28 19:35:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix id="transports"> <title>List of Supported Socket Transports</title> <para> @@ -42,7 +42,7 @@ Internet Domain sockets expect a port number in addition to a target address. In the case of <function>fsockopen</function> this is specified in a second parameter and therefore does - not impact the formatting of transport url. With + not impact the formatting of transport URL. With <function>stream_socket_client</function> and related functions as with traditional URLs however, the port number is specified as a suffix of the transport URL delimited by a colon. http://cvs.php.net/diff.php/phpdoc/en/appendices/wrappers.xml?r1=1.33&r2=1.34&ty=u Index: phpdoc/en/appendices/wrappers.xml diff -u phpdoc/en/appendices/wrappers.xml:1.33 phpdoc/en/appendices/wrappers.xml:1.34 --- phpdoc/en/appendices/wrappers.xml:1.33 Tue Dec 30 06:31:52 2003 +++ phpdoc/en/appendices/wrappers.xml Wed Jan 28 19:35:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.33 $ --> +<!-- $Revision: 1.34 $ --> <appendix id="wrappers"> <title>List of Supported Protocols/Wrappers</title> <para> @@ -116,7 +116,7 @@ <simpara> Redirects have been supported since PHP 4.0.5; if you are using an earlier version you will need to include trailing slashes in - your URLs. If it's important to know the url of the resource where + your URLs. If it's important to know the URL of the resource where your document came from (after all redirects have been processed), you'll need to process the series of response headers returned by the stream. @@ -319,7 +319,7 @@ <title>Appending</title> <simpara> As of <literal>PHP 5.0.0</literal> files may be appended via the - <literal>ftp://</literal> url wrapper. In prior versions, attempting + <literal>ftp://</literal> URL wrapper. In prior versions, attempting to append to a file via <literal>ftp://</literal> will result in failure. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/chapters/config.xml?r1=1.114&r2=1.115&ty=u Index: phpdoc/en/chapters/config.xml diff -u phpdoc/en/chapters/config.xml:1.114 phpdoc/en/chapters/config.xml:1.115 --- phpdoc/en/chapters/config.xml:1.114 Sat Dec 20 23:21:40 2003 +++ phpdoc/en/chapters/config.xml Wed Jan 28 19:35:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.114 $ --> +<!-- $Revision: 1.115 $ --> <chapter id="configuration"> <title>Runtime Configuration</title> @@ -710,7 +710,7 @@ <para> Tells whether or not to register the EGPCS (Environment, GET, POST, Cookie, Server) variables as global variables. For example; - if register_globals = on, the url + if register_globals = on, the URL <literal>http://www.example.com/test.php?id=3</literal> will produce <varname>$id</varname>. Or, <varname>$DOCUMENT_ROOT</varname> from <varname>$_SERVER['DOCUMENT_ROOT']</varname>. You may want to turn http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.28&r2=1.29&ty=u Index: phpdoc/en/chapters/tutorial.xml diff -u phpdoc/en/chapters/tutorial.xml:1.28 phpdoc/en/chapters/tutorial.xml:1.29 --- phpdoc/en/chapters/tutorial.xml:1.28 Mon Jan 19 10:53:43 2004 +++ phpdoc/en/chapters/tutorial.xml Wed Jan 28 19:35:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.28 $ --> +<!-- $Revision: 1.29 $ --> <chapter id="tutorial"> <title>A simple tutorial</title> @@ -78,7 +78,7 @@ <simpara> Use your browser to access the file with your web server's URL, ending with the "/hello.php" file reference. When developing locally this - url will be something like <literal>http://localhost/hello.php</literal> + URL will be something like <literal>http://localhost/hello.php</literal> or <literal>http://127.0.0.1/hello.php</literal> but this depends on the web server's configuration. Although this is outside the scope of this tutorial, see also the <varname>DocumentRoot</varname> and http://cvs.php.net/diff.php/phpdoc/en/faq/html.xml?r1=1.25&r2=1.26&ty=u Index: phpdoc/en/faq/html.xml diff -u phpdoc/en/faq/html.xml:1.25 phpdoc/en/faq/html.xml:1.26 --- phpdoc/en/faq/html.xml:1.25 Tue Jan 6 09:35:35 2004 +++ phpdoc/en/faq/html.xml Wed Jan 28 19:35:23 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <chapter id="faq.html"> <title>PHP and HTML</title> <titleabbrev>PHP and HTML</titleabbrev> @@ -89,7 +89,7 @@ </simpara> </note> <example> - <title>In an URL</title> + <title>In a URL</title> <programlisting role="php"> <![CDATA[ <?php http://cvs.php.net/diff.php/phpdoc/en/language/control-structures.xml?r1=1.85&r2=1.86&ty=u Index: phpdoc/en/language/control-structures.xml diff -u phpdoc/en/language/control-structures.xml:1.85 phpdoc/en/language/control-structures.xml:1.86 --- phpdoc/en/language/control-structures.xml:1.85 Sat Jan 17 15:22:45 2004 +++ phpdoc/en/language/control-structures.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.85 $ --> +<!-- $Revision: 1.86 $ --> <chapter id="control-structures"> <title>Control Structures</title> @@ -1318,11 +1318,11 @@ <simpara> If "<link linkend="ini.allow-url-fopen">URL fopen wrappers</link>" are enabled in PHP (which they are in the default configuration), - you can specify the file to be included using an URL (via HTTP or + you can specify the file to be included using a URL (via HTTP or other supported wrapper - see <xref linkend="wrappers"/> for a list of protocols) instead of a local pathname. If the target server interprets the target file as PHP code, variables may be passed to the included - file using an URL request string as used with HTTP GET. This is + file using a URL request string as used with HTTP GET. This is not strictly speaking the same thing as including the file and having it inherit the parent file's variable scope; the script is actually being run on the remote server and the result is then being http://cvs.php.net/diff.php/phpdoc/en/language/variables.xml?r1=1.74&r2=1.75&ty=u Index: phpdoc/en/language/variables.xml diff -u phpdoc/en/language/variables.xml:1.74 phpdoc/en/language/variables.xml:1.75 --- phpdoc/en/language/variables.xml:1.74 Tue Jan 6 04:20:49 2004 +++ phpdoc/en/language/variables.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.74 $ --> +<!-- $Revision: 1.75 $ --> <chapter id="language.variables"> <title>Variables</title> @@ -854,7 +854,7 @@ <para> Using a GET form is similar except you'll use the appropriate GET predefined variable instead. GET also applies to the - QUERY_STRING (the information after the '?' in an URL). So, + QUERY_STRING (the information after the '?' in a URL). So, for example, <literal>http://www.example.com/test.php?id=3</literal> contains GET data which is accessible with <varname>$_GET['id']</varname>. See also <link linkend="reserved.variables.request">$_REQUEST</link> and http://cvs.php.net/diff.php/phpdoc/en/reference/curl/configure.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/curl/configure.xml diff -u phpdoc/en/reference/curl/configure.xml:1.5 phpdoc/en/reference/curl/configure.xml:1.6 --- phpdoc/en/reference/curl/configure.xml:1.5 Wed Dec 31 10:25:16 2003 +++ phpdoc/en/reference/curl/configure.xml Wed Jan 28 19:35:24 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <section id="curl.installation"> &reftitle.install; <para> @@ -10,7 +10,7 @@ named "curl" which should contain the <filename>easy.h</filename> and <filename>curl.h</filename> files. There should be a file named <filename>libcurl.a</filename> located in the "lib" directory. Beginning - with PHP 4.3.0 you can configure PHP to use CURL for url streams + with PHP 4.3.0 you can configure PHP to use CURL for URL streams <option role="configure">--with-curlwrappers</option>. </para> <note> http://cvs.php.net/diff.php/phpdoc/en/reference/dir/functions/opendir.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/dir/functions/opendir.xml diff -u phpdoc/en/reference/dir/functions/opendir.xml:1.7 phpdoc/en/reference/dir/functions/opendir.xml:1.8 --- phpdoc/en/reference/dir/functions/opendir.xml:1.7 Mon Dec 15 11:48:51 2003 +++ phpdoc/en/reference/dir/functions/opendir.xml Wed Jan 28 19:35:25 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/dir.xml, last change in rev 1.2 --> <refentry id="function.opendir"> <refnamediv> @@ -52,9 +52,9 @@ <para> As of <literal>PHP 4.3.0</literal> <parameter>path</parameter> can also be any URL which supports directory listing, however only the <literal>file://</literal> - url wrapper supports this in <literal>PHP 4.3</literal>. As of + URL wrapper supports this in <literal>PHP 4.3</literal>. As of <literal>PHP 5.0.0</literal>, support for the <literal>ftp://</literal> - url wrapper is included as well. + URL wrapper is included as well. </para> <para> See also <function>is_dir</function>, http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/ini.xml?r1=1.19&r2=1.20&ty=u Index: phpdoc/en/reference/errorfunc/ini.xml diff -u phpdoc/en/reference/errorfunc/ini.xml:1.19 phpdoc/en/reference/errorfunc/ini.xml:1.20 --- phpdoc/en/reference/errorfunc/ini.xml:1.19 Sat Dec 20 23:21:45 2003 +++ phpdoc/en/reference/errorfunc/ini.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <section id="errorfunc.configuration"> &reftitle.runtime; &extension.runtime; @@ -309,7 +309,7 @@ <para> The new error format contains a reference to a page describing the error or function causing the error. In case of manual pages you can download the - manual in your language and set this ini directive to the url of your local + manual in your language and set this ini directive to the URL of your local copy. If your local copy of the manual can be reached by '/manual/' you can simply use <userinput>docref_root=/manual/</userinput>. Additional you have to set docref_ext to match the fileextensions of your copy http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/copy.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/copy.xml diff -u phpdoc/en/reference/filesystem/functions/copy.xml:1.7 phpdoc/en/reference/filesystem/functions/copy.xml:1.8 --- phpdoc/en/reference/filesystem/functions/copy.xml:1.7 Mon Dec 15 11:49:45 2003 +++ phpdoc/en/reference/filesystem/functions/copy.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.copy"> <refnamediv> @@ -34,7 +34,7 @@ As of PHP 4.3.0, both <parameter>source</parameter> and <parameter>dest</parameter> may be URLs if the "fopen wrappers" have been enabled. See <function>fopen</function> for more details. - If <parameter>dest</parameter> is an URL, the copy operation may + If <parameter>dest</parameter> is a URL, the copy operation may fail if the wrapper does not support overwriting of existing files. </para> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/mkdir.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/filesystem/functions/mkdir.xml diff -u phpdoc/en/reference/filesystem/functions/mkdir.xml:1.12 phpdoc/en/reference/filesystem/functions/mkdir.xml:1.13 --- phpdoc/en/reference/filesystem/functions/mkdir.xml:1.12 Tue Dec 16 12:22:43 2003 +++ phpdoc/en/reference/filesystem/functions/mkdir.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 --> <refentry id="function.mkdir"> <refnamediv> @@ -50,7 +50,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>mkdir</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>mkdir</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rename.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/rename.xml diff -u phpdoc/en/reference/filesystem/functions/rename.xml:1.7 phpdoc/en/reference/filesystem/functions/rename.xml:1.8 --- phpdoc/en/reference/filesystem/functions/rename.xml:1.7 Fri Dec 12 18:20:18 2003 +++ phpdoc/en/reference/filesystem/functions/rename.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rename"> <refnamediv> @@ -42,7 +42,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>rename</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rename</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rmdir.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/filesystem/functions/rmdir.xml diff -u phpdoc/en/reference/filesystem/functions/rmdir.xml:1.6 phpdoc/en/reference/filesystem/functions/rmdir.xml:1.7 --- phpdoc/en/reference/filesystem/functions/rmdir.xml:1.6 Tue Dec 16 12:22:43 2003 +++ phpdoc/en/reference/filesystem/functions/rmdir.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rmdir"> <refnamediv> @@ -21,7 +21,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>rmdir</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rmdir</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/unlink.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/filesystem/functions/unlink.xml diff -u phpdoc/en/reference/filesystem/functions/unlink.xml:1.6 phpdoc/en/reference/filesystem/functions/unlink.xml:1.7 --- phpdoc/en/reference/filesystem/functions/unlink.xml:1.6 Fri Dec 5 14:58:06 2003 +++ phpdoc/en/reference/filesystem/functions/unlink.xml Wed Jan 28 19:35:26 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.unlink"> <refnamediv> @@ -20,7 +20,7 @@ <note> <simpara> As of <literal>PHP 5.0.0</literal> <function>unlink</function> can also be - used with <emphasis>some</emphasis> url wrappers. Refer to <xref linkend="wrappers"/> + used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>unlink</function>. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/exif-read-data.xml?r1=1.18&r2=1.19&ty=u Index: phpdoc/en/reference/image/functions/exif-read-data.xml diff -u phpdoc/en/reference/image/functions/exif-read-data.xml:1.18 phpdoc/en/reference/image/functions/exif-read-data.xml:1.19 --- phpdoc/en/reference/image/functions/exif-read-data.xml:1.18 Thu Dec 18 12:44:49 2003 +++ phpdoc/en/reference/image/functions/exif-read-data.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <!-- splitted from ./en/functions/image.xml, last change in rev 1.78 --> <refentry id="function.exif-read-data"> <refnamediv> @@ -26,7 +26,7 @@ </para> <para> <parameter>filename</parameter> is the name of the file to read. This - cannot be an url. + cannot be a URL. </para> <para> <parameter>sections</parameter> is a comma separated list of sections that http://cvs.php.net/diff.php/phpdoc/en/reference/image/functions/imagettfbbox.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/image/functions/imagettfbbox.xml diff -u phpdoc/en/reference/image/functions/imagettfbbox.xml:1.3 phpdoc/en/reference/image/functions/imagettfbbox.xml:1.4 --- phpdoc/en/reference/image/functions/imagettfbbox.xml:1.3 Wed Dec 17 09:32:29 2003 +++ phpdoc/en/reference/image/functions/imagettfbbox.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 --> <refentry id="function.imagettfbbox"> <refnamediv> @@ -41,7 +41,7 @@ </term> <listitem> <simpara> - The name of the TrueType font file. (Can also be an URL.) Depending on + The name of the TrueType font file. (Can also be a URL.) Depending on which version of the GD library that PHP is using, it may attempt to search for files that do not begin with a leading '/' by appending '.ttf' to the filename and searching along a library-defined font path. http://cvs.php.net/diff.php/phpdoc/en/reference/misc/functions/highlight-file.xml?r1=1.13&r2=1.14&ty=u Index: phpdoc/en/reference/misc/functions/highlight-file.xml diff -u phpdoc/en/reference/misc/functions/highlight-file.xml:1.13 phpdoc/en/reference/misc/functions/highlight-file.xml:1.14 --- phpdoc/en/reference/misc/functions/highlight-file.xml:1.13 Thu Dec 18 12:45:41 2003 +++ phpdoc/en/reference/misc/functions/highlight-file.xml Wed Jan 28 19:35:27 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 --> <refentry id="function.highlight-file"> <refnamediv> @@ -99,7 +99,7 @@ ]]> </programlisting> <simpara> - Then you can use an URL like the one below to display a colorized + Then you can use a URL like the one below to display a colorized version of a script located in "/path/to/script.php" in your web site. </simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml diff -u phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.5 phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.6 --- phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml:1.5 Mon Dec 15 11:52:04 2003 +++ phpdoc/en/reference/mnogosearch/functions/udm-add-search-limit.xml Wed Jan 28 19:35:28 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/mnogosearch.xml, last change in rev 1.18 --> <refentry id="function.udm-add-search-limit"> <refnamediv> @@ -70,7 +70,7 @@ So it's id would be 0102. If VW had a sub category called 'Engine' then it's id would start at 01 again and it would get the 'VW' id 02 and 'Auto' id of 01, making it 010201. If you want to search for sites under that category - then you pass it cat=010201 in the url. + then you pass it cat=010201 in the URL. </simpara> </listitem> <listitem> http://cvs.php.net/diff.php/phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml diff -u phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.6 phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.7 --- phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml:1.6 Tue Jan 6 04:21:00 2004 +++ phpdoc/en/reference/mnogosearch/functions/udm-api-version.xml Wed Jan 28 19:35:28 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/mnogosearch.xml, last change in rev 1.18 --> <refentry id="function.udm-api-version"> <refnamediv> @@ -30,7 +30,7 @@ <![CDATA[ <?php if (udm_api_version() >= 30111) { - echo "Total number of urls in database: " . udm_get_doc_count($udm) . "<br />\n"; + echo "Total number of URLs in database: " . udm_get_doc_count($udm) . "<br />\n"; } ?> ]]> http://cvs.php.net/diff.php/phpdoc/en/reference/session/ini.xml?r1=1.18&r2=1.19&ty=u Index: phpdoc/en/reference/session/ini.xml diff -u phpdoc/en/reference/session/ini.xml:1.18 phpdoc/en/reference/session/ini.xml:1.19 --- phpdoc/en/reference/session/ini.xml:1.18 Fri Jan 16 11:08:35 2004 +++ phpdoc/en/reference/session/ini.xml Wed Jan 28 19:35:29 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <section id="session.configuration"> &reftitle.runtime; &extension.runtime; @@ -516,8 +516,8 @@ <simpara> URL based session management has additional security risks compared to cookie based session management. Users may send - an URL that contains an active session ID to their friends by - email or users may save an URL that contains a session ID to + a URL that contains an active session ID to their friends by + email or users may save a URL that contains a session ID to their bookmarks and access your site with the same session ID always, for example. </simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-client.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/stream/functions/stream-socket-client.xml diff -u phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.7 phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.8 --- phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.7 Sat Dec 20 23:22:00 2003 +++ phpdoc/en/reference/stream/functions/stream-socket-client.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <refentry id="function.stream-socket-client"> <refnamediv> <refname>stream_socket_client</refname> @@ -21,7 +21,7 @@ <para> Initiates a stream or datagram connection to the destination specified by <parameter>remote_socket</parameter>. The type of socket created - is determined by the transport specified using standard url formatting: + is determined by the transport specified using standard URL formatting: <literal>transport://target</literal>. For Internet Domain sockets (AF_INET) such as TCP and UDP, the <literal>target</literal> portion of the <parameter>remote_socket</parameter> parameter should consist of http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-server.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/stream/functions/stream-socket-server.xml diff -u phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.10 phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.11 --- phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.10 Tue Jan 27 23:33:27 2004 +++ phpdoc/en/reference/stream/functions/stream-socket-server.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <refentry id="function.stream-socket-server"> <refnamediv> <refname>stream_socket_server</refname> @@ -20,7 +20,7 @@ <para> Creates a stream or datagram socket on the specified <parameter>local_socket</parameter>. The type of socket created - is determined by the transport specified using standard url formatting: + is determined by the transport specified using standard URL formatting: <literal>transport://target</literal>. For Internet Domain sockets (AF_INET) such as TCP and UDP, the <literal>target</literal> portion of the <parameter>remote_socket</parameter> parameter should consist of http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-wrapper-register.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/stream/functions/stream-wrapper-register.xml diff -u phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.10 phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.11 --- phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.10 Thu Jan 15 07:43:25 2004 +++ phpdoc/en/reference/stream/functions/stream-wrapper-register.xml Wed Jan 28 19:35:30 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <refentry id="function.stream-wrapper-register"> <refnamediv> <refname>stream_wrapper_register</refname> @@ -391,7 +391,7 @@ The example below implements a var:// protocol handler that allows read/write access to a named global variable using standard filesystem stream functions such as <function>fread</function>. - The var:// protocol implemented below, given the url + The var:// protocol implemented below, given the URL "var://foo" will read/write data to/from $GLOBALS["foo"]. <example> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/parse-str.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/strings/functions/parse-str.xml diff -u phpdoc/en/reference/strings/functions/parse-str.xml:1.4 phpdoc/en/reference/strings/functions/parse-str.xml:1.5 --- phpdoc/en/reference/strings/functions/parse-str.xml:1.4 Tue Feb 11 13:58:37 2003 +++ phpdoc/en/reference/strings/functions/parse-str.xml Wed Jan 28 19:35:31 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 --> <refentry id="function.parse-str"> <refnamediv> @@ -16,7 +16,7 @@ </methodsynopsis> <para> Parses <parameter>str</parameter> as if it were the query string - passed via an URL and sets variables in the current scope. If + passed via a URL and sets variables in the current scope. If the second parameter <parameter>arr</parameter> is present, variables are stored in this variable as array elements instead. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/http-build-query.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/url/functions/http-build-query.xml diff -u phpdoc/en/reference/url/functions/http-build-query.xml:1.6 phpdoc/en/reference/url/functions/http-build-query.xml:1.7 --- phpdoc/en/reference/url/functions/http-build-query.xml:1.6 Thu Jan 15 07:43:36 2004 +++ phpdoc/en/reference/url/functions/http-build-query.xml Wed Jan 28 19:35:32 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <refentry id="function.http-build-query"> <refnamediv> <refname>http_build_query</refname> - <refpurpose>Generate url-encoded query string</refpurpose> + <refpurpose>Generate URL-encoded query string</refpurpose> </refnamediv> <refsect1> <title>Description</title> @@ -14,7 +14,7 @@ </methodsynopsis> <simpara> - Generates a url-encoded query string from the associative (or indexed) array provided. + Generates a URL-encoded query string from the associative (or indexed) array provided. <parameter>formdata</parameter> may be an array or object containing properties. A <parameter>formdata</parameter> array may be a simple one-dimensional structure, or an array of arrays (who in turn may contain other arrays). If numeric indices http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/urlencode.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/url/functions/urlencode.xml diff -u phpdoc/en/reference/url/functions/urlencode.xml:1.6 phpdoc/en/reference/url/functions/urlencode.xml:1.7 --- phpdoc/en/reference/url/functions/urlencode.xml:1.6 Wed Jul 16 13:23:13 2003 +++ phpdoc/en/reference/url/functions/urlencode.xml Wed Jan 28 19:35:32 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/url.xml, last change in rev 1.2 --> <refentry id="function.urlencode"> <refnamediv> @@ -24,7 +24,7 @@ <function>rawurlencode</function>) in that for historical reasons, spaces are encoded as plus (+) signs. This function is convenient when encoding a string to be used in a query part of - an URL, as a convenient way to pass variables to the next page: + a URL, as a convenient way to pass variables to the next page: <example> <title><function>urlencode</function> example</title> <programlisting role="php"> http://cvs.php.net/diff.php/phpdoc/en/security/cgi-bin.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/security/cgi-bin.xml diff -u phpdoc/en/security/cgi-bin.xml:1.1 phpdoc/en/security/cgi-bin.xml:1.2 --- phpdoc/en/security/cgi-bin.xml:1.1 Mon Jan 26 08:22:25 2004 +++ phpdoc/en/security/cgi-bin.xml Wed Jan 28 19:35:33 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <!-- splitted from ./index.xml, last change in rev 1.66 --> <sect1 id="security.cgi-bin"> <title>Installed as CGI binary</title> @@ -25,7 +25,7 @@ role="url">http://my.host/cgi-bin/php?/etc/passwd</filename> </simpara> <simpara> - The query information in a url after the question mark (?) is + The query information in a URL after the question mark (?) is passed as command line arguments to the interpreter by the CGI interface. Usually interpreters open and execute the file specified as the first argument on the command line. @@ -41,7 +41,7 @@ role="url">http://my.host/cgi-bin/php/secret/doc.html</filename> </simpara> <simpara> - The path information part of the url after the PHP binary name, + The path information part of the URL after the PHP binary name, <filename role="uri">/secret/doc.html</filename> is conventionally used to specify the name of the file to be opened and interpreted by the <acronym>CGI</acronym> program. @@ -104,7 +104,7 @@ <title>Case 2: using --enable-force-cgi-redirect</title> <simpara> This compile-time option prevents anyone from calling PHP - directly with a url like <filename + directly with a URL like <filename role="php">http://my.host/cgi-bin/php/secretdir/script.php</filename>. Instead, PHP will only parse in this mode if it has gone through a web server redirect rule. @@ -165,7 +165,7 @@ Another option usable here is <link linkend="ini.user-dir">user_dir</link>. When user_dir is unset, only thing controlling the opened file name is - <parameter>doc_root</parameter>. Opening an url like <filename + <parameter>doc_root</parameter>. Opening a URL like <filename role="url">http://my.host/~user/doc.php</filename> does not result in opening a file under users home directory, but a file called <filename role="uri">~user/doc.php</filename> under