[DOC-CVS] [doc-en] master: Fix grammar in strings functions (#5726)
[email protected] (Kamil Tekiela via GitHub) Fri, 31 Jul 2026 10:38:40 +0000
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Kamil Tekiela (kamil-tekiela)
Committer: GitHub (web-flow)
Pusher: kamil-tekiela
Date: 2026-07-31T11:38:37+01:00
Commit: https://github.com/php/doc-en/commit/46efd980535e8de6f6639a0015d2ad1e4bfe9d00
Raw diff: https://github.com/php/doc-en/commit/46efd980535e8de6f6639a0015d2ad1e4bfe9d00.diff
Fix grammar in strings functions (#5726)
Changed paths:
M reference/strings/functions/crypt.xml
M reference/strings/functions/get-html-translation-table.xml
M reference/strings/functions/localeconv.xml
M reference/strings/functions/ltrim.xml
M reference/strings/functions/quoted-printable-decode.xml
M reference/strings/functions/setlocale.xml
M reference/strings/functions/str-repeat.xml
M reference/strings/functions/stripos.xml
M reference/strings/functions/strncasecmp.xml
M reference/strings/functions/strpbrk.xml
M reference/strings/functions/strripos.xml
Diff:
diff --git a/reference/strings/functions/crypt.xml b/reference/strings/functions/crypt.xml
index f96bbdb62c6d..b98a6e152431 100644
--- a/reference/strings/functions/crypt.xml
+++ b/reference/strings/functions/crypt.xml
@@ -31,14 +31,14 @@
<para>
<function>password_hash</function> uses a strong hash, generates a strong salt, and applies proper rounds automatically. <function>password_hash</function> is a simple <function>crypt</function> wrapper and compatible with existing password hashes. Use of <function>password_hash</function> is encouraged.
</para>
- <para>
+ <simpara>
The hash type is triggered by the salt argument.
If no salt is provided, PHP will
- auto-generate either a standard two character (DES) salt, or a twelve
- character (MD5), depending on the availability of MD5 crypt(). PHP sets a
+ auto-generate either a standard two character (DES) or a twelve
+ character (MD5) salt, depending on the availability of MD5 crypt(). PHP sets a
constant named <constant>CRYPT_SALT_LENGTH</constant> which indicates the
longest valid salt allowed by the available hashes.
- </para>
+ </simpara>
<para>
The standard DES-based <function>crypt</function> returns the
salt as the first two characters of the output. It also only uses the
diff --git a/reference/strings/functions/get-html-translation-table.xml b/reference/strings/functions/get-html-translation-table.xml
index 19bb955b8ff8..4f91525fb052 100644
--- a/reference/strings/functions/get-html-translation-table.xml
+++ b/reference/strings/functions/get-html-translation-table.xml
@@ -21,14 +21,14 @@
<function>htmlentities</function>.
</para>
<note>
- <para>
+ <simpara>
Special characters can be encoded in several ways. E.g.
<literal>"</literal> can be encoded as <literal>&quot;</literal>,
- <literal>&#34;</literal> or <literal>&#x22</literal>.
+ <literal>&#34;</literal> or <literal>&#x22;</literal>.
<function>get_html_translation_table</function> returns only the form used
by <function>htmlspecialchars</function> and
<function>htmlentities</function>.
- </para>
+ </simpara>
</note>
</refsect1>
diff --git a/reference/strings/functions/localeconv.xml b/reference/strings/functions/localeconv.xml
index f727a0a644d4..169e2d05eb76 100644
--- a/reference/strings/functions/localeconv.xml
+++ b/reference/strings/functions/localeconv.xml
@@ -142,10 +142,10 @@
</tgroup>
</informaltable>
</para>
- <para>
- The <literal>p_sign_posn</literal>, and <literal>n_sign_posn</literal> contain a string
- of formatting options. Each number representing one of the above listed conditions.
- </para>
+ <simpara>
+ The <literal>p_sign_posn</literal> and <literal>n_sign_posn</literal> contain a string
+ of formatting options. Each number represents one of the above listed conditions.
+ </simpara>
<para>
The grouping fields contain arrays that define the way numbers should be
grouped. For example, the monetary grouping field for the nl_NL locale (in
diff --git a/reference/strings/functions/ltrim.xml b/reference/strings/functions/ltrim.xml
index 1a2d35a09b88..0ddd401718fa 100644
--- a/reference/strings/functions/ltrim.xml
+++ b/reference/strings/functions/ltrim.xml
@@ -18,7 +18,7 @@
</simpara>
<simpara>
Without the second parameter,
- <function>mb_ltrim</function> will strip these characters:
+ <function>ltrim</function> will strip these characters:
</simpara>
&strings.stripped.characters;
</refsect1>
diff --git a/reference/strings/functions/quoted-printable-decode.xml b/reference/strings/functions/quoted-printable-decode.xml
index 192e42c5e0b6..3f6e95a60a5a 100644
--- a/reference/strings/functions/quoted-printable-decode.xml
+++ b/reference/strings/functions/quoted-printable-decode.xml
@@ -12,13 +12,13 @@
<type>string</type><methodname>quoted_printable_decode</methodname>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
</methodsynopsis>
- <para>
+ <simpara>
This function returns an 8-bit binary string corresponding to the decoded
quoted printable string (according to <link
xlink:href="&url.rfc;2045">RFC2045</link>, section 6.7, not <link
xlink:href="&url.rfc;2821">RFC2821</link>, section 4.5.2, so additional periods
- are not stripped from the beginning of line).
- </para>
+ are not stripped from the beginning of a line).
+ </simpara>
<para>
This function is similar to <function>imap_qprint</function>, except this
one does not require the IMAP module to work.
diff --git a/reference/strings/functions/setlocale.xml b/reference/strings/functions/setlocale.xml
index 77754db2270c..d390897d0458 100644
--- a/reference/strings/functions/setlocale.xml
+++ b/reference/strings/functions/setlocale.xml
@@ -24,16 +24,16 @@
Sets locale information.
</para>
<warning>
- <para>
+ <simpara>
The locale information is maintained per process, not per thread. If you
- are running PHP on a multithreaded server API
- , you may experience sudden changes in locale settings while a
+ are running PHP on a multithreaded server API,
+ you may experience sudden changes in locale settings while a
script is running, though the script itself never called
<function>setlocale</function>. This happens due to other scripts
running in different threads of the same process at the same time,
changing the process-wide locale using <function>setlocale</function>.
On Windows, locale information is maintained per thread as of PHP 7.0.5.
- </para>
+ </simpara>
</warning>
</refsect1>
diff --git a/reference/strings/functions/str-repeat.xml b/reference/strings/functions/str-repeat.xml
index a1f8c44c8232..0d4ca99d2310 100644
--- a/reference/strings/functions/str-repeat.xml
+++ b/reference/strings/functions/str-repeat.xml
@@ -34,10 +34,10 @@
<varlistentry>
<term><parameter>times</parameter></term>
<listitem>
- <para>
- Number of time the <parameter>string</parameter> string should be
+ <simpara>
+ Number of times the <parameter>string</parameter> string should be
repeated.
- </para>
+ </simpara>
<para>
<parameter>times</parameter> has to be greater than or equal to 0.
If the <parameter>times</parameter> is set to 0, the function
diff --git a/reference/strings/functions/stripos.xml b/reference/strings/functions/stripos.xml
index 65890b9a08ed..4aa28a444bbf 100644
--- a/reference/strings/functions/stripos.xml
+++ b/reference/strings/functions/stripos.xml
@@ -18,10 +18,10 @@
Find the numeric position of the first occurrence of
<parameter>needle</parameter> in the <parameter>haystack</parameter> string.
</para>
- <para>
- Unlike the <function>strpos</function>, <function>stripos</function> is
+ <simpara>
+ Unlike <function>strpos</function>, <function>stripos</function> is
case-insensitive.
- </para>
+ </simpara>
</refsect1>
<refsect1 role="parameters">
diff --git a/reference/strings/functions/strncasecmp.xml b/reference/strings/functions/strncasecmp.xml
index ac70bc5e78bb..ce4224f9d949 100644
--- a/reference/strings/functions/strncasecmp.xml
+++ b/reference/strings/functions/strncasecmp.xml
@@ -87,7 +87,7 @@
$var1 = 'Hello John';
$var2 = 'hello Doe';
if (strncasecmp($var1, $var2, 5) === 0) {
- echo 'First 5 characters of $var1 and $var2 are equals in a case-insensitive string comparison';
+ echo 'First 5 characters of $var1 and $var2 are equal in a case-insensitive string comparison';
}
?>
]]>
diff --git a/reference/strings/functions/strpbrk.xml b/reference/strings/functions/strpbrk.xml
index a9d877bdb9eb..313c60092164 100644
--- a/reference/strings/functions/strpbrk.xml
+++ b/reference/strings/functions/strpbrk.xml
@@ -13,10 +13,10 @@
<methodparam><type>string</type><parameter>string</parameter></methodparam>
<methodparam><type>string</type><parameter>characters</parameter></methodparam>
</methodsynopsis>
- <para>
+ <simpara>
<function>strpbrk</function> searches the <parameter>string</parameter>
- string for a <parameter>characters</parameter>.
- </para>
+ string for any of the characters in <parameter>characters</parameter>.
+ </simpara>
</refsect1>
<refsect1 role="parameters">
diff --git a/reference/strings/functions/strripos.xml b/reference/strings/functions/strripos.xml
index 44a249281e62..76d42e26f2bd 100644
--- a/reference/strings/functions/strripos.xml
+++ b/reference/strings/functions/strripos.xml
@@ -18,10 +18,10 @@
Find the numeric position of the last occurrence of
<parameter>needle</parameter> in the <parameter>haystack</parameter> string.
</para>
- <para>
- Unlike the <function>strrpos</function>, <function>strripos</function> is
+ <simpara>
+ Unlike <function>strrpos</function>, <function>strripos</function> is
case-insensitive.
- </para>
+ </simpara>
</refsect1>
<refsect1 role="parameters">