com doc/ru: Обновлен ие до англи йской верси и: install/fpm/configuration.xml language/types/nu meric-strings.xml
language/types/type-juggling.xml refe rence/imap/functions/imap-fetchheader.xml reference/mysqli/ functions/mysqli-escape-string.xml
reference/mysqli/mysqli _warning.xml reference/mysqli/mysqli_warning/next.xml reference/mysqli/summary.xml reference/pdo_odbc/consta nts.xml

Commit: a58df4e992354137462847139bbe50f0ce2a5b19 Author: Sergey Panteleev <sergey@php.net> Wed, 24 Mar 2021 12:15:24 +0300 Parents: 1ca2848c1ac5c9013290f017afd47f04b8a685f2 Branches: master Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=a58df4e992354137462847139bbe50f0ce2a5b19 Log: Обновление до английской версии Changed paths: M install/fpm/configuration.xml M language/types/numeric-strings.xml M language/types/type-juggling.xml M reference/imap/functions/imap-fetchheader.xml M reference/mysqli/functions/mysqli-escape-string.xml M reference/mysqli/mysqli_warning.xml M reference/mysqli/mysqli_warning/next.xml M reference/mysqli/summary.xml M reference/pdo_odbc/constants.xml

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index cbadb430c..7bba65209 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 5f6b54fb576b7d4bc76bdd4f378595aa93f0920f Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <sect1 xml:id="install.fpm.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -738,7 +738,128 @@ <listitem> <para> Формат лог-файла доступа. - Значение по умолчанию: "%R - %u %t \"%m %r\" %s" + Значение по умолчанию: <literal>"%R - %u %t \"%m %r\" %s"</literal>: + <table xml:id="fpm.configuration.access.format"> + <title>Допустимые значения</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Заполнитель</entry> + <entry>Описание</entry> + </row> + </thead> + <tbody> + <row> + <entry> + <constant>%C</constant> + </entry> + <entry>%CPU</entry> + </row> + <row> + <entry> + <constant>%d</constant> + </entry> + <entry>длительность µs</entry> + </row> + <row> + <entry> + <constant>%e</constant> + </entry> + <entry>fastcgi env</entry> + </row> + <row> + <entry> + <constant>%f</constant> + </entry> + <entry>скрипт</entry> + </row> + <row> + <entry> + <constant>%l</constant> + </entry> + <entry>длина содержимого</entry> + </row> + <row> + <entry> + <constant>%m</constant> + </entry> + <entry>метод</entry> + </row> + <row> + <entry> + <constant>%M</constant> + </entry> + <entry>память</entry> + </row> + <row> + <entry> + <constant>%n</constant> + </entry> + <entry>название пула</entry> + </row> + <row> + <entry> + <constant>%o</constant> + </entry> + <entry>вывод заголовка</entry> + </row> + <row> + <entry> + <constant>%p</constant> + </entry> + <entry>PID</entry> + </row> + <row> + <entry> + <constant>%q</constant> + </entry> + <entry>строка запроса</entry> + </row> + <row> + <entry> + <constant>%Q</constant> + </entry> + <entry>GLUE между %q и %r</entry> + </row> + <row> + <entry> + <constant>%r</constant> + </entry> + <entry>URI запроса</entry> + </row> + <row> + <entry> + <constant>%R</constant> + </entry> + <entry>удалённый IP-адрес</entry> + </row> + <row> + <entry> + <constant>%s</constant> + </entry> + <entry>статус</entry> + </row> + <row> + <entry> + <constant>%T</constant> + </entry> + <entry>время</entry> + </row> + <row> + <entry> + <constant>%t</constant> + </entry> + <entry>время</entry> + </row> + <row> + <entry> + <constant>%u</constant> + </entry> + <entry>удалённый пользователь</entry> + </row> + </tbody> + </tgroup> + </table> </para> </listitem> </varlistentry> diff --git a/language/types/numeric-strings.xml b/language/types/numeric-strings.xml index 99db689fb..3340c4035 100644 --- a/language/types/numeric-strings.xml +++ b/language/types/numeric-strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: fab81eeee3a207e5aff7ac42c56d89607abaab27 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: dde64312eb88c1b648edc32e65bf8cfe4b830387 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> <sect1 xml:id="language.types.numeric-strings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Числовые строки</title> @@ -92,6 +92,8 @@ NUM_STRING ({INT_NUM_STRING} | {FLOAT_NUM_STRING}) </simpara> </listitem> </itemizedlist> + До PHP 7.1.0 не вызывалась ошибка уровня ни <constant>E_NOTICE</constant>, + ни <constant>E_WARNING</constant>. </para> <informalexample> diff --git a/language/types/type-juggling.xml b/language/types/type-juggling.xml index 12bece7f5..2d4d6b943 100644 --- a/language/types/type-juggling.xml +++ b/language/types/type-juggling.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: d494ffa4d9f83b60fe66972ec2c0cf0301513b4a Maintainer: shein Status: ready --> +<!-- EN-Revision: c4de1a06045b84afa79ac0b6503fa4f60400359c Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <sect1 xml:id="language.types.type-juggling"> diff --git a/reference/imap/functions/imap-fetchheader.xml b/reference/imap/functions/imap-fetchheader.xml index 1b9996910..7c0f55745 100644 --- a/reference/imap/functions/imap-fetchheader.xml +++ b/reference/imap/functions/imap-fetchheader.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 312f9d4e18a7804f7d79aaaa2dfaa245401b2330 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="function.imap-fetchheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -41,7 +41,7 @@ <itemizedlist> <listitem> <simpara> - <constant>FT_UID</constant> - параметр <parameter>msgno</parameter> + <constant>FT_UID</constant> - параметр <parameter>message_num</parameter> является UID </simpara> </listitem> diff --git a/reference/mysqli/functions/mysqli-escape-string.xml b/reference/mysqli/functions/mysqli-escape-string.xml index 139b7d4fe..511afd317 100644 --- a/reference/mysqli/functions/mysqli-escape-string.xml +++ b/reference/mysqli/functions/mysqli-escape-string.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5f357e881ef31ed3ad618ee6302f083b1d633a5a Maintainer: aur Status: ready --> +<!-- EN-Revision: df1072f8d2a3157534cb61d3734864c1f4852808 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.mysqli-escape-string" xmlns="http://docbook.org/ns/docbook"> <refnamediv> + <refname>mysqli::escape_string</refname> <refname>mysqli_escape_string</refname> <refpurpose>&Alias; функции <function>mysqli_real_escape_string</function></refpurpose> </refnamediv> diff --git a/reference/mysqli/mysqli_warning.xml b/reference/mysqli/mysqli_warning.xml index ba9280491..ec1a5e224 100644 --- a/reference/mysqli/mysqli_warning.xml +++ b/reference/mysqli/mysqli_warning.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: d6882d8c736e6a350725c31b2a4fa47c145f0072 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-warning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -48,7 +48,7 @@ <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo> - <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysqli-warning')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='oop'])" /> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysqli-warning')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> </classsynopsis> <!-- }}} --> diff --git a/reference/mysqli/mysqli_warning/next.xml b/reference/mysqli/mysqli_warning/next.xml index a74add3be..aec4e6e00 100644 --- a/reference/mysqli/mysqli_warning/next.xml +++ b/reference/mysqli/mysqli_warning/next.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: bf963bac2d310a026fef0272d41a9fe5ae99f641 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: sergey --> <!-- $Revision$ --> - <refentry xml:id="mysqli-warning.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli_warning::next</refname> @@ -11,9 +10,9 @@ <refsect1 role="description"> &reftitle.description; - <methodsynopsis role="oop"> + <methodsynopsis> <modifier>public</modifier> <type>bool</type><methodname>mysqli_warning::next</methodname> - <void /> + <void/> </methodsynopsis> <para> Изменяет информацию о предупреждении на следующее предупреждение, если это возможно. @@ -40,7 +39,6 @@ </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml index 6c7a13332..55ac4bd18 100644 --- a/reference/mysqli/summary.xml +++ b/reference/mysqli/summary.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 4f006f632a373421bf92c1da071cf13dc51b6488 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <chapter xml:id="mysqli.summary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -136,10 +136,9 @@ <entry>Изменяет пользователя (user) для указанного соединения с базой данных</entry> </row> <row> - <entry><methodname>mysqli::character_set_name</methodname>,<link linkend="mysqli.character-set-name"> - mysqli::client_encoding</link></entry> + <entry><methodname>mysqli::character_set_name</methodname></entry> <entry><function>mysqli_character_set_name</function></entry> - <entry><function>mysqli_client_encoding</function></entry> + <entry>Н/Д</entry> <entry>Возвращает кодировку, установленную по умолчанию для соединения с базой данных</entry> </row> <row> @@ -414,7 +413,7 @@ <row> <entry><link linkend="mysqli-stmt.param-count">$mysqli_stmt::param_count</link></entry> <entry><function>mysqli_stmt_param_count</function></entry> - <entry><function>mysqli_param_count</function></entry> + <entry>Н/Д</entry> <entry>Возвращает число параметров для заданного запроса</entry> </row> <row> @@ -441,13 +440,13 @@ <row> <entry><methodname>mysqli_stmt::bind_param</methodname></entry> <entry><function>mysqli_stmt_bind_param</function></entry> - <entry><function>mysqli_bind_param</function></entry> + <entry>Н/Д</entry> <entry>Передаётся переменные в подготовленный запрос как параметры</entry> </row> <row> <entry><methodname>mysqli_stmt::bind_result</methodname></entry> <entry><function>mysqli_stmt_bind_result</function></entry> - <entry><function>mysqli_bind_result</function></entry> + <entry>Н/Д</entry> <entry>Передаёт переменные в подготовленный запрос для сохранения результатов</entry> </row> <row> @@ -471,7 +470,7 @@ <row> <entry><methodname>mysqli_stmt::fetch</methodname></entry> <entry><function>mysqli_stmt_fetch</function></entry> - <entry><function>mysqli_fetch</function></entry> + <entry>Н/Д</entry> <entry>Выборка результатов подготовленного запроса в связанные переменные</entry> </row> <row> @@ -525,13 +524,13 @@ <row> <entry><methodname>mysqli_stmt::result_metadata</methodname></entry> <entry><function>mysqli_stmt_result_metadata</function></entry> - <entry><function>mysqli_get_metadata</function></entry> + <entry>Н/Д</entry> <entry>Возвращает метаданные результатов подготовленного запроса</entry> </row> <row> <entry><methodname>mysqli_stmt::send_long_data</methodname></entry> <entry><function>mysqli_stmt_send_long_data</function></entry> - <entry><function>mysqli_send_long_data</function></entry> + <entry>Н/Д</entry> <entry>Передача данных блоками</entry> </row> <row> diff --git a/reference/pdo_odbc/constants.xml b/reference/pdo_odbc/constants.xml index 049d7ae94..52e4671f8 100644 --- a/reference/pdo_odbc/constants.xml +++ b/reference/pdo_odbc/constants.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 2b6afe9652277bcaf631546a18523327e7e95f52 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <section xml:id="pdo-odbc.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &pdo.driver-constants; @@ -50,13 +49,12 @@ Только для Windows. Если &true;, то данные в кодировке UTF-16 (<literal>CHAR</literal>, <literal>VARCHAR</literal> и <literal>LONGVARCHAR</literal>) будут сконвертированны в UTF-8 при чтении или записи. - Если &false; (по умолчанию), преобразования кодировок производиться не будет. + Если &false; (по умолчанию), преобразование кодировки символов может быть выполнено драйвером. </para> </listitem> </varlistentry> </variablelist> </section> - <!-- Keep this comment at the end of the file Local variables: mode: sgml