com doc/ru: Обновлен ие до англи йской верси и: language/references.xml reference/mysql/changel og.xml
reference/mysql/functions/mysql-connect.xml refe rence/mysql/functions/mysql-db-name.xml reference/mysql/fun ctions/mysql-list-tables.xml
reference/mysql/functions/mysq l-pconnect.xml reference/mysql/functions/mysql-tablename. xml reference/mysql_xdevapi/mysql_xdevapi/rowresult/getco
lumncount.xml reference/mysql_xdevapi/mysql_xdevapi/sql statementresult/

Commit: 4dadf0c0d47df83c117cee2ba8f6ffcde6cba44c Author: Sergey Panteleev <sergey@php.net> Mon, 25 Jan 2021 12:59:31 +0300 Parents: 76d71084dad3ab56a60792e867532d274706dffc Branches: master Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=4dadf0c0d47df83c117cee2ba8f6ffcde6cba44c Log: Обновление до английской версии Changed paths: M language/references.xml M reference/mysql/changelog.xml M reference/mysql/functions/mysql-connect.xml M reference/mysql/functions/mysql-db-name.xml M reference/mysql/functions/mysql-list-tables.xml M reference/mysql/functions/mysql-pconnect.xml M reference/mysql/functions/mysql-tablename.xml M reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml M reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml M reference/sockets/functions/socket-connect.xml M reference/yaf/tutorials.xml M reference/yaf/yaf_plugin_abstract/routershutdown.xml M reference/yaf/yaf_response_abstract/setredirect.xml

