[doc-en] master: Fix typos and grammars in the features directory (#5896)

Author: Chun-Sheng, Li (peter279k) Committer: GitHub (web-flow) Pusher: lacatoire Date: 2026-09-30T13:42:04+02:00 Commit: https://github.com/php/doc-en/commit/5e6ca803fc284739a7b1e7fba58b6b8466d5006f Raw diff: https://github.com/php/doc-en/commit/5e6ca803fc284739a7b1e7fba58b6b8466d5006f.diff Fix typos and grammars in the features directory (#5896) Changed paths: M features/commandline.xml M features/connection-handling.xml M features/cookies.xml M features/dtrace.xml M features/file-upload.xml M features/gc.xml M features/http-auth.xml Diff: diff --git a/features/commandline.xml b/features/commandline.xml index 5259ddb1b07c..052802def5d6 100644 --- a/features/commandline.xml +++ b/features/commandline.xml @@ -83,7 +83,7 @@ </section> <section xml:id="features.commandline.differences"> - <title>Differences to other <acronym>SAPI</acronym>s</title> + <title>Differences from other <acronym>SAPI</acronym>s</title> <para> Remarkable differences of the &cli; <acronym>SAPI</acronym> compared to other @@ -306,11 +306,11 @@ $ php -f another_directory/test.php </para> </example> <note> - <para> + <simpara> The <acronym>CGI</acronym> <acronym>SAPI</acronym> supports this - &cli.sapi; behaviour by means of the <option>-C</option> switch when run + &cli.sapi; behavior by means of the <option>-C</option> switch when run from the command line. - </para> + </simpara> </note> </listitem> </itemizedlist> @@ -530,7 +530,7 @@ string(15) "doesntmakesense" <entry>--help and --usage</entry> <entry> Output a list of - command line options with one line descriptions of what they do. + command line options with one-line descriptions of what they do. </entry> </row> <row> @@ -585,7 +585,7 @@ string(15) "doesntmakesense" <entry>--modules</entry> <entry> <para><example> - <title>Printing built in (and loaded) PHP and Zend modules</title> + <title>Printing built-in (and loaded) PHP and Zend modules</title> <screen> <![CDATA[ $ php -m @@ -1049,12 +1049,12 @@ $ php -f my_script.php ]]> </screen> </informalexample> - <para> + <simpara> Both ways (whether using the <option>-f</option> switch or not) execute the file <filename>my_script.php</filename>. Note that there is no restriction on which files can be executed; in particular, the filename - is not required have a <literal>.php</literal> extension. - </para> + is not required to have a <literal>.php</literal> extension. + </simpara> </listitem> <listitem> <para> diff --git a/features/connection-handling.xml b/features/connection-handling.xml index f81774fe4a31..ac1cf302a88d 100644 --- a/features/connection-handling.xml +++ b/features/connection-handling.xml @@ -26,8 +26,8 @@ You can decide whether or not you want a client disconnect to cause your script to be aborted. Sometimes it is handy to always have your scripts run to completion even if there is no remote browser receiving - the output. The default behaviour is however for your script to be - aborted when the remote client disconnects. This behaviour can be + the output. The default behavior is however, for your script to be + aborted when the remote client disconnects. This behavior can be set via the ignore_user_abort &php.ini; directive as well as through the corresponding <literal>php_value ignore_user_abort</literal> Apache &httpd.conf; directive or diff --git a/features/cookies.xml b/features/cookies.xml index 5c7ac7b8bf4e..c49da90a8045 100644 --- a/features/cookies.xml +++ b/features/cookies.xml @@ -16,19 +16,19 @@ or not to set any cookies or send any headers. </para> - <para> - Any cookies sent to server from the client will automatically be included into + <simpara> + Any cookies sent to the server from the client will automatically be included into a <varname>$_COOKIE</varname> auto-global array if <link linkend="ini.variables-order">variables_order</link> contains "C". If you wish to assign multiple values to a single cookie, just add <literal>[]</literal> to the cookie name. - </para> + </simpara> - <para> + <simpara> For more details, including notes on browser bugs, see the <function>setcookie</function> and <function>setrawcookie</function> - function. - </para> + functions. + </simpara> </chapter> diff --git a/features/dtrace.xml b/features/dtrace.xml index a794f585e92a..97c0e773c6d8 100644 --- a/features/dtrace.xml +++ b/features/dtrace.xml @@ -95,16 +95,16 @@ that provide their own probes should be built separately as shared extensions. </para> - <para> - To enable probes, set <option>USE_ZEND_DTRACE=1</option> environment variable to the target PHP processes. - </para> + <simpara> + To enable probes, set <option>USE_ZEND_DTRACE=1</option> environment variable for the target PHP processes. + </simpara> </sect2> <sect2 xml:id="features.dtrace.static-probes"> <title>DTrace Static Probes in Core PHP</title> <table> <title>The following static probes are available in PHP</title> - <tgroup cols="2"> + <tgroup cols="3"> <thead> <row> <entry>Probe Name</entry> @@ -120,7 +120,7 @@ </row> <row> <entry><literal>request-shutdown</literal></entry> - <entry>Fires when a request shutdown.</entry> + <entry>Fires when a request shuts down.</entry> <entry>char *<varname>file</varname>, char *<varname>request_uri</varname>, char *<varname>request_method</varname></entry> </row> <row> diff --git a/features/file-upload.xml b/features/file-upload.xml index d67381e670e6..47de56788542 100644 --- a/features/file-upload.xml +++ b/features/file-upload.xml @@ -82,7 +82,7 @@ <para> The global <varname>$_FILES</varname> will contain all the uploaded file information. - Its contents from the example form is as follows. Note that this assumes the use of + Its contents from the example form are as follows. Note that this assumes the use of the file upload name <emphasis>userfile</emphasis>, as used in the example script above. This can be any name. <variablelist> @@ -97,13 +97,13 @@ <varlistentry> <term><varname>$_FILES['userfile']['type']</varname></term> <listitem> - <para> + <simpara> The mime type of the file, if the browser provided this information. An example would be <literal>"image/gif"</literal>. This mime type is however - not checked on the PHP side and therefore don't take its value + not checked on the PHP side and therefore do not take its value for granted. - </para> + </simpara> </listitem> </varlistentry> <varlistentry> @@ -237,7 +237,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) { if ($error == UPLOAD_ERR_OK) { $tmp_name = $_FILES["pictures"]["tmp_name"][$key]; // basename() may prevent filesystem traversal attacks; - // further validation/sanitation of the filename may be appropriate + // further validation/sanitization of the filename may be appropriate $name = basename($_FILES["pictures"]["name"][$key]); move_uploaded_file($tmp_name, "data/$name"); } @@ -284,7 +284,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) { </simpara> <simpara> If <link linkend="ini.max-execution-time">max_execution_time</link> - is set too small, script execution may be exceeded by the value. Make + is set too small, script execution may exceed the configured value. Make sure you set <literal>max_execution_time</literal> large enough. </simpara> <note> @@ -314,7 +314,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) { <simpara> The <link linkend="ini.max-file-uploads">max_file_uploads</link> configuration - setting controls the maximum number of files that can uploaded in one + setting controls the maximum number of files that can be uploaded in one request. If more files are uploaded than the limit, then <varname>$_FILES</varname> will stop processing files once the limit is reached. For example, if @@ -327,7 +327,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) { sensitive information in other directories. </simpara> <simpara> - Due to the large amount of directory listing styles we cannot guarantee + Due to the large number of directory listing styles we cannot guarantee that files with exotic names (like containing spaces) are handled properly. </simpara> <simpara> diff --git a/features/gc.xml b/features/gc.xml index dd5edf22fc25..73b0555cc884 100644 --- a/features/gc.xml +++ b/features/gc.xml @@ -145,7 +145,7 @@ a: (refcount=1, is_ref=0)='new string' </para> <para> <example> - <title>Creating a <type>array</type> zval</title> + <title>Creating an <type>array</type> zval</title> <programlisting role="php"> <![CDATA[ <?php @@ -347,13 +347,13 @@ a: (refcount=2, is_ref=1)=array ( <sect1 xml:id="features.gc.collecting-cycles"> <title>Collecting Cycles</title> - <para> + <simpara> Traditionally, reference counting memory mechanisms, such as that used previously by PHP, fail to address circular reference memory leaks; - however, as of 5.3.0, PHP implements the synchronous algorithm from the + however, as of PHP 5.3.0, PHP implements the synchronous algorithm from the <link xlink:href="&url.gc-paper;">Concurrent Cycle Collection in Reference Counted Systems</link> paper which addresses that issue. - </para> + </simpara> <para> A full explanation of how the algorithm works would be slightly beyond the scope of this section, but the basics are explained here. First of all, diff --git a/features/http-auth.xml b/features/http-auth.xml index 56a6d4503385..907e308048f8 100644 --- a/features/http-auth.xml +++ b/features/http-auth.xml @@ -11,7 +11,7 @@ the URL containing the PHP script will be called again with the <link linkend="reserved.variables">predefined variables</link> <varname>PHP_AUTH_USER</varname>, <varname>PHP_AUTH_PW</varname>, - and <varname>AUTH_TYPE</varname> set to the user name, password and + and <varname>AUTH_TYPE</varname> set to the username, password and authentication type respectively. These predefined variables are found in the <varname>$_SERVER</varname> array. <emphasis>Only</emphasis> the "Basic" authentication method is supported. See the