Skip to content

Commit 46efd98

Browse files
Fix grammar in strings functions (php#5726)
1 parent 32184e3 commit 46efd98

11 files changed

Lines changed: 32 additions & 32 deletions

reference/strings/functions/crypt.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<para>
3232
<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.
3333
</para>
34-
<para>
34+
<simpara>
3535
The hash type is triggered by the salt argument.
3636
If no salt is provided, PHP will
37-
auto-generate either a standard two character (DES) salt, or a twelve
38-
character (MD5), depending on the availability of MD5 crypt(). PHP sets a
37+
auto-generate either a standard two character (DES) or a twelve
38+
character (MD5) salt, depending on the availability of MD5 crypt(). PHP sets a
3939
constant named <constant>CRYPT_SALT_LENGTH</constant> which indicates the
4040
longest valid salt allowed by the available hashes.
41-
</para>
41+
</simpara>
4242
<para>
4343
The standard DES-based <function>crypt</function> returns the
4444
salt as the first two characters of the output. It also only uses the

reference/strings/functions/get-html-translation-table.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
<function>htmlentities</function>.
2222
</para>
2323
<note>
24-
<para>
24+
<simpara>
2525
Special characters can be encoded in several ways. E.g.
2626
<literal>"</literal> can be encoded as <literal>&amp;quot;</literal>,
27-
<literal>&amp;#34;</literal> or <literal>&amp;#x22</literal>.
27+
<literal>&amp;#34;</literal> or <literal>&amp;#x22;</literal>.
2828
<function>get_html_translation_table</function> returns only the form used
2929
by <function>htmlspecialchars</function> and
3030
<function>htmlentities</function>.
31-
</para>
31+
</simpara>
3232
</note>
3333
</refsect1>
3434

reference/strings/functions/localeconv.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@
142142
</tgroup>
143143
</informaltable>
144144
</para>
145-
<para>
146-
The <literal>p_sign_posn</literal>, and <literal>n_sign_posn</literal> contain a string
147-
of formatting options. Each number representing one of the above listed conditions.
148-
</para>
145+
<simpara>
146+
The <literal>p_sign_posn</literal> and <literal>n_sign_posn</literal> contain a string
147+
of formatting options. Each number represents one of the above listed conditions.
148+
</simpara>
149149
<para>
150150
The grouping fields contain arrays that define the way numbers should be
151151
grouped. For example, the monetary grouping field for the nl_NL locale (in

reference/strings/functions/ltrim.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</simpara>
1919
<simpara>
2020
Without the second parameter,
21-
<function>mb_ltrim</function> will strip these characters:
21+
<function>ltrim</function> will strip these characters:
2222
</simpara>
2323
&strings.stripped.characters;
2424
</refsect1>

reference/strings/functions/quoted-printable-decode.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<type>string</type><methodname>quoted_printable_decode</methodname>
1313
<methodparam><type>string</type><parameter>string</parameter></methodparam>
1414
</methodsynopsis>
15-
<para>
15+
<simpara>
1616
This function returns an 8-bit binary string corresponding to the decoded
1717
quoted printable string (according to <link
1818
xlink:href="&url.rfc;2045">RFC2045</link>, section 6.7, not <link
1919
xlink:href="&url.rfc;2821">RFC2821</link>, section 4.5.2, so additional periods
20-
are not stripped from the beginning of line).
21-
</para>
20+
are not stripped from the beginning of a line).
21+
</simpara>
2222
<para>
2323
This function is similar to <function>imap_qprint</function>, except this
2424
one does not require the IMAP module to work.

reference/strings/functions/setlocale.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
Sets locale information.
2525
</para>
2626
<warning>
27-
<para>
27+
<simpara>
2828
The locale information is maintained per process, not per thread. If you
29-
are running PHP on a multithreaded server API
30-
, you may experience sudden changes in locale settings while a
29+
are running PHP on a multithreaded server API,
30+
you may experience sudden changes in locale settings while a
3131
script is running, though the script itself never called
3232
<function>setlocale</function>. This happens due to other scripts
3333
running in different threads of the same process at the same time,
3434
changing the process-wide locale using <function>setlocale</function>.
3535
On Windows, locale information is maintained per thread as of PHP 7.0.5.
36-
</para>
36+
</simpara>
3737
</warning>
3838
</refsect1>
3939

reference/strings/functions/str-repeat.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<varlistentry>
3535
<term><parameter>times</parameter></term>
3636
<listitem>
37-
<para>
38-
Number of time the <parameter>string</parameter> string should be
37+
<simpara>
38+
Number of times the <parameter>string</parameter> string should be
3939
repeated.
40-
</para>
40+
</simpara>
4141
<para>
4242
<parameter>times</parameter> has to be greater than or equal to 0.
4343
If the <parameter>times</parameter> is set to 0, the function

reference/strings/functions/stripos.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
Find the numeric position of the first occurrence of
1919
<parameter>needle</parameter> in the <parameter>haystack</parameter> string.
2020
</para>
21-
<para>
22-
Unlike the <function>strpos</function>, <function>stripos</function> is
21+
<simpara>
22+
Unlike <function>strpos</function>, <function>stripos</function> is
2323
case-insensitive.
24-
</para>
24+
</simpara>
2525
</refsect1>
2626

2727
<refsect1 role="parameters">

reference/strings/functions/strncasecmp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
$var1 = 'Hello John';
8888
$var2 = 'hello Doe';
8989
if (strncasecmp($var1, $var2, 5) === 0) {
90-
echo 'First 5 characters of $var1 and $var2 are equals in a case-insensitive string comparison';
90+
echo 'First 5 characters of $var1 and $var2 are equal in a case-insensitive string comparison';
9191
}
9292
?>
9393
]]>

reference/strings/functions/strpbrk.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<methodparam><type>string</type><parameter>string</parameter></methodparam>
1414
<methodparam><type>string</type><parameter>characters</parameter></methodparam>
1515
</methodsynopsis>
16-
<para>
16+
<simpara>
1717
<function>strpbrk</function> searches the <parameter>string</parameter>
18-
string for a <parameter>characters</parameter>.
19-
</para>
18+
string for any of the characters in <parameter>characters</parameter>.
19+
</simpara>
2020
</refsect1>
2121

2222
<refsect1 role="parameters">

0 commit comments

Comments
 (0)