Skip to content

Commit f97bd2d

Browse files
authored
Sync pcntl_waitid and strripos function (#999)
1 parent ba30b89 commit f97bd2d

File tree

2 files changed

+32
-7
lines changed

2 files changed

+32
-7
lines changed

reference/pcntl/functions/pcntl-waitid.xml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 8e31067f1aa8fa219cc1de11abb26ab81e5a2be0 Maintainer: Luffy Status: ready -->
3+
<!-- EN-Revision: 95d05546430b9e5db225dd42a0d285b870f0da42 Maintainer: Luffy Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
55
<refentry xml:id="function.pcntl-waitid" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -287,6 +287,28 @@
287287
</table>
288288
</refsect1>
289289

290+
<refsect1 role="changelog">
291+
&reftitle.changelog;
292+
<informaltable>
293+
<tgroup cols="2">
294+
<thead>
295+
<row>
296+
<entry>&Version;</entry>
297+
<entry>&Description;</entry>
298+
</row>
299+
</thead>
300+
<tbody>
301+
<row>
302+
<entry>8.5.0</entry>
303+
<entry>
304+
增加了 <parameter>resource_usage</parameter>。
305+
</entry>
306+
</row>
307+
</tbody>
308+
</tgroup>
309+
</informaltable>
310+
</refsect1>
311+
290312
<refsect1 role="seealso">
291313
&reftitle.seealso;
292314
<para>

reference/strings/functions/strripos.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 4b72b23513caa3a8bc520d459a0417defc7b3880 Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: 95d05546430b9e5db225dd42a0d285b870f0da42 Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.strripos" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -68,7 +68,8 @@
6868
<refsect1 role="returnvalues">
6969
&reftitle.returnvalues;
7070
<para>
71-
返回 needle 相对于 <parameter>haystack</parameter> 字符串的位置(和搜索的方向和偏移量无关)。
71+
返回 <parameter>needle</parameter> 相对于 <parameter>haystack</parameter> 字符串的位置
72+
(与搜索的方向或 <parameter>offset</parameter> 无关)。
7273
<note>
7374
<simpara>
7475
字符串位置从 0 开始,而不是 1。
@@ -131,25 +132,27 @@
131132
<programlisting role="php">
132133
<![CDATA[
133134
<?php
135+
134136
$haystack = 'ababcd';
135137
$needle = 'aB';
136138
137139
$pos = strripos($haystack, $needle);
138140
139141
if ($pos === false) {
140-
echo "Sorry, we did not find ($needle) in ($haystack)";
142+
echo "Sorry, we did not find `$needle` in `$haystack`";
141143
} else {
142144
echo "Congratulations!\n";
143-
echo "We found the last ($needle) in ($haystack) at position ($pos)";
145+
echo "We found the last `$needle` in `$haystack` at position `$pos`";
144146
}
147+
145148
?>
146149
]]>
147150
</programlisting>
148151
&example.outputs;
149152
<screen>
150153
<![CDATA[
151-
Congratulations!
152-
We found the last (aB) in (ababcd) at position (2)
154+
Congratulations!
155+
We found the last `aB` in `ababcd` at position `2`
153156
]]>
154157
</screen>
155158
</example>

0 commit comments

Comments
 (0)