[doc-en] master: Fixing typos mad grammars in faq directory (#5898)
| From: | Chun-Sheng, Li via GitHub | Date: | Wed, 30 Sep 2026 13:55:40 +0000 |
| Subject: | [doc-en] master: Fixing typos mad grammars in faq directory (#5898) | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-23795@lists.php.net to get a copy of this message | ||
Author: Chun-Sheng, Li (peter279k)
Committer: GitHub (web-flow)
Pusher: lacatoire
Date: 2026-09-30T15:55:36+02:00
Commit: https://github.com/php/doc-en/commit/7ab54091abc99257ad20ebe4d69f5981b2d22116
Raw diff: https://github.com/php/doc-en/commit/7ab54091abc99257ad20ebe4d69f5981b2d22116.diff
Fixing typos mad grammars in faq directory (#5898)
Changed paths:
M faq/build.xml
M faq/com.xml
M faq/databases.xml
M faq/general.xml
M faq/html.xml
M faq/installation.xml
M faq/mailinglist.xml
M faq/misc.xml
M faq/obtaining.xml
M faq/passwords.xml
M faq/using.xml
Diff:
diff --git a/faq/build.xml b/faq/build.xml
index b05eff7693e8..37dfdcd41891 100644
--- a/faq/build.xml
+++ b/faq/build.xml
@@ -4,10 +4,10 @@
<title>Build Problems</title>
<titleabbrev>Build Problems</titleabbrev>
- <para>
- This section gathers most common errors that occur at
+ <simpara>
+ This section gathers the most common errors that occur at
build time.
- </para>
+ </simpara>
<qandaset>
<qandaentry xml:id="faq.build.configure">
@@ -88,12 +88,12 @@
</para>
</question>
<answer>
- <para>
+ <simpara>
This error usually comes up when one compiles the Apache
core program as a DSO library for shared usage. Try to
- reconfigure apache, making sure to use at least the
+ reconfigure Apache, making sure to use at least the
following flags:
- </para>
+ </simpara>
<para>
<screen>
--enable-shared=max --enable-rule=SHARED_CORE
@@ -214,13 +214,13 @@
</listitem>
<listitem>
<simpara>
- Make sure you have added the correct Mime Type to one of your
- <literal>Apache .conf</literal> files. It should be:
+ Make sure you have added the correct MIME type to one of your
+ <literal>Apache .conf</literal> files. It should be:
<literal>AddType application/x-httpd-php .php</literal>
</simpara>
<simpara>
Also make sure that this AddType line is not hidden away inside a
- <Virtualhost> or <Directory> block which would
+ <VirtualHost> or <Directory> block which would
prevent it from applying to the location of your test script.
</simpara>
</listitem>
@@ -241,18 +241,18 @@
<qandaentry xml:id="faq.build.activate-module">
<question>
- <para>
- It says to use: <literal>--activate-module=src/modules/php4/libphp4.a</literal>,
- but that file doesn't exist, so I changed it to
- <literal>--activate-module=src/modules/php4/libmodphp4.a</literal> and it
+ <simpara>
+ It says to use: <literal>--activate-module=src/modules/php4/libphp4.a</literal>,
+ but that file doesn't exist, so I changed it to
+ <literal>--activate-module=src/modules/php4/libmodphp4.a</literal> and it
doesn't work!? What's going on?
- </para>
+ </simpara>
</question>
<answer>
- <para>
+ <simpara>
Note that the <filename>libphp4.a</filename> file is not supposed to exist. The
- apache process will create it!
- </para>
+ Apache process will create it!
+ </simpara>
</answer>
</qandaentry>
@@ -415,7 +415,7 @@ $ gcc -E test.c >/dev/null
</question>
<answer>
<para>
- Either you look at config.nice file, in the source tree of your current PHP
+ Either you look at the config.nice file, in the source tree of your current PHP
installation or, if this is not available, you simply run a
<programlisting role="php">
<![CDATA[
@@ -436,19 +436,19 @@ $ gcc -E test.c >/dev/null
</para>
</question>
<answer>
- <para>
- Make sure your GD library and PHP are linked against the same depending
+ <simpara>
+ Make sure your GD library and PHP are linked against the same dependency
libraries (e.g. libpng).
- </para>
+ </simpara>
</answer>
</qandaentry>
<qandaentry xml:id="faq.installation.needgnu">
<question>
- <para>
- When compiling PHP I seemingly get random errors, like it hangs.
+ <simpara>
+ When compiling PHP I seemingly get random errors, such as it hanging.
I'm using Solaris if that matters.
- </para>
+ </simpara>
</question>
<answer>
<para>
diff --git a/faq/com.xml b/faq/com.xml
index 1acfa01097f1..a9532946df62 100644
--- a/faq/com.xml
+++ b/faq/com.xml
@@ -30,30 +30,30 @@
</para>
</question>
<answer>
- <para>
+ <simpara>
There are dozens of VARIANT types and combinations of them. Most of them are already
supported but
a few still have to be implemented.
- Arrays are not completely supported. Only single dimensional indexed
- only arrays can be passed between PHP and COM.
+ Arrays are not completely supported. Only single-dimensional, indexed-only
+ arrays can be passed between PHP and COM.
If you find other types that aren't supported, please report them as a bug (if not
already reported)
and provide as much information as available.
- </para>
+ </simpara>
</answer>
</qandaentry>
<qandaentry xml:id="faq.com.q3">
<question>
- <para>
- Is it possible manipulate visual objects in PHP?
- </para>
+ <simpara>
+ Is it possible to manipulate visual objects in PHP?
+ </simpara>
</question>
<answer>
- <para>
- Generally it is, but as PHP is mostly used as a web scripting language it runs in the web
servers context, thus
- visual objects will never appear on the servers desktop.
+ <simpara>
+ Generally it is, but as PHP is mostly used as a web scripting language it runs in the web
server's context, thus
+ visual objects will never appear on the server's desktop.
If you use PHP for application scripting e.g. in conjunction with PHP-GTK there is no
limitation in accessing and
manipulating visual objects through COM.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -130,15 +130,15 @@
<qandaentry xml:id="faq.com.q8">
<question>
- <para>
- How can I run COM object from remote server?
- </para>
+ <simpara>
+ How can I run a COM object from remote server?
+ </simpara>
</question>
<answer>
- <para>
- Exactly like you run local objects. You only have to pass the IP of the remote machine as
second parameter to
+ <simpara>
+ Exactly like you run local objects. You only have to pass the IP of the remote machine as the
second parameter to
the COM constructor.
- </para>
+ </simpara>
<para>
Make sure that you have set
<link
linkend="ini.com.allow-dcom">com.allow_dcom</link><literal>=</literal>&true;
@@ -168,11 +168,11 @@
</para>
</question>
<answer>
- <para>
- This has nothing to do with PHP. ActiveX objects are loaded on client side if they are
requested
+ <simpara>
+ This has nothing to do with PHP. ActiveX objects are loaded on the client side if they are
requested
by the HTML document. There is no relation to the PHP script and therefore there is no direct
server side interaction possible.
- </para>
+ </simpara>
</answer>
</qandaentry>
<qandaentry xml:id="faq.com.q11">
@@ -201,9 +201,9 @@ $word = new COM("C:\docs\word.doc");
</qandaentry>
<qandaentry xml:id="faq.com.q12">
<question>
- <para>
- Is there a way to handle an event sent from COM object?
- </para>
+ <simpara>
+ Is there a way to handle an event sent from a COM object?
+ </simpara>
</question>
<answer>
<para>
@@ -223,9 +223,9 @@ $word = new COM("C:\docs\word.doc");
</para>
</question>
<answer>
- <para>
- The answer is as simple as unsatisfying. We don't know exactly but we think you can do
nothing.
- </para>
+ <simpara>
+ The answer is as simple as it is unsatisfying. We don't know exactly but we think you
can do nothing.
+ </simpara>
</answer>
</qandaentry>
@@ -245,10 +245,10 @@ $word = new COM("C:\docs\word.doc");
<qandaentry xml:id="faq.com.q15">
<question>
- <para>
+ <simpara>
If PHP can manipulate COM objects, can we imagine to use
- MTS to manage components resources, in conjunction with PHP?
- </para>
+ MTS to manage components' resources, in conjunction with PHP?
+ </simpara>
</question>
<answer>
<para>
diff --git a/faq/databases.xml b/faq/databases.xml
index ea36a71202df..b8574f19bf7b 100644
--- a/faq/databases.xml
+++ b/faq/databases.xml
@@ -4,11 +4,11 @@
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>
- <para>
- This section holds common questions about relation between
+ <simpara>
+ This section holds common questions about the relation between
PHP and databases. Yes, PHP can access virtually any
database available today.
- </para>
+ </simpara>
<qandaset>
<qandaentry xml:id="faq.databases.mssql">
@@ -47,7 +47,7 @@
Another alternative is to use an SQL server that has
Windows ODBC drivers and use that to store the data, which you can
then access from Microsoft Access (using ODBC) and PHP (using the
- built in drivers), or to use an intermediary file format that Access
+ built-in drivers), or to use an intermediary file format that Access
and PHP both understand, such as flat files or dBase databases.
On this point Tim Hayes from OpenLink software writes:
<blockquote>
@@ -60,11 +60,11 @@
</para>
</blockquote>
</para>
- <para>
+ <simpara>
One option that has proved successful is to use MySQL and its
- MyODBC drivers on Windows and synchronizing the databases. Steve Lawrence
+ MyODBC drivers on Windows and synchronize the databases. Steve Lawrence
writes:
- </para>
+ </simpara>
<para>
<itemizedlist>
<listitem>
@@ -88,7 +88,7 @@
<simpara>
Create a user or system dsn in your ODBC administrator, located in the
control panel. Make up a dsn name, enter your hostname, user name, password,
- port, etc for you MySQL database configured in step 1.
+ port, etc. for your MySQL database configured in step 1.
</simpara>
</listitem>
<listitem>
diff --git a/faq/general.xml b/faq/general.xml
index d03ba042f732..6fa9e0bc3cbd 100644
--- a/faq/general.xml
+++ b/faq/general.xml
@@ -32,16 +32,16 @@
<para>What does PHP stand for?</para>
</question>
<answer>
- <para>
+ <simpara>
PHP stands for <emphasis>PHP: Hypertext Preprocessor</emphasis>.
This confuses many people because the first word of the acronym is
the acronym. This type of acronym is called a recursive acronym.
For more information, the curious can visit
- <link xlink:href="&url.foldoc;">Free On-Line Dictionary of
Computing</link>
+ <link xlink:href="&url.foldoc;">the Free On-line Dictionary of
Computing</link>
or the
<link xlink:href="&url.wiki.recursive-acronym;">Wikipedia entry on
recursive acronyms</link>.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -50,17 +50,17 @@
<para>What is the relation between the versions?</para>
</question>
<answer>
- <para>
+ <simpara>
PHP/FI 2.0 is an early and no longer supported version of PHP. PHP 3
is the successor to PHP/FI 2.0 and is a lot nicer. PHP 8 is the current
generation of PHP, which uses the Zend
- engine 4 which, among other things, offers many additional
+ engine 4, which, among other things, offers many additional
<link linkend="language.oop5">OOP</link> features.
- </para>
+ </simpara>
</answer>
</qandaentry>
- <qandaentry xml:id="faq.general.running-concurent">
+ <qandaentry xml:id="faq.general.running-concurrent">
<question>
<para>Can I run several versions of PHP at the same time?</para>
</question>
diff --git a/faq/html.xml b/faq/html.xml
index d15e76ceef47..2be98c03f006 100644
--- a/faq/html.xml
+++ b/faq/html.xml
@@ -56,10 +56,10 @@
<note>
<simpara>
It is wrong to <function>urlencode</function>
- <varname>$data</varname>, because it's the browsers responsibility to
+ <varname>$data</varname>, because it's the browser's responsibility
to
<function>urlencode</function> the data. All popular browsers do that
correctly. Note that this will happen regardless of the method (i.e.,
- GET or POST). You'll only notice this in case of GET request though,
+ GET or POST). You'll only notice this in case of a GET request though,
because POST requests are usually hidden.
</simpara>
</note>
@@ -100,7 +100,7 @@
</example>
<note>
<simpara>
- In fact you are faking a HTML GET request, therefore it's necessary to
+ In fact you are faking an HTML GET request, therefore it's necessary to
manually <function>urlencode</function> the data.
</simpara>
</note>
@@ -127,12 +127,12 @@
<qandaentry xml:id="faq.html.form-image">
<question>
- <para>
+ <simpara>
I'm trying to use an <input type="image"> tag, but
the <varname>$foo.x</varname> and <varname>$foo.y</varname> variables
- aren't available. <varname>$_GET['foo.x']</varname> isn't
existing
+ aren't available. <varname>$_GET['foo.x']</varname> doesn't
exist
either. Where are they?
- </para>
+ </simpara>
</question>
<answer>
<para>
@@ -166,7 +166,7 @@
<qandaentry xml:id="faq.html.arrays">
<question>
- <para>How do I create arrays in a HTML <form>?</para>
+ <simpara>How do I create arrays in an HTML <form>?</simpara>
</question>
<answer>
<para>
@@ -193,7 +193,7 @@
<input name="MyOtherArray[]" />
]]>
</programlisting>
- This produces two arrays, MyArray and MyOtherArray, that gets sent
+ This produces two arrays, MyArray and MyOtherArray, that get sent
to the PHP script. It's also possible to assign specific keys
to your arrays:
<programlisting role="html">
@@ -238,7 +238,7 @@
are all passed with the same widget name. I.e.
<programlisting role="html">
<![CDATA[
-<select name="var" multiple="yes">
+<select name="var" multiple="multiple">
]]>
</programlisting>
Each selected option will arrive at the action handler as:
@@ -253,7 +253,7 @@ var=option3
should be used:
<programlisting role="html">
<![CDATA[
-<select name="var[]" multiple="yes">
+<select name="var[]" multiple="multiple">
]]>
</programlisting>
This tells PHP to treat <varname>$var</varname> as an array and
@@ -267,7 +267,7 @@ var=option3
<para>
Note that if you are using JavaScript the <literal>[]</literal>
on the element name might cause you problems when you try to
- refer to the element by name. Use it's numerical form element
+ refer to the element by name. Use its numeric form element
ID instead, or enclose the variable name in single quotes and
use that as the index to the elements array, for example:
<programlisting>
@@ -312,7 +312,7 @@ if (isset($_GET['width']) AND isset($_GET['height'])) {
} else {
// pass the geometry variables
// (preserve the original query string
- // -- post variables will need to handled differently)
+ // -- post variables will need to be handled differently)
echo "<script language='javascript'>\n";
echo "
location.href=\"{$_SERVER['SCRIPT_NAME']}?{$_SERVER['QUERY_STRING']}"
diff --git a/faq/installation.xml b/faq/installation.xml
index fc4d80ba2c7a..785428067271 100644
--- a/faq/installation.xml
+++ b/faq/installation.xml
@@ -64,14 +64,14 @@
<programlisting role="shell">
--with-config-file-scan-dir=PATH
</programlisting>
- <para>
+ <simpara>
On Windows the default path for the &php.ini; file is the Windows
directory. If you're using the Apache webserver, &php.ini; is first
- searched in the Apaches install directory, e.g. <filename>c:\program
+ searched in the Apache install directory, e.g. <filename>c:\program
files\apache group\apache</filename>. This way you can have
different &php.ini; files for different versions of Apache on the same
machine.
- </para>
+ </simpara>
<para>
See also the chapter about the <link
linkend="configuration.file">configuration file</link>.
@@ -156,10 +156,10 @@
<qandaentry xml:id="faq.installation.processing">
<question>
- <para>
- Unix: I installed PHP using RPMS, but Apache isn't processing the
+ <simpara>
+ Unix: I installed PHP using RPMs, but Apache isn't processing the
PHP pages! What's going on here?
- </para>
+ </simpara>
</question>
<answer>
<para>
@@ -199,12 +199,12 @@ AddType application/x-httpd-php .php
</para>
</question>
<answer>
- <para>
+ <simpara>
No, PHP works fine with the FrontPage extensions. The problem
is that the FrontPage patch modifies several Apache structures,
that PHP relies on. Recompiling PHP (using 'make clean ; make')
after the FP patch is applied would solve the problem.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -229,11 +229,11 @@ AddType application/x-httpd-php .php
<qandaentry xml:id="faq.installation.500error">
<question>
- <para>
- Unix/Windows: I have installed PHP, but when try to
+ <simpara>
+ Unix/Windows: I have installed PHP, but when I try to
access a PHP script file via my browser, I get a
server 500 error.
- </para>
+ </simpara>
</question>
<answer>
<para>
@@ -357,11 +357,11 @@ cgi error:
<qandaentry xml:id="faq.installation.forceredirect">
<question>
- <para>
+ <simpara>
When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami,
I get the following error: <literal>Security Alert! PHP CGI
- cannot be accessed directly.</literal>.
- </para>
+ cannot be accessed directly.</literal>
+ </simpara>
</question>
<answer>
<para>
@@ -507,8 +507,8 @@ cgi error:
</question>
<answer>
<para>
- If links to PHP files include extension, everything works perfect. This
- FAQ is only for the case when links to PHP files don't include extension
+ If links to PHP files include extension, everything works perfectly. This
+ FAQ is only for the case when links to PHP files don't include an extension
and you want to use content negotiation to choose PHP files from URL
with no extension.
In this case, replace the line <literal>AddType application/x-httpd-php
@@ -527,9 +527,9 @@ AddType text/html php
<qandaentry xml:id="faq.installation.requestmethods">
<question>
- <para>
- Is PHP limited to process GET and POST request methods only?
- </para>
+ <simpara>
+ Is PHP limited to processing GET and POST request methods only?
+ </simpara>
</question>
<answer>
<para>
diff --git a/faq/mailinglist.xml b/faq/mailinglist.xml
index 5cc5fcfc1aea..fb20e953cccc 100644
--- a/faq/mailinglist.xml
+++ b/faq/mailinglist.xml
@@ -70,19 +70,19 @@
</para>
</question>
<answer>
- <para>
+ <simpara>
The most common reason folks have a hard time unsubscribing from our
mailing lists is due to the use of mail forwarders. For example, if
your email address is <literal>elephpant@example.com</literal>, but you
subscribed to the mailing list with the forwarder
- <literal>php-lists@example.com</literal> and forward that to
+ <literal>php-lists@example.com</literal> and forwarded that to
<literal>elephpant@example.com</literal>, attempting to unsubscribe
<literal>elephpant@example.com</literal> will not work, as that address
is not even known to our systems. Instead, you will need to unsubscribe
the address to which the mail is being sent, by sending an email from
that address — in this example,
<literal>php-lists@example.com</literal>.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -121,15 +121,15 @@
interest that you use the list as a last resort, when you have
exhausted all other avenues.
</para>
- <para>
+ <simpara>
Before you post to the list please have a look in this FAQ and the
manual to see if you can find the help there. If there is nothing
to be found there try out the mailing list archives (see above).
- If you're having problem with installing or configuring PHP, please
- read through all included documentation and README's. If you still
+ If you're having problems with installing or configuring PHP, please
+ read through all included documentation and READMEs. If you still
can't find any information that helps you out, you're more than
welcome to use the appropriate mailing list.
- </para>
+ </simpara>
<para>
To ensure that you receive the best responses (and to reduce the
likelihood of frustrating your fellow developers), please be sure to
@@ -173,11 +173,11 @@
believe is immediately relevant to your present issue, and be prepared
to provide more information upon request.
</para>
- <para>
+ <simpara>
Another important thing to remember is to summarize your problem
on the subject line. A subject like "HELP MEEEE!!!" or "What is the
- problem here?" will be ignored by the majority of the readers.
- </para>
+ problem here?" will be ignored by the majority of readers.
+ </simpara>
<para>
And lastly, you're encouraged to read the paper on
<link xlink:href="&url.smart.questions;">How To Ask Questions The
diff --git a/faq/misc.xml b/faq/misc.xml
index 755bc61b1143..72beb29d3da2 100644
--- a/faq/misc.xml
+++ b/faq/misc.xml
@@ -12,9 +12,9 @@
<qandaset>
<qandaentry xml:id="faq.misc.bz2">
<question>
- <para>
- How can I handle the bz2 compressed manuals on Windows?
- </para>
+ <simpara>
+ How can I handle the bz2-compressed manuals on Windows?
+ </simpara>
</question>
<answer>
<para>
@@ -22,32 +22,32 @@
<link xlink:href="&url.bzip2;">download</link> the command line
tool
from Redhat (please find further information below).
</para>
- <para>
- If you would not like to use a command line tool, you can try free
- tools like <link xlink:href="&url.stuffit;">Stuffit
Expander</link>,
+ <simpara>
+ If you would not like to use a command line tool, you can try free
+ tools like <link xlink:href="&url.stuffit;">Stuffit
Expander</link>,
<link xlink:href="&url.ultimatezip;">UltimateZip</link>,
<link xlink:href="&url.7zip;">7-Zip</link>, or
<link xlink:href="&url.quickzip;">Quick Zip</link>. If you
have tools like <link xlink:href="&url.winrar;">WinRAR</link> or
<link xlink:href="&url.powerarchiver;">Power Archiver</link>, you
can
- easily decompress the bz2 files with it. If you use Total Commander
+ easily decompress the bz2 files with them. If you use Total Commander
(formerly Windows Commander),
- a bz2 plugin for that program is available freely from the
- <link xlink:href="&url.wincmd;">Total Commander</link> site.
- </para>
+ a bz2 plugin for that program is freely available from the
+ <link xlink:href="&url.wincmd;">Total Commander</link> site.
+ </simpara>
<para>
The bzip2 command line tool from Redhat:
</para>
- <para>
+ <simpara>
Win2k Sp2 users grab the latest version 1.0.2, all
- other Windows user should grab version 1.00. After downloading rename
- the executable to bzip2.exe. For convenience put it into a directory in
+ other Windows users should grab version 1.00. After downloading, rename
+ the executable to bzip2.exe. For convenience, put it into a directory in
your path, e.g. C:\Windows where C represents your Windows installation
drive.
- </para>
+ </simpara>
<para>
Note: lang stands for your language and x for the desired format, e.g.: pdf.
- To uncompress the php_manual_lang.x.bz2 follow these simple instructions:
+ To decompress the php_manual_lang.x.bz2 file, follow these simple instructions:
<itemizedlist>
<listitem>
<simpara>open a command prompt window</simpara>
@@ -66,13 +66,13 @@
</listitem>
</itemizedlist>
</para>
- <para>
- In case you downloaded the php_manual_lang.tar.bz2 with many html-files
- in it, the procedure is the same. The only difference is that you got a file
+ <simpara>
+ In case you downloaded the php_manual_lang.tar.bz2 with many HTML files
+ in it, the procedure is the same. The only difference is that you get a file
php_manual_lang.tar. The tar format is known to be treated with most
common archivers on Windows like e.g.
<link xlink:href="&url.winzip;">WinZip</link>.
- </para>
+ </simpara>
</answer>
</qandaentry>
</qandaset>
diff --git a/faq/obtaining.xml b/faq/obtaining.xml
index 0878f7d728cf..801627d92b07 100644
--- a/faq/obtaining.xml
+++ b/faq/obtaining.xml
@@ -31,15 +31,15 @@
<para>Are pre-compiled binary versions available?</para>
</question>
<answer>
- <para>
+ <simpara>
We only distribute precompiled binaries for Windows systems,
as we are not able to compile PHP for every major Linux/Unix
- platform with every extension combination. Also note, that
+ platform with every extension combination. Also note that
many Linux distributions come with PHP built in these days.
Windows binaries can be downloaded from our <link
xlink:href="&url.php.downloads;">Downloads</link> page, for Linux
binaries, please visit your distribution's website.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -84,7 +84,7 @@
</listitem>
<listitem>
<simpara>
- <link xlink:href="&url.net-snmp;">SNMP* (Unix): </link>.
+ <link xlink:href="&url.net-snmp;">SNMP* (Unix)</link>.
</simpara>
</listitem>
<listitem>
@@ -115,12 +115,12 @@
</listitem>
<listitem>
<simpara>
- <link xlink:href="&url.freetype;">FreeType (libttf):</link>.
+ <link xlink:href="&url.freetype;">FreeType (libttf)</link>.
</simpara>
</listitem>
<listitem>
<simpara>
- <link xlink:href="&url.zlib;">ZLib (Unix/Win32)</link>.
+ <link xlink:href="&url.zlib;">zlib (Unix/Win32)</link>.
</simpara>
</listitem>
<listitem>
@@ -185,10 +185,10 @@
</qandaentry>
<qandaentry xml:id="faq.obtaining.compilent">
<question>
- <para>
+ <simpara>
I got the latest version of the PHP source code from the Git
- repository on my Windows machine, what do I need to compile it?
- </para>
+ repository on my Windows machine; what do I need to compile it?
+ </simpara>
</question>
<answer>
<para>
@@ -213,12 +213,12 @@
<para>What does thread safety mean when downloading PHP?</para>
</question>
<answer>
- <para>
- Thread Safety means that binary can work in a multithreaded webserver
- context, such as Apache 2 on Windows. Thread Safety works by creating
- a local storage copy in each thread, so that the data won't collide
+ <simpara>
+ Thread Safety means that the binary can work in a multithreaded webserver
+ context, such as Apache 2 on Windows. Thread Safety works by creating
+ a local storage copy in each thread, so that the data won't collide
with another thread.
- </para>
+ </simpara>
<para>
So what do I choose? If you choose to run PHP as a CGI binary, then
you won't need thread safety, because the binary is invoked at each
diff --git a/faq/passwords.xml b/faq/passwords.xml
index 805693bccc96..2c3086e7d568 100644
--- a/faq/passwords.xml
+++ b/faq/passwords.xml
@@ -71,7 +71,7 @@
<answer>
<simpara>
When hashing passwords, the two most important considerations are the
- computational expense, and the salt. The more computationally expensive
+ computational expense and the salt. The more computationally expensive
the hashing algorithm, the longer it will take to brute force its
output.
</simpara>
@@ -112,7 +112,7 @@
a rainbow table.
</simpara>
<simpara>
- In more simple terms, a salt is a bit of additional data which makes
+ In simpler terms, a salt is a bit of additional data which makes
hashes significantly more difficult to crack. There are a number of
services online which provide extensive lists of pre-computed hashes, as
well as the original input for those hashes. The use of a salt makes it
@@ -126,7 +126,7 @@
</simpara>
</answer>
</qandaentry>
- <qandaentry xml:id="faq.password.storing-salts">
+ <qandaentry xml:id="faq.passwords.storing-salts">
<question>
<simpara>
How are salts stored?
diff --git a/faq/using.xml b/faq/using.xml
index 09599c19ab8b..1a91f602ba53 100644
--- a/faq/using.xml
+++ b/faq/using.xml
@@ -47,7 +47,7 @@
PHP offers many <link linkend="language.variables.predefined">
predefined variables</link>, like the superglobal
<varname>$_POST</varname>.
You may loop through <varname>$_POST</varname>
- as it's an associate array of all POSTed values. For example, let's
+ as it's an associative array of all POSTed values. For example, let's
simply loop through it with &foreach;,
check for <function>empty</function> values,
and print them out.
@@ -91,15 +91,15 @@ if (empty($empty)) {
</para>
</question>
<answer>
- <para>
+ <simpara>
Assuming this is for a database, use the escaping mechanism that
comes with the database. For example, use
<function>mysql_real_escape_string</function> with MySQL and
- <function>pg_escape_string</function> with PostgreSQL. There is
+ <function>pg_escape_string</function> with PostgreSQL. There are
also the generic <function>addslashes</function> and
- <function>stripslashes</function> functions, that are more
+ <function>stripslashes</function> functions that are more
common with older PHP code.
- </para>
+ </simpara>
<para>
Manually escaping values is error-prone and depends on context.
Prefer using database APIs that support prepared statements and
@@ -179,16 +179,16 @@ echo "myfunc($variable) = " . myfunc($variable);
</para>
</question>
<answer>
- <para>
+ <simpara>
The functions <function>header</function>,
<function>setcookie</function>,
and the <link linkend="ref.session">session
functions</link> need to add headers to the output stream but headers
can only be sent before all other content. There can be no output
before using these functions, output such as HTML. The function
- <function>headers_sent</function> will check if your script has already
+ <function>headers_sent</function> will check whether your script has already
sent headers and see also the <link linkend="ref.outcontrol">Output Control
functions</link>.
- </para>
+ </simpara>
</answer>
</qandaentry>
@@ -254,19 +254,19 @@ foreach ($headers as $name => $content) {
</para>
</question>
<answer>
- <para>
- You have to change the <literal>Go to Internet Information
+ <simpara>
+ You have to go to <literal>Internet Information
Services</literal>. Locate your PHP file and go to its properties.
- Go to the <literal>File Security</literal> tab, <literal>Edit -<
+ Go to the <literal>File Security</literal> tab, <literal>Edit ->
Anonymous access and authentication control</literal>.
- </para>
- <para>
+ </simpara>
+ <simpara>
You can fix the problem either by unticking <literal>Anonymous
- Access</literal> and leaving <literal>Integrated Window
+ Access</literal> and leaving <literal>Integrated Windows
Authentication</literal> ticked, or, by ticking <literal>Anonymous
- Access</literal> and editing the user as he may not have the access
- right.
- </para>
+ Access</literal> and editing the user, as it may not have the access
+ rights.
+ </simpara>
</answer>
</qandaentry>
@@ -293,13 +293,13 @@ foreach ($headers as $name => $content) {
<qandaentry xml:id="faq.using.variables">
<question>
- <para>
- Where can I find a complete list of variables are available to me
+ <simpara>
+ Where can I find a complete list of variables that are available to me
in PHP?
- </para>
+ </simpara>
</question>
<answer>
- <para>
+ <simpara>
Read the manual page on <link linkend="language.variables.predefined">
predefined variables</link> as it includes a partial list of predefined
variables available to your script. A complete list of available
@@ -307,8 +307,8 @@ foreach ($headers as $name => $content) {
<function>phpinfo</function> function. Be sure to read the manual
section on <link linkend="language.variables.external">variables from
outside of PHP</link> as it describes common scenarios for
- external variables, like from a HTML form, a Cookie, and the URL.
- </para>
+ external variables, like those from an HTML form, a Cookie, and the URL.
+ </simpara>
</answer>
</qandaentry>
@@ -339,16 +339,16 @@ foreach ($headers as $name => $content) {
</para>
</question>
<answer>
- <para>
+ <simpara>
The available options are K (for Kilobytes), M (for Megabytes) and G (for
Gigabytes), and are all case-insensitive.
- Anything else assumes bytes. <literal>1M</literal> equals one Megabyte or
+ Anything else assumes bytes. <literal>1M</literal> equals one megabyte or
<literal>1048576</literal> bytes. <literal>1K</literal> equals one
- Kilobyte or <literal>1024</literal> bytes. These shorthand notations may
+ kilobyte or <literal>1024</literal> bytes. These shorthand notations may
be used in &php.ini; and in the <function>ini_set</function> function.
Note that the numeric value is cast to <type>int</type>;
for instance, <literal>0.5M</literal> is interpreted as
<literal>0</literal>.
- </para>
+ </simpara>
<note>
<title>kilobyte versus kibibyte</title>
<para>