svn: /phpdoc/ja/trunk/reference/ datetime/dateinterval/format.xml gmagick/gmagick/getimagematte.xml iconv/functions/iconv-strlen.xml
mbstring/functions/mb-strlen.xml password/functions/password-hash.xml strings/functions/crypt.xml strings/functions/strlen.xml

takagi Sat, 28 Jun 2014 04:30:14 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=333985 Log: Sync with en Changed paths: U phpdoc/ja/trunk/reference/datetime/dateinterval/format.xml U phpdoc/ja/trunk/reference/gmagick/gmagick/getimagematte.xml U phpdoc/ja/trunk/reference/iconv/functions/iconv-strlen.xml U phpdoc/ja/trunk/reference/mbstring/functions/mb-strlen.xml U phpdoc/ja/trunk/reference/password/functions/password-hash.xml U phpdoc/ja/trunk/reference/strings/functions/crypt.xml U phpdoc/ja/trunk/reference/strings/functions/strlen.xml Modified: phpdoc/ja/trunk/reference/datetime/dateinterval/format.xml =================================================================== --- phpdoc/ja/trunk/reference/datetime/dateinterval/format.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/datetime/dateinterval/format.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 328654 Maintainer: takagi Status: ready --> +<!-- EN-Revision: 333939 Maintainer: takagi Status: ready --> <refentry xml:id="dateinterval.format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -232,6 +232,15 @@ </para> </refsect1> + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><methodname>DateTime::diff</methodname></member> + </simplelist> + </para> + </refsect1> + </refentry> <!-- Keep this comment at the end of the file Modified: phpdoc/ja/trunk/reference/gmagick/gmagick/getimagematte.xml =================================================================== --- phpdoc/ja/trunk/reference/gmagick/gmagick/getimagematte.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/gmagick/gmagick/getimagematte.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 308223 Maintainer: takagi Status: ready --> +<!-- EN-Revision: 333885 Maintainer: takagi Status: ready --> <refentry xml:id="gmagick.getimagematte" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Gmagick::getimagematte</refname> - <refpurpose>画像がマットチャネルを持っているかどうかを返す</refpurpose> + <refpurpose>画像がマットチャネルを持っているかどうかを調べる</refpurpose> </refnamediv> <refsect1 role="description"> @@ -16,7 +16,7 @@ </methodsynopsis> <para> 画像がマットチャネルを持っている場合に &true;、 - そうでない場合に false を返します。 + そうでない場合に &false; を返します。 </para> @@ -32,7 +32,7 @@ &reftitle.returnvalues; <para> 画像がマットチャネルを持っている場合に &true;、 - そうでない場合に false を返します。 + そうでない場合に &false; を返します。 </para> </refsect1> Modified: phpdoc/ja/trunk/reference/iconv/functions/iconv-strlen.xml =================================================================== --- phpdoc/ja/trunk/reference/iconv/functions/iconv-strlen.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/iconv/functions/iconv-strlen.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 315005 Maintainer: takagi Status: ready --> +<!-- EN-Revision: 333972 Maintainer: takagi Status: ready --> <refentry xml:id="function.iconv-strlen" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>iconv_strlen</refname> @@ -60,8 +60,9 @@ &reftitle.seealso; <para> <simplelist> + <member><function>grapheme_strlen</function></member> + <member><function>mb_strlen</function></member> <member><function>strlen</function></member> - <member><function>mb_strlen</function></member> </simplelist> </para> </refsect1> Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-strlen.xml =================================================================== --- phpdoc/ja/trunk/reference/mbstring/functions/mb-strlen.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/mbstring/functions/mb-strlen.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 332297 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 333972 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry xml:id="function.mb-strlen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -61,6 +61,8 @@ <para> <simplelist> <member><function>mb_internal_encoding</function></member> + <member><function>grapheme_strlen</function></member> + <member><function>iconv_strlen</function></member> <member><function>strlen</function></member> </simplelist> </para> Modified: phpdoc/ja/trunk/reference/password/functions/password-hash.xml =================================================================== --- phpdoc/ja/trunk/reference/password/functions/password-hash.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/password/functions/password-hash.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 332747 Maintainer: takagi Status: ready --> +<!-- EN-Revision: 333973 Maintainer: takagi Status: ready --> <refentry xml:id="function.password-hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -90,8 +90,6 @@ <constant>PASSWORD_BCRYPT</constant> を <parameter>algo</parameter> に指定すると、 <parameter>password</parameter> が最大 72 文字までに切り詰められます。 - このアルゴリズムを使い、同じソルトで 72 バイトを超える文字列のハッシュを計算すると、 - 同じ結果になってしまいます。 </para> </caution> </listitem> Modified: phpdoc/ja/trunk/reference/strings/functions/crypt.xml =================================================================== --- phpdoc/ja/trunk/reference/strings/functions/crypt.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/strings/functions/crypt.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 332747 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 333973 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.crypt"> <refnamediv> @@ -139,8 +139,6 @@ <para> <constant>CRYPT_BLOWFISH</constant> を使うと、 <parameter>str</parameter> が最大 72 文字までに切り詰められます。 - このアルゴリズムを使い、同じソルトで 72 バイトを超える文字列のハッシュを計算すると、 - 同じ結果になってしまいます。 </para> </caution> </listitem> Modified: phpdoc/ja/trunk/reference/strings/functions/strlen.xml =================================================================== --- phpdoc/ja/trunk/reference/strings/functions/strlen.xml 2014-06-28 04:18:40 UTC (rev 333984) +++ phpdoc/ja/trunk/reference/strings/functions/strlen.xml 2014-06-28 04:30:14 UTC (rev 333985) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 333292 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 333972 Maintainer: hirokawa Status: ready --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strlen"> <refnamediv> <refname>strlen</refname> @@ -107,6 +107,8 @@ <para> <simplelist> <member><function>count</function></member> + <member><function>grapheme_strlen</function></member> + <member><function>iconv_strlen</function></member> <member><function>mb_strlen</function></member> </simplelist> </para>