Skip to content

Commit a183d71

Browse files
authored
Sync outdated files (#971)
1 parent 82da3f1 commit a183d71

File tree

13 files changed

+30
-63
lines changed

13 files changed

+30
-63
lines changed

reference/iconv/functions/iconv-strlen.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: ab9a7d2e3dfa9224186abcbd7a43b3af08d1bfdb Maintainer: daijie Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 66eabb01bbef3a6b205b13f8a01d6b5f9460acbf Maintainer: daijie Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.iconv-strlen" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>iconv_strlen</refname>

reference/info/functions/getrusage.xml

Lines changed: 1 addition & 25 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: e947f2e12b1e321d67f6560c5f2884e6d885858f Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: a277389c9d2d5a940fcd6dbe62da7e109282379d Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.getrusage" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -43,30 +43,6 @@
4343
</para>
4444
</refsect1>
4545

46-
<refsect1 role="changelog">
47-
&reftitle.changelog;
48-
<para>
49-
<informaltable>
50-
<tgroup cols="2">
51-
<thead>
52-
<row>
53-
<entry>&Version;</entry>
54-
<entry>&Description;</entry>
55-
</row>
56-
</thead>
57-
<tbody>
58-
<row>
59-
<entry>7.0.0</entry>
60-
<entry>
61-
此函数现在开始支持 Windows。
62-
</entry>
63-
</row>
64-
</tbody>
65-
</tgroup>
66-
</informaltable>
67-
</para>
68-
</refsect1>
69-
7046
<refsect1 role="examples">
7147
&reftitle.examples;
7248
<para>

reference/inotify/setup.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 765b2d6eec7dfbaeed900b32aa91a1360d73df42 Maintainer: songmeifeng Status: ready -->
3+
<!-- EN-Revision: 204578526607cf2e49e02782d45a93b6c1f9018b Maintainer: songmeifeng Status: ready -->
44
<!-- CREDITS: Luffy -->
55
<chapter xml:id="inotify.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
&reftitle.setup;
77

8-
<!-- {{{ Requirements -->
9-
<section xml:id="inotify.requirements">
10-
&reftitle.required;
11-
<para>
12-
此扩展需要 Linux 2.6.13 或更新的版本,以及最新的 libC 库。
13-
</para>
14-
</section>
15-
<!-- }}} -->
16-
178
<!-- {{{ Installation -->
189
<section xml:id="inotify.install">
1910
&reftitle.setup;

reference/math/book.xml

Lines changed: 2 additions & 2 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: 48ce43fe79fa0c9f31f187ea8ec995b4cb13037e Maintainer: mowangjuanzi Status: ready -->
3+
<!-- EN-Revision: e75557e268736a2a08a5cd17f50048e9db545e02 Maintainer: mowangjuanzi Status: ready -->
44
<!-- CREDITS: Luffy -->
55
<book xml:id="book.math" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<?phpdoc extension-membership="core" ?>
@@ -35,10 +35,10 @@
3535
<!-- }}} -->
3636

3737
&reference.math.constants;
38+
&reference.math.roundingmode;
3839
&reference.math.reference;
3940

4041
</book>
41-
4242
<!-- Keep this comment at the end of the file
4343
Local variables:
4444
mode: sgml

reference/mbstring/book.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 740eb58e8c03cfc5ac98eda13943262775b73ff2 Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
44
<!-- CREDITS: Luffy -->
5-
<book xml:id="book.mbstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<book xml:id="book.mbstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
66
<?phpdoc extension-membership="bundled" ?>
77
<title>多字节字符串</title>
88

reference/mbstring/functions/mb-convert-encoding.xml

Lines changed: 2 additions & 2 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: 2c17cef6e71c3d85011319cde128cc4edf89a053 Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.mb-convert-encoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -134,7 +134,7 @@
134134
<para>
135135
<example>
136136
<title><function>mb_convert_encoding</function> 示例</title>
137-
<programlisting role="php">
137+
<programlisting role="php" annotations="non-interactive">
138138
<![CDATA[
139139
<?php
140140
/* 转换内部编码为 SJIS */

reference/openssl/setup.xml

Lines changed: 3 additions & 2 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: d5da0808c4d6343eb8f0099307d3139102a6f4bf Maintainer: duanxiaoqiang Status: ready -->
3+
<!-- EN-Revision: 3fa666ce023c7f5005cae5c3bf4fbef2b47ef9d1 Maintainer: duanxiaoqiang Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<chapter xml:id="openssl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
&reftitle.setup;
@@ -11,7 +11,8 @@
1111
<para>
1212
要使用 Open SSL 函数,你必须安装<link xlink:href="&url.openssl;">OpenSSL</link> 库。
1313
PHP 7.0 需要 OpenSSL &gt;= 0.9.8。PHP 7.1-8.0 需要 OpenSSL
14-
&gt;= 1.0.1,&lt; 3.0。PHP &gt;= 8.1 支持 OpenSSL &gt;= 1.0.2,&lt; 4.0。
14+
&gt;= 1.0.1,&lt; 3.0。PHP &gt;= 8.1 支持 OpenSSL &gt;= 1.0.2, &lt; 4.0。
15+
PHP &gt;= 8.4 支持 OpenSSL &gt;= 1.1.1, &lt; 4.0。
1516
</para>
1617
<warning>
1718
<para>

reference/password/functions/password-needs-rehash.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: ff492e168a557e4dd17574023b7c3cb21b14df3b Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: e302f07943465892db7f72469e2ce9b42c4f763f Maintainer: daijie Status: ready -->
44
<!-- CREDITS: Luffy -->
5-
65
<refentry xml:id="function.password-needs-rehash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
76
<refnamediv>
87
<refname>password_needs_rehash</refname>
@@ -97,11 +96,11 @@
9796
<?php
9897
9998
$password = 'rasmuslerdorf';
100-
$hash = '$2y$10$YCFsG6elYca568hBi2pZ0.3LDL5wjgxct1N8w/oLR/jfHsiQwCqTS';
99+
$hash = '$2y$12$4Umg0rCJwMswRw/l.SwHvuQV01coP0eWmGzd61QH2RvAOMANUBGC.';
101100
102101
$algorithm = PASSWORD_BCRYPT;
103102
// bcrypt 的成本参数随着硬件的改进而可能发生变化
104-
$options = ['cost' => 12];
103+
$options = ['cost' => 13];
105104
106105
// 根据明文密码验证储存的散列
107106
if (password_verify($password, $hash)) {

reference/password/functions/password-verify.xml

Lines changed: 2 additions & 3 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: 5bc68add3da3cd18c40f851e944b15095d3a26aa Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: 5baba54a67be43d689970983cfc6d24debad1ce0 Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.password-verify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -70,7 +70,7 @@
7070
<![CDATA[
7171
<?php
7272
// 想知道以下字符从哪里来,可参见 password_hash() 示例
73-
$hash = '$2y$10$.vGA1O9wmRjrwAVXD98HNOgsNpDczlqm3Jq7KnEd1rVAGv3Fykk1a';
73+
$hash = '$2y$12$4Umg0rCJwMswRw/l.SwHvuQV01coP0eWmGzd61QH2RvAOMANUBGC.';
7474
7575
if (password_verify('rasmuslerdorf', $hash)) {
7676
echo 'Password is valid!';
@@ -96,7 +96,6 @@ Password is valid!
9696
<simplelist>
9797
<member><function>password_needs_rehash</function></member>
9898
<member><function>password_hash</function></member>
99-
<member><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.password.compat;">用户级实现</link></member>
10099
<member><function>sodium_crypto_pwhash_str_verify</function></member>
101100
</simplelist>
102101
</para>

reference/pcntl/examples.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: aebf045bfb7f4f2350db5e1e908cf290be334075 Maintainer: mowangjuanzi Status: ready -->
3+
<!-- EN-Revision: e91b2dd2539f6be30b7db023d880de673fa50b62 Maintainer: mowangjuanzi Status: ready -->
4+
<!-- CREDITS: Luffy -->
45
<chapter xml:id="pcntl.examples" xmlns="http://docbook.org/ns/docbook">
56
&reftitle.examples;
67
<section xml:id="pcntl.example">
@@ -13,7 +14,7 @@
1314
<programlisting role="php">
1415
<![CDATA[
1516
<?php
16-
declare(ticks=1);
17+
pcntl_async_signals(true);
1718
1819
$pid = pcntl_fork();
1920
if ($pid == -1) {

0 commit comments

Comments
 (0)