com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli/change-user.xml referen
ce/mysqli/mysqli/character-set-name.xml reference/mysqli/my sqli/close.xml reference/mysqli/mysqli/commit.xml refer
ence/mysqli/mysqli/connect-error.xml reference/mysqli/mysql i/debug.xml reference/mysqli/mysqli/dump-debug-info.xml reference/mysqli/mysqli/errno.xml
reference/mysqli/mysql i/error-list.xml reference/mysqli/mysqli/error.xml refe rence/mysqli/mysql
| From: | Sergey Panteleev | Date: | Thu, 25 Mar 2021 06:31:46 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli/change-user.xml referen ce/mysqli/mysqli/character-set-name.xml reference/mysqli/my sqli/close.xml reference/mysqli/mysqli/commit.xml refer ence/mysqli/mysqli/connect-error.xml reference/mysqli/mysql i/debug.xml reference/mysqli/mysqli/dump-debug-info.xml reference/mysqli/mysqli/errno.xml reference/mysqli/mysql i/error-list.xml reference/mysqli/mysqli/error.xml refe rence/mysqli/mysql |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8836@lists.php.net to get a copy of this message | ||
Commit: e79c0e85baa2f1f1e875fbb345662c133df498ba
Author: Sergey Panteleev <sergey@php.net> Thu, 25 Mar 2021 09:30:45 +0300
Parents: a58df4e992354137462847139bbe50f0ce2a5b19
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=e79c0e85baa2f1f1e875fbb345662c133df498ba
Log:
Обновление до английской версии
Changed paths:
M reference/mysqli/mysqli/change-user.xml
M reference/mysqli/mysqli/character-set-name.xml
M reference/mysqli/mysqli/close..xml
M reference/mysqli/mysqli/commit.xml
M reference/mysqli/mysqli/connect-error.xml
M reference/mysqli/mysqli/debug.xml
M reference/mysqli/mysqli/dump-debug-info.xml
M reference/mysqli/mysqli/errno.xml
M reference/mysqli/mysqli/error-list.xml
M reference/mysqli/mysqli/error.xml
M reference/mysqli/mysqli/field-count.xml
M reference/mysqli/mysqli/get-charset.xml
M reference/mysqli/mysqli/get-client-info.xml
M reference/mysqli/mysqli/get-client-version.xml
M reference/mysqli/mysqli/get-connection-stats.xml
M reference/mysqli/mysqli/get-host-info.xml
M reference/mysqli/mysqli/get-proto-info.xml
M reference/mysqli/mysqli/get-server-info.xml
M reference/mysqli/mysqli/get-server-version.xml
M reference/mysqli/mysqli/get-warnings.xml
diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml index 78e34f2e3..e20bb97c1 100644 --- a/reference/mysqli/mysqli/change-user.xml +++ b/reference/mysqli/mysqli/change-user.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: aur Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.change-user" xmlns="http://docbook.org/ns/docbook"> @@ -14,17 +14,17 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::change_user</methodname> - <methodparam><type>string</type><parameter>user</parameter></methodparam> + <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> - <methodparam><type>string</type><parameter>database</parameter></methodparam> + <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>bool</type><methodname>mysqli_change_user</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam><type>string</type><parameter>user</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> - <methodparam><type>string</type><parameter>database</parameter></methodparam> + <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam> </methodsynopsis> <para> Меняет пользователя, от имени которого выполнено подключение к базе данных, @@ -44,7 +44,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>user</parameter></term> + <term><parameter>username</parameter></term> <listitem> <para> Имя пользователя для доступа к MySQL diff --git a/reference/mysqli/mysqli/character-set-name.xml b/reference/mysqli/mysqli/character-set-name.xml index 8ede740ec..baeac0d68 100644 --- a/reference/mysqli/mysqli/character-set-name.xml +++ b/reference/mysqli/mysqli/character-set-name.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: mch Status: ready --> +<!-- EN-Revision: 4f006f632a373421bf92c1da071cf13dc51b6488 Maintainer: mch Status: ready --> <!-- $Revision$ --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.character-set-name" xmlns="http://docbook.org/ns/docbook"> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>string</type><methodname>mysqli::character_set_name</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>string</type><methodname>mysqli_character_set_name</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает текущую кодировку, установленную для соединения с БД. @@ -101,14 +101,12 @@ mysqli_close($link); <para> <simplelist> <member><function>mysqli_set_charset</function></member> - <member><function>mysqli_client_encoding</function></member> <member><function>mysqli_real_escape_string</function></member> </simplelist> </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml index c672856cc..12ec880e7 100644 --- a/reference/mysqli/mysqli/close.xml +++ b/reference/mysqli/mysqli/close.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.close" xmlns="http://docbook.org/ns/docbook"> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::close</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_close</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Закрывает ранее открытое соединение с базой данных. @@ -74,7 +74,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/commit.xml b/reference/mysqli/mysqli/commit.xml index ddc18f594..3723a6242 100644 --- a/reference/mysqli/mysqli/commit.xml +++ b/reference/mysqli/mysqli/commit.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.commit" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -15,14 +15,14 @@ <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::commit</methodname> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_commit</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Фиксирует транзакцию для установленного соединения с базой данных. @@ -71,6 +71,28 @@ </note> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>name</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -91,7 +113,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/connect-error.xml b/reference/mysqli/mysqli/connect-error.xml index 7c83833ed..918c98d8e 100644 --- a/reference/mysqli/mysqli/connect-error.xml +++ b/reference/mysqli/mysqli/connect-error.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: efaedacb533200d9007d704d07e624b27c946036 Maintainer: aur Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.connect-error" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><modifier>static</modifier> <type>string</type><varname linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> + <fieldsynopsis><modifier>static</modifier> <type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>string</type><methodname>mysqli_connect_error</methodname> - <void /> + <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_connect_error</methodname> + <void/> </methodsynopsis> <para> Возвращает последнее сообщение об ошибке после вызова @@ -34,7 +34,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->connect_error</varname></title> + <title>Пример использования <varname>$mysqli->connect_error</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/debug.xml b/reference/mysqli/mysqli/debug.xml index bd0dfea92..07fd9bf61 100644 --- a/reference/mysqli/mysqli/debug.xml +++ b/reference/mysqli/mysqli/debug.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.debug" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::debug</methodname> - <methodparam><type>string</type><parameter>message</parameter></methodparam> + <methodparam><type>string</type><parameter>options</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_debug</methodname> - <methodparam><type>string</type><parameter>message</parameter></methodparam> + <methodparam><type>string</type><parameter>options</parameter></methodparam> </methodsynopsis> <para> Выполняет процедуры отладки, используя библиотеку Fred Fish. @@ -31,7 +31,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>message</parameter></term> + <term><parameter>options</parameter></term> <listitem> <para> Строка, содержащая выполняемую процедуру отладки @@ -89,7 +89,6 @@ mysqli_debug("d:t:o,/tmp/client.trace"); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml index 124545204..37f825f57 100644 --- a/reference/mysqli/mysqli/dump-debug-info.xml +++ b/reference/mysqli/mysqli/dump-debug-info.xml @@ -17,9 +17,9 @@ <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_dump_debug_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Функция разработана для запуска от имени пользователя с привилегиями diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml index 3b5c98941..43c8a19b1 100644 --- a/reference/mysqli/mysqli/errno.xml +++ b/reference/mysqli/mysqli/errno.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5e2f2b472416909ebb25e030eb135cfaae3f240a Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.errno" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_errno</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает код ошибки последнего вызова функции MySQLi, завершившейся @@ -50,7 +50,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->errno</varname></title> + <title>Пример использования <varname>$mysqli->errno</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/error-list.xml b/reference/mysqli/mysqli/error-list.xml index 5559114e2..db3a4e55f 100644 --- a/reference/mysqli/mysqli/error-list.xml +++ b/reference/mysqli/mysqli/error-list.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: aafd44f929596277070ed861c9edab10f4354545 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.error-list" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>array</type><varname linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> + <fieldsynopsis><type>array</type><varname linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>array</type><methodname>mysqli_error_list</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает массив ошибок последнего вызова функции MySQLi, которая может @@ -47,7 +47,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->error_list</varname></title> + <title>Пример использования <varname>$mysqli->error_list</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/error.xml b/reference/mysqli/mysqli/error.xml index 3a76ff75e..f4bd704b3 100644 --- a/reference/mysqli/mysqli/error.xml +++ b/reference/mysqli/mysqli/error.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 2a56e2bba7a07de7b9b87cf961384d70e896969e Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.error" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_error</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает сообщение об ошибке последнего вызова функции MySQLi, который может успешно выполниться или провалиться. @@ -42,7 +42,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример с <varname>$mysqli->error</varname></title> + <title>Пример с <varname>$mysqli->error</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/field-count.xml b/reference/mysqli/mysqli/field-count.xml index 06da8076a..3eff16f82 100644 --- a/reference/mysqli/mysqli/field-count.xml +++ b/reference/mysqli/mysqli/field-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.field-count" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_field_count</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает число столбцов, затронутых последним запросом для соединения, - указанного в <parameter>link</parameter>. Эта функция может быть полезной + указанного в <parameter>mysql</parameter>. Эта функция может быть полезной при использовании <function>mysqli_store_result</function> для того, чтобы определить выдан ли непустой результат, или в случае неизвестного назначения запроса. @@ -46,7 +46,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->field_count</varname></title> + <title>Пример использования <varname>$mysqli->field_count</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-charset.xml b/reference/mysqli/mysqli/get-charset.xml index a246e40ad..7bea7b60b 100644 --- a/reference/mysqli/mysqli/get-charset.xml +++ b/reference/mysqli/mysqli/get-charset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-charset" xmlns="http://docbook.org/ns/docbook"> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>object</type><methodname>mysqli::get_charset</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>mysqli::get_charset</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>object</type><methodname>mysqli_get_charset</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>object</type><type>null</type></type><methodname>mysqli_get_charset</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> diff --git a/reference/mysqli/mysqli/get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml index afa6d71c1..ba04fb85a 100644 --- a/reference/mysqli/mysqli/get-client-info.xml +++ b/reference/mysqli/mysqli/get-client-info.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-client-info" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> + <fieldsynopsis><type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>string</type><methodname>mysqli::get_client_info</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>mysqli::get_client_info</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>string</type><methodname>mysqli_get_client_info</methodname> - <methodparam choice="opt"><type>mysqli</type><parameter>link</parameter><initializer>NULL</initializer></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_get_client_info</methodname> + <methodparam choice="opt"><type class="union"><type>mysqli</type><type>null</type></type><parameter>mysql</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Возвращает строку, содержащую версию клиентской библиотеки MySQL. diff --git a/reference/mysqli/mysqli/get-client-version.xml b/reference/mysqli/mysqli/get-client-version.xml index 2e1efa13c..de45d2770 100644 --- a/reference/mysqli/mysqli/get-client-version.xml +++ b/reference/mysqli/mysqli/get-client-version.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 3ef98b0e1b7b66e8f17fd552b348aef2de5eef76 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-client-version" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_client_version</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <void/> </methodsynopsis> <para> Возвращает версию клиента в виде целого числа. diff --git a/reference/mysqli/mysqli/get-connection-stats.xml b/reference/mysqli/mysqli/get-connection-stats.xml index b42de848f..118bf6987 100644 --- a/reference/mysqli/mysqli/get-connection-stats.xml +++ b/reference/mysqli/mysqli/get-connection-stats.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-connection-stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>bool</type><methodname>mysqli::get_connection_stats</methodname> + <modifier>public</modifier> <type>array</type><methodname>mysqli::get_connection_stats</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>array</type><methodname>mysqli_get_connection_stats</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает статистику соединения с клиентом. @@ -195,7 +195,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-host-info.xml b/reference/mysqli/mysqli/get-host-info.xml index 5ffd7b3c0..fd946dc48 100644 --- a/reference/mysqli/mysqli/get-host-info.xml +++ b/reference/mysqli/mysqli/get-host-info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-host-info" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_get_host_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает строку, описывающую соединение, которое обозначено - в параметре <parameter>link</parameter> (включая + в параметре <parameter>mysql</parameter> (включая имя хоста сервера). </para> </refsect1> @@ -44,7 +44,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->host_info</varname></title> + <title>Пример использования <varname>$mysqli->host_info</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-proto-info.xml b/reference/mysqli/mysqli/get-proto-info.xml index 50893c6ad..78f4aec94 100644 --- a/reference/mysqli/mysqli/get-proto-info.xml +++ b/reference/mysqli/mysqli/get-proto-info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-proto-info" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_proto_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает целое число, представляющее собой версию протокола MySQL, - используемого для соединения, переданного в <parameter>link</parameter>. + используемого для соединения, переданного в <parameter>mysql</parameter>. </para> </refsect1> @@ -43,7 +43,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->protocol_version</varname></title> + <title>Пример использования <varname>$mysqli->protocol_version</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -103,7 +103,6 @@ Protocol version: 10 </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-server-info.xml b/reference/mysqli/mysqli/get-server-info.xml index 616577d36..4c035cf02 100644 --- a/reference/mysqli/mysqli/get-server-info.xml +++ b/reference/mysqli/mysqli/get-server-info.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: a3e019b85e3d0bf037d1cf09fe94180974b5b649 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-server-info" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> <methodsynopsis role="oop"> <modifier>public</modifier> <type>string</type><methodname>mysqli_stmt::get_server_info</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>string</type><methodname>mysqli_get_server_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает строку, содержащую версию сервера MySQL, к которому также @@ -48,7 +48,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->server_info</varname></title> + <title>Пример использования <varname>$mysqli->server_info</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -110,7 +110,6 @@ Server version: 4.1.2-alpha-debug </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-server-version.xml b/reference/mysqli/mysqli/get-server-version.xml index cc522a9b5..cb0c822e8 100644 --- a/reference/mysqli/mysqli/get-server-version.xml +++ b/reference/mysqli/mysqli/get-server-version.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-server-version" xmlns="http://docbook.org/ns/docbook"> @@ -12,16 +12,16 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_server_version</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Функция <function>mysqli_get_server_version</function> возвращает версию сервера, к которому создано соединение (переданное в - параметре <parameter>link</parameter>) в виде целого числа. + параметре <parameter>mysql</parameter>) в виде целого числа. </para> </refsect1> @@ -49,7 +49,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->server_version</varname></title> + <title>Пример использования <varname>$mysqli->server_version</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-warnings.xml b/reference/mysqli/mysqli/get-warnings.xml index 36ddbbf16..a2c1127b0 100644 --- a/reference/mysqli/mysqli/get-warnings.xml +++ b/reference/mysqli/mysqli/get-warnings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-warnings" xmlns="http://docbook.org/ns/docbook"> @@ -13,20 +13,19 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>mysqli_warning</type><methodname>mysqli::get_warnings</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli::get_warnings</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_warning</type><methodname>mysqli_get_warnings</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_get_warnings</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml
diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml index 78e34f2e3..e20bb97c1 100644 --- a/reference/mysqli/mysqli/change-user.xml +++ b/reference/mysqli/mysqli/change-user.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: aur Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.change-user" xmlns="http://docbook.org/ns/docbook"> @@ -14,17 +14,17 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::change_user</methodname> - <methodparam><type>string</type><parameter>user</parameter></methodparam> + <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> - <methodparam><type>string</type><parameter>database</parameter></methodparam> + <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>bool</type><methodname>mysqli_change_user</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam><type>string</type><parameter>user</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> - <methodparam><type>string</type><parameter>database</parameter></methodparam> + <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam> </methodsynopsis> <para> Меняет пользователя, от имени которого выполнено подключение к базе данных, @@ -44,7 +44,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>user</parameter></term> + <term><parameter>username</parameter></term> <listitem> <para> Имя пользователя для доступа к MySQL diff --git a/reference/mysqli/mysqli/character-set-name.xml b/reference/mysqli/mysqli/character-set-name.xml index 8ede740ec..baeac0d68 100644 --- a/reference/mysqli/mysqli/character-set-name.xml +++ b/reference/mysqli/mysqli/character-set-name.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: mch Status: ready --> +<!-- EN-Revision: 4f006f632a373421bf92c1da071cf13dc51b6488 Maintainer: mch Status: ready --> <!-- $Revision$ --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.character-set-name" xmlns="http://docbook.org/ns/docbook"> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>string</type><methodname>mysqli::character_set_name</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>string</type><methodname>mysqli_character_set_name</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает текущую кодировку, установленную для соединения с БД. @@ -101,14 +101,12 @@ mysqli_close($link); <para> <simplelist> <member><function>mysqli_set_charset</function></member> - <member><function>mysqli_client_encoding</function></member> <member><function>mysqli_real_escape_string</function></member> </simplelist> </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml index c672856cc..12ec880e7 100644 --- a/reference/mysqli/mysqli/close.xml +++ b/reference/mysqli/mysqli/close.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.close" xmlns="http://docbook.org/ns/docbook"> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::close</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_close</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Закрывает ранее открытое соединение с базой данных. @@ -74,7 +74,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/commit.xml b/reference/mysqli/mysqli/commit.xml index ddc18f594..3723a6242 100644 --- a/reference/mysqli/mysqli/commit.xml +++ b/reference/mysqli/mysqli/commit.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.commit" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -15,14 +15,14 @@ <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::commit</methodname> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_commit</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Фиксирует транзакцию для установленного соединения с базой данных. @@ -71,6 +71,28 @@ </note> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>name</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -91,7 +113,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/connect-error.xml b/reference/mysqli/mysqli/connect-error.xml index 7c83833ed..918c98d8e 100644 --- a/reference/mysqli/mysqli/connect-error.xml +++ b/reference/mysqli/mysqli/connect-error.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: efaedacb533200d9007d704d07e624b27c946036 Maintainer: aur Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.connect-error" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><modifier>static</modifier> <type>string</type><varname linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> + <fieldsynopsis><modifier>static</modifier> <type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>string</type><methodname>mysqli_connect_error</methodname> - <void /> + <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_connect_error</methodname> + <void/> </methodsynopsis> <para> Возвращает последнее сообщение об ошибке после вызова @@ -34,7 +34,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->connect_error</varname></title> + <title>Пример использования <varname>$mysqli->connect_error</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/debug.xml b/reference/mysqli/mysqli/debug.xml index bd0dfea92..07fd9bf61 100644 --- a/reference/mysqli/mysqli/debug.xml +++ b/reference/mysqli/mysqli/debug.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.debug" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::debug</methodname> - <methodparam><type>string</type><parameter>message</parameter></methodparam> + <methodparam><type>string</type><parameter>options</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_debug</methodname> - <methodparam><type>string</type><parameter>message</parameter></methodparam> + <methodparam><type>string</type><parameter>options</parameter></methodparam> </methodsynopsis> <para> Выполняет процедуры отладки, используя библиотеку Fred Fish. @@ -31,7 +31,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>message</parameter></term> + <term><parameter>options</parameter></term> <listitem> <para> Строка, содержащая выполняемую процедуру отладки @@ -89,7 +89,6 @@ mysqli_debug("d:t:o,/tmp/client.trace"); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml index 124545204..37f825f57 100644 --- a/reference/mysqli/mysqli/dump-debug-info.xml +++ b/reference/mysqli/mysqli/dump-debug-info.xml @@ -17,9 +17,9 @@ <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_dump_debug_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Функция разработана для запуска от имени пользователя с привилегиями diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml index 3b5c98941..43c8a19b1 100644 --- a/reference/mysqli/mysqli/errno.xml +++ b/reference/mysqli/mysqli/errno.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5e2f2b472416909ebb25e030eb135cfaae3f240a Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.errno" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_errno</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает код ошибки последнего вызова функции MySQLi, завершившейся @@ -50,7 +50,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->errno</varname></title> + <title>Пример использования <varname>$mysqli->errno</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/error-list.xml b/reference/mysqli/mysqli/error-list.xml index 5559114e2..db3a4e55f 100644 --- a/reference/mysqli/mysqli/error-list.xml +++ b/reference/mysqli/mysqli/error-list.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: aafd44f929596277070ed861c9edab10f4354545 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.error-list" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>array</type><varname linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> + <fieldsynopsis><type>array</type><varname linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>array</type><methodname>mysqli_error_list</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает массив ошибок последнего вызова функции MySQLi, которая может @@ -47,7 +47,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->error_list</varname></title> + <title>Пример использования <varname>$mysqli->error_list</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/error.xml b/reference/mysqli/mysqli/error.xml index 3a76ff75e..f4bd704b3 100644 --- a/reference/mysqli/mysqli/error.xml +++ b/reference/mysqli/mysqli/error.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 2a56e2bba7a07de7b9b87cf961384d70e896969e Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.error" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_error</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает сообщение об ошибке последнего вызова функции MySQLi, который может успешно выполниться или провалиться. @@ -42,7 +42,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример с <varname>$mysqli->error</varname></title> + <title>Пример с <varname>$mysqli->error</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/field-count.xml b/reference/mysqli/mysqli/field-count.xml index 06da8076a..3eff16f82 100644 --- a/reference/mysqli/mysqli/field-count.xml +++ b/reference/mysqli/mysqli/field-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.field-count" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_field_count</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает число столбцов, затронутых последним запросом для соединения, - указанного в <parameter>link</parameter>. Эта функция может быть полезной + указанного в <parameter>mysql</parameter>. Эта функция может быть полезной при использовании <function>mysqli_store_result</function> для того, чтобы определить выдан ли непустой результат, или в случае неизвестного назначения запроса. @@ -46,7 +46,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->field_count</varname></title> + <title>Пример использования <varname>$mysqli->field_count</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-charset.xml b/reference/mysqli/mysqli/get-charset.xml index a246e40ad..7bea7b60b 100644 --- a/reference/mysqli/mysqli/get-charset.xml +++ b/reference/mysqli/mysqli/get-charset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-charset" xmlns="http://docbook.org/ns/docbook"> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>object</type><methodname>mysqli::get_charset</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>mysqli::get_charset</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>object</type><methodname>mysqli_get_charset</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>object</type><type>null</type></type><methodname>mysqli_get_charset</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> diff --git a/reference/mysqli/mysqli/get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml index afa6d71c1..ba04fb85a 100644 --- a/reference/mysqli/mysqli/get-client-info.xml +++ b/reference/mysqli/mysqli/get-client-info.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-client-info" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> + <fieldsynopsis><type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>string</type><methodname>mysqli::get_client_info</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>mysqli::get_client_info</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>string</type><methodname>mysqli_get_client_info</methodname> - <methodparam choice="opt"><type>mysqli</type><parameter>link</parameter><initializer>NULL</initializer></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_get_client_info</methodname> + <methodparam choice="opt"><type class="union"><type>mysqli</type><type>null</type></type><parameter>mysql</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Возвращает строку, содержащую версию клиентской библиотеки MySQL. diff --git a/reference/mysqli/mysqli/get-client-version.xml b/reference/mysqli/mysqli/get-client-version.xml index 2e1efa13c..de45d2770 100644 --- a/reference/mysqli/mysqli/get-client-version.xml +++ b/reference/mysqli/mysqli/get-client-version.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 3ef98b0e1b7b66e8f17fd552b348aef2de5eef76 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-client-version" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_client_version</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <void/> </methodsynopsis> <para> Возвращает версию клиента в виде целого числа. diff --git a/reference/mysqli/mysqli/get-connection-stats.xml b/reference/mysqli/mysqli/get-connection-stats.xml index b42de848f..118bf6987 100644 --- a/reference/mysqli/mysqli/get-connection-stats.xml +++ b/reference/mysqli/mysqli/get-connection-stats.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-connection-stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>bool</type><methodname>mysqli::get_connection_stats</methodname> + <modifier>public</modifier> <type>array</type><methodname>mysqli::get_connection_stats</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>array</type><methodname>mysqli_get_connection_stats</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает статистику соединения с клиентом. @@ -195,7 +195,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-host-info.xml b/reference/mysqli/mysqli/get-host-info.xml index 5ffd7b3c0..fd946dc48 100644 --- a/reference/mysqli/mysqli/get-host-info.xml +++ b/reference/mysqli/mysqli/get-host-info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-host-info" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_get_host_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает строку, описывающую соединение, которое обозначено - в параметре <parameter>link</parameter> (включая + в параметре <parameter>mysql</parameter> (включая имя хоста сервера). </para> </refsect1> @@ -44,7 +44,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->host_info</varname></title> + <title>Пример использования <varname>$mysqli->host_info</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-proto-info.xml b/reference/mysqli/mysqli/get-proto-info.xml index 50893c6ad..78f4aec94 100644 --- a/reference/mysqli/mysqli/get-proto-info.xml +++ b/reference/mysqli/mysqli/get-proto-info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-proto-info" xmlns="http://docbook.org/ns/docbook"> @@ -12,15 +12,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_proto_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает целое число, представляющее собой версию протокола MySQL, - используемого для соединения, переданного в <parameter>link</parameter>. + используемого для соединения, переданного в <parameter>mysql</parameter>. </para> </refsect1> @@ -43,7 +43,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->protocol_version</varname></title> + <title>Пример использования <varname>$mysqli->protocol_version</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -103,7 +103,6 @@ Protocol version: 10 </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-server-info.xml b/reference/mysqli/mysqli/get-server-info.xml index 616577d36..4c035cf02 100644 --- a/reference/mysqli/mysqli/get-server-info.xml +++ b/reference/mysqli/mysqli/get-server-info.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: a3e019b85e3d0bf037d1cf09fe94180974b5b649 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli.get-server-info" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> <methodsynopsis role="oop"> <modifier>public</modifier> <type>string</type><methodname>mysqli_stmt::get_server_info</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>string</type><methodname>mysqli_get_server_info</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает строку, содержащую версию сервера MySQL, к которому также @@ -48,7 +48,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->server_info</varname></title> + <title>Пример использования <varname>$mysqli->server_info</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -110,7 +110,6 @@ Server version: 4.1.2-alpha-debug </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/get-server-version.xml b/reference/mysqli/mysqli/get-server-version.xml index cc522a9b5..cb0c822e8 100644 --- a/reference/mysqli/mysqli/get-server-version.xml +++ b/reference/mysqli/mysqli/get-server-version.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-server-version" xmlns="http://docbook.org/ns/docbook"> @@ -12,16 +12,16 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_get_server_version</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Функция <function>mysqli_get_server_version</function> возвращает версию сервера, к которому создано соединение (переданное в - параметре <parameter>link</parameter>) в виде целого числа. + параметре <parameter>mysql</parameter>) в виде целого числа. </para> </refsect1> @@ -49,7 +49,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->server_version</varname></title> + <title>Пример использования <varname>$mysqli->server_version</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ diff --git a/reference/mysqli/mysqli/get-warnings.xml b/reference/mysqli/mysqli/get-warnings.xml index 36ddbbf16..a2c1127b0 100644 --- a/reference/mysqli/mysqli/get-warnings.xml +++ b/reference/mysqli/mysqli/get-warnings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.get-warnings" xmlns="http://docbook.org/ns/docbook"> @@ -13,20 +13,19 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>mysqli_warning</type><methodname>mysqli::get_warnings</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli::get_warnings</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_warning</type><methodname>mysqli_get_warnings</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_get_warnings</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml