svn: /phpdoc/ru/trunk/reference/ mysql_xdevapi/setup.xml mysqli/mysqli/set-charset.xml mysqlnd_ms/setup.xml network/functions/setrawcookie.xml reflection/reflectionclass/getmethods.xml reflection/reflectionextension/getclasses.xml session/functions/session-name.xml session/functions/session-set-cookie-params.xml

Modified: phpdoc/ru/trunk/reference/mysql_xdevapi/setup.xml
===================================================================
--- phpdoc/ru/trunk/reference/mysql_xdevapi/setup.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/mysql_xdevapi/setup.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350402 Maintainer: sergey Status: ready -->
+<!-- EN-Revision: 352079 Maintainer: sergey Status: ready -->
 <!-- Reviewed: no -->

 <chapter xml:id="mysql-xdevapi.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -71,7 +71,7 @@

   <para>
    &pecl.info;
-   <link xlink:href="&url.pecl.package;apc">&url.pecl.package;mysql_xdevapi</link>.
+   <link xlink:href="&url.pecl.package;mysql_xdevapi">&url.pecl.package;mysql_xdevapi</link>.
   </para>
  </section>


Modified: phpdoc/ru/trunk/reference/mysqli/mysqli/set-charset.xml
===================================================================
--- phpdoc/ru/trunk/reference/mysqli/mysqli/set-charset.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/mysqli/mysqli/set-charset.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350059 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 352075 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="mysqli.set-charset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -87,9 +87,9 @@

 printf("Изначальная кодировка: %s\n", $mysqli->character_set_name());

-/* изменение набора символов на utf8 */
-if (!$mysqli->set_charset("utf8")) {
-    printf("Ошибка при загрузке набора символов utf8: %s\n", $mysqli->error);
+/* изменение набора символов на utf8mb4 */
+if (!$mysqli->set_charset("utf8mb4")) {
+    printf("Ошибка при загрузке набора символов utf8mb4: %s\n", $mysqli->error);
     exit();
 } else {
     printf("Текущий набор символов: %s\n", $mysqli->character_set_name());
@@ -113,9 +113,9 @@

 printf("Изначальная кодировка: %s\n", $mysqli->character_set_name());

-/* изменение набора символов на utf8 */
-if (!mysqli_set_charset($link, "utf8")) {
-    printf("Ошибка при загрузке набора символов utf8: %s\n", mysqli_error($link));
+/* изменение набора символов на utf8mb4 */
+if (!mysqli_set_charset($link, "utf8mb4")) {
+    printf("Ошибка при загрузке набора символов utf8mb4: %s\n", mysqli_error($link));
     exit();
 } else {
     printf("Текущий набор символов: %s\n", mysqli_character_set_name($link));
@@ -129,7 +129,7 @@
    <screen>
 <![CDATA[
 Изначальная кодировка: latin1
-Текущий набор символов: utf8
+Текущий набор символов: utf8mb4
 ]]>
    </screen>
   </example>

Modified: phpdoc/ru/trunk/reference/mysqlnd_ms/setup.xml
===================================================================
--- phpdoc/ru/trunk/reference/mysqlnd_ms/setup.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/mysqlnd_ms/setup.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 347753 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 352075 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->

 <chapter xml:id="mysqlnd-ms.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -2366,7 +2366,7 @@
             }
         },
         "lazy_connections": 1,
-        "server_charset" : "utf8"
+        "server_charset" : "utf8mb4"
     }
 }
 ]]>
@@ -2375,10 +2375,10 @@
 <![CDATA[
 <?php
 $mysqli = new mysqli("myapp", "username", "password", "database");
-$mysqli->real_escape("это будет экранироваться с помощью настройки server_charset - utf8");
+$mysqli->real_escape("это будет экранироваться с помощью настройки server_charset - utf8mb4");
 $mysqli->set_charset("latin1");
 $mysqli->real_escape("это будет экранироваться с помощью latin1");
-/* server_charset implicitly set - utf8 connection */
+/* server_charset implicitly set - utf8mb4 connection */
 $mysqli->query("SELECT 'это соединение будет использовать server_charset' AS _msg FROM DUAL");
 /* теперь используется latin1*/
 $mysqli->set_charset("latin1");

Modified: phpdoc/ru/trunk/reference/network/functions/setrawcookie.xml
===================================================================
--- phpdoc/ru/trunk/reference/network/functions/setrawcookie.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/network/functions/setrawcookie.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350654 Maintainer: bfl Status: ready -->
+<!-- EN-Revision: 352083 Maintainer: bfl Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <refentry xml:id="function.setrawcookie" xmlns="http://docbook.org/ns/docbook">
@@ -20,6 +20,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>secure</parameter><initializer>&false;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>httponly</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
+  <para>Альтернативная сигнатура доступна с PHP 7.3.0:</para>
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>setrawcookie</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>

Modified: phpdoc/ru/trunk/reference/reflection/reflectionclass/getmethods.xml
===================================================================
--- phpdoc/ru/trunk/reference/reflection/reflectionclass/getmethods.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/reflection/reflectionclass/getmethods.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 340255 Maintainer: aur Status: ready -->
+<!-- EN-Revision: 352077 Maintainer: aur Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="reflectionclass.getmethods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -88,7 +88,7 @@
 <![CDATA[
 array(3) {
   [0]=>
-  &object(ReflectionMethod)#2 (2) {
+  object(ReflectionMethod)#2 (2) {
     ["name"]=>
     string(11) "firstMethod"
     ["class"]=>
@@ -95,7 +95,7 @@
     string(5) "Apple"
   }
   [1]=>
-  &object(ReflectionMethod)#3 (2) {
+  object(ReflectionMethod)#3 (2) {
     ["name"]=>
     string(12) "secondMethod"
     ["class"]=>
@@ -102,7 +102,7 @@
     string(5) "Apple"
   }
   [2]=>
-  &object(ReflectionMethod)#4 (2) {
+  object(ReflectionMethod)#4 (2) {
     ["name"]=>
     string(11) "thirdMethod"
     ["class"]=>
@@ -136,7 +136,7 @@
 <![CDATA[
 array(2) {
   [0]=>
-  &object(ReflectionMethod)#2 (2) {
+  object(ReflectionMethod)#2 (2) {
     ["name"]=>
     string(12) "secondMethod"
     ["class"]=>
@@ -143,7 +143,7 @@
     string(5) "Apple"
   }
   [1]=>
-  &object(ReflectionMethod)#3 (2) {
+  object(ReflectionMethod)#3 (2) {
     ["name"]=>
     string(11) "thirdMethod"
     ["class"]=>

Modified: phpdoc/ru/trunk/reference/reflection/reflectionextension/getclasses.xml
===================================================================
--- phpdoc/ru/trunk/reference/reflection/reflectionextension/getclasses.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/reflection/reflectionextension/getclasses.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 290998 Maintainer: aur Status: ready -->
+<!-- EN-Revision: 352077 Maintainer: aur Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->

@@ -52,7 +52,7 @@
 <![CDATA[
 array(1) {
   ["XMLWriter"]=>
-  &object(ReflectionClass)#2 (1) {
+  object(ReflectionClass)#2 (1) {
     ["name"]=>
     string(9) "XMLWriter"
   }

Modified: phpdoc/ru/trunk/reference/session/functions/session-name.xml
===================================================================
--- phpdoc/ru/trunk/reference/session/functions/session-name.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/session/functions/session-name.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351762 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 352082 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->

 <refentry xml:id="function.session-name" xmlns="http://docbook.org/ns/docbook">
@@ -75,27 +75,6 @@
   </para>
  </refsect1>

- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Пример использования <function>session_name</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* устанавливает имя сессии равным WebsiteID */
-
-$previous_name = session_name("WebsiteID");
-
-echo "Предыдущее имя сессии: $previous_name<br />";
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -131,6 +110,27 @@
   </para>
  </refsect1>

+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Пример использования <function>session_name</function></title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+/* устанавливает имя сессии равным WebsiteID */
+
+$previous_name = session_name("WebsiteID");
+
+echo "Предыдущее имя сессии: $previous_name<br />";
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -143,7 +143,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/session/functions/session-set-cookie-params.xml
===================================================================
--- phpdoc/ru/trunk/reference/session/functions/session-set-cookie-params.xml	2020-12-15 04:17:40 UTC (rev 352094)
+++ phpdoc/ru/trunk/reference/session/functions/session-set-cookie-params.xml	2020-12-15 10:29:38 UTC (rev 352095)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351750 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 352083 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->

 <refentry xml:id="function.session-set-cookie-params" xmlns="http://docbook.org/ns/docbook">
@@ -19,6 +19,7 @@
    <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>secure</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>httponly</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
+  <para>Альтернативная сигнатура доступна с PHP 7.3.0:</para>
   <methodsynopsis>
    <type>bool</type><methodname>session_set_cookie_params</methodname>
    <methodparam><type>array</type><parameter>lifetime_or_options</parameter></methodparam>