diff --git a/language/references.xml b/language/references.xml index 29b754983..a3e10a989 100644 --- a/language/references.xml +++ b/language/references.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a71742330defbc0edfbc6822b4f947bf437b2f70 Maintainer: irker Status: ready --> +<!-- EN-Revision: 02f3bf57175c48abff767ad2c0961c6cfe58a39e Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <chapter xml:id="language.references" xmlns="http://docbook.org/ns/docbook"> @@ -513,14 +513,6 @@ $var =& $GLOBALS["var"]; приведёт к сбросу глобальной переменной. </simpara> </sect2> - - <sect2 xml:id="references.this"> - <title><literal>$this</literal></title> - <simpara> - В методах объекта, <varname>$this</varname> всегда является ссылкой на - вызываемый объект. - </simpara> - </sect2> </sect1> </chapter> diff --git a/reference/mysql/changelog.xml b/reference/mysql/changelog.xml index e0997c211..54af1bbd2 100644 --- a/reference/mysql/changelog.xml +++ b/reference/mysql/changelog.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 27e54b061f246ebc507cb23fe1837f38f0dcce7e Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> - <appendix xmlns="http://docbook.org/ns/docbook" xml:id="changelog.mysql" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>&ChangelogListingTitle;</title> <para>&ChangelogListingDescription;</para> @@ -20,7 +19,7 @@ Следующий список представляет собой подборку изменений расширения ext/mysql. </para> <para> - <informaltable> + <informaltable xml:id="changelog.mysql.global.table"> <tgroup cols="2"> <thead> <row> @@ -78,7 +77,6 @@ </simplesect> </appendix> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml index e9fd85e30..3ee0d9675 100644 --- a/reference/mysql/functions/mysql-connect.xml +++ b/reference/mysql/functions/mysql-connect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: shein Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.mysql-connect" xmlns="http://docbook.org/ns/docbook"> @@ -124,7 +124,7 @@ <refsect1 role="changelog"> &reftitle.changelog; <para> - <informaltable> + <informaltable xml:id="function.mysql-connect.changelog"> <tgroup cols="2"> <thead> <row> diff --git a/reference/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml index 77351dec0..0ca667278 100644 --- a/reference/mysql/functions/mysql-db-name.xml +++ b/reference/mysql/functions/mysql-db-name.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: shein Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: shein Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.mysql-db-name" xmlns="http://docbook.org/ns/docbook"> @@ -75,7 +75,7 @@ <refsect1 role="changelog"> &reftitle.changelog; <para> - <informaltable> + <informaltable xml:id="function.mysql-db-name.changelog"> <tgroup cols="2"> <thead> <row> diff --git a/reference/mysql/functions/mysql-list-tables.xml b/reference/mysql/functions/mysql-list-tables.xml index fea049f1f..12cc082c2 100644 --- a/reference/mysql/functions/mysql-list-tables.xml +++ b/reference/mysql/functions/mysql-list-tables.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: shein Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.mysql-list-tables" xmlns="http://docbook.org/ns/docbook"> @@ -67,7 +67,7 @@ <refsect1 role="changelog"> &reftitle.changelog; <para> - <informaltable> + <informaltable xml:id="function.mysql-list-tables.changelog"> <tgroup cols="2"> <thead> <row> diff --git a/reference/mysql/functions/mysql-pconnect.xml b/reference/mysql/functions/mysql-pconnect.xml index f915fd2d1..241d28e53 100644 --- a/reference/mysql/functions/mysql-pconnect.xml +++ b/reference/mysql/functions/mysql-pconnect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: shein Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: shein Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.mysql-pconnect" xmlns="http://docbook.org/ns/docbook"> @@ -127,7 +127,7 @@ <refsect1 role="changelog"> &reftitle.changelog; <para> - <informaltable> + <informaltable xml:id="function.mysql-pconnect.changelog"> <tgroup cols="2"> <thead> <row> diff --git a/reference/mysql/functions/mysql-tablename.xml b/reference/mysql/functions/mysql-tablename.xml index a3cbfb814..4d45f6e3d 100644 --- a/reference/mysql/functions/mysql-tablename.xml +++ b/reference/mysql/functions/mysql-tablename.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: shein Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: shein Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.mysql-tablename" xmlns="http://docbook.org/ns/docbook"> @@ -75,7 +75,7 @@ <refsect1 role="changelog"> &reftitle.changelog; <para> - <informaltable> + <informaltable xml:id="function.mysql-tablename.changelog"> <tgroup cols="2"> <thead> <row> diff --git a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml index 1e967afca..6351065e2 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: sergey Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="mysql-xdevapi-rowresult.getcolumncount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>RowResult::getColumnsCount</refname> @@ -34,24 +33,24 @@ <refsect1 role="changelog"> &reftitle.changelog; - <informaltable> - <tgroup cols="2"> - <thead> - <row> - <entry>&Version;</entry> - <entry>&Description;</entry> - </row> - </thead> - <tbody> - <row> - <entry>8.0.14</entry> - <entry> - Метод переименован из getColumnCount() в getColumnsCount(). - </entry> - </row> - </tbody> - </tgroup> - </informaltable> + <informaltable xml:id="mysql-xdevapi-rowresult.getcolumncount.changelog"> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.14</entry> + <entry> + Метод переименован из getColumnCount() в getColumnsCount(). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> </refsect1> <refsect1 role="examples"> @@ -83,7 +82,6 @@ echo $sql->getColumnsCount(); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml index 16c327379..6445873dd 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: sergey Status: ready --> +<!-- EN-Revision: 4206843127f9a72a283b63ac82c0155a598506b1 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="mysql-xdevapi-sqlstatementresult.getcolumncount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>SqlStatementResult::getColumnsCount</refname> @@ -37,7 +36,7 @@ <refsect1 role="changelog"> &reftitle.changelog; - <informaltable> + <informaltable xml:id="mysql-xdevapi-sqlstatementresult.getcolumncount.changelog"> <tgroup cols="2"> <thead> <row> @@ -75,7 +74,6 @@ </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/sockets/functions/socket-connect.xml b/reference/sockets/functions/socket-connect.xml index 374a761e6..d0446413d 100644 --- a/reference/sockets/functions/socket-connect.xml +++ b/reference/sockets/functions/socket-connect.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 14dc7c47365f2b71f6c907a5ba5bccf42534d5a9 Maintainer: countzero Status: ready --> +<!-- EN-Revision: e58f2f64751dc0d9e0da953bac8003469f923af0 Maintainer: countzero Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="function.socket-connect" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -30,6 +30,8 @@ <term><parameter>socket</parameter></term> <listitem> <para> + Экземпляр <classname>Socket</classname>, созданный с помощью + <function>socket_create</function>. </para> </listitem> </varlistentry> diff --git a/reference/yaf/tutorials.xml b/reference/yaf/tutorials.xml index 41338840c..d2bdfb07b 100644 --- a/reference/yaf/tutorials.xml +++ b/reference/yaf/tutorials.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac9f8fcf00acafbd6c2aca0b6327fbd96a115c26 Maintainer: irker Status: ready --> +<!-- EN-Revision: df549f5248a477d03a8b4ae538d47c8852b12890 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: sergey --> - <chapter xml:id="yaf.tutorials" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -67,7 +66,7 @@ server { index index.php index.html index.htm; if (!-e $request_filename) { - rewrite ^/(.*) /index.php/$1 last; + rewrite ^/(.*) /index.php$1 last; } } @@ -162,7 +161,6 @@ class IndexController extends Yaf_Controller_Abstract { </section> </chapter> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/yaf/yaf_plugin_abstract/routershutdown.xml b/reference/yaf/yaf_plugin_abstract/routershutdown.xml index 764316adf..cd9c73c42 100644 --- a/reference/yaf/yaf_plugin_abstract/routershutdown.xml +++ b/reference/yaf/yaf_plugin_abstract/routershutdown.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 356967704344fa01375a59a99ff856e2abe1400f Maintainer: sergey Status: ready --> +<!-- EN-Revision: df549f5248a477d03a8b4ae538d47c8852b12890 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="yaf-plugin-abstract.routershutdown" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Yaf_Plugin_Abstract::routerShutdown</refname> @@ -21,8 +20,6 @@ обычно используется для проверки входа в систему. </para> - &warn.undocumented.func; - </refsect1> <refsect1 role="parameters"> @@ -80,7 +77,7 @@ class UserInitPlugin extends Yaf_Plugin_Abstract { } /* Ошибка проверки доступа, необходимо войти */ - $response->redirect("http://yourdomain.com/login/"); + $response->setRedirect("http://yourdomain.com/login/"); return FALSE; } ?> @@ -101,7 +98,6 @@ class UserInitPlugin extends Yaf_Plugin_Abstract { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/yaf/yaf_response_abstract/setredirect.xml b/reference/yaf/yaf_response_abstract/setredirect.xml index 4aac460e1..0036641b3 100644 --- a/reference/yaf/yaf_response_abstract/setredirect.xml +++ b/reference/yaf/yaf_response_abstract/setredirect.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 1f71c647dd6e32a7e4f03c33bac449c69ed2135b Maintainer: sergey Status: ready --> +<!-- EN-Revision: 0073669296609239dc81e4a98ad4e5eedea216f3 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <refentry xml:id="yaf-response-abstract.setredirect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -11,20 +11,27 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type>void</type><methodname>Yaf_Response_Abstract::setRedirect</methodname> - <void /> + <modifier>public</modifier> <type>bool</type><methodname>Yaf_Response_Abstract::setRedirect</methodname> + <methodparam><type>string</type><parameter>url</parameter></methodparam> </methodsynopsis> <para> </para> - &warn.undocumented.func; - </refsect1> <refsect1 role="parameters"> &reftitle.parameters; - &no.function.parameters; + <variablelist> + <varlistentry> + <term><parameter>url</parameter></term> + <listitem> + <para> + Адрес для перенаправления + </para> + </listitem> + </varlistentry> + </variablelist> </refsect1> <refsect1 role="returnvalues"> @@ -36,7 +43,6 @@ </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml