com doc/ru: Обновлен ие до англи йской верси и: language/predefined/serializable/serialize.xml
reference/datetime/formats.xml reference/filesystem/functio ns/fgets.xml reference/session/ini.xml
| From: | Sergey Panteleev | Date: | Thu, 28 Jan 2021 17:58:51 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: language/predefined/serializable/serialize.xml reference/datetime/formats.xml reference/filesystem/functio ns/fgets.xml reference/session/ini.xml |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8778@lists.php.net to get a copy of this message | ||
Commit: d1c62662e6ff56fc5a2c5cd391fbe5fde1a73620
Author: Sergey Panteleev <sergey@php.net> Thu, 28 Jan 2021 20:58:51 +0300
Parents: 093a71538cb270cb42e98f28c24a6781e1651fec
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=d1c62662e6ff56fc5a2c5cd391fbe5fde1a73620
Log:
Обновление до английской версии
Changed paths:
M language/predefined/serializable/serialize.xml
M reference/datetime/formats.xml
M reference/filesystem/functions/fgets.xml
M reference/session/ini.xml
diff --git a/language/predefined/serializable/serialize.xml b/language/predefined/serializable/serialize.xml index d67795b92..6aa9588c5 100644 --- a/language/predefined/serializable/serialize.xml +++ b/language/predefined/serializable/serialize.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 83d6523933ab364865e321ad8e127117435b0803 Maintainer: das Status: ready --> +<!-- EN-Revision: fc4e5c27fa0f37f42420ae24300ad0b3d6c1a77b Maintainer: das Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> - <refentry xml:id="serializable.serialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Serializable::serialize</refname> @@ -12,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Serializable::serialize</methodname> + <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Serializable::serialize</methodname> <void /> </methodsynopsis> <para> @@ -51,7 +50,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/datetime/formats.xml b/reference/datetime/formats.xml index ac937a03e..03f598bee 100644 --- a/reference/datetime/formats.xml +++ b/reference/datetime/formats.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a59ed9b526c8bae64a3e762063f2bd4de39a00da Maintainer: aur Status: ready --> +<!-- EN-Revision: f3bc618211dd65a97eb427aceb9473d3b4a0c3d0 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <chapter xml:id="datetime.formats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -116,7 +116,7 @@ <entry>"4:08:37 am", "7:19:19P.M."</entry> </row> <row> - <entry>MS SQL (Часы, минуты, секунды и дробная часть с Ante meridiem или Post meridiem), в версии не ниже PHP 5.3</entry> + <entry>MS SQL (Часы, минуты, секунды и дробная часть с Ante meridiem или Post meridiem)</entry> <entry><literal>hh</literal> ":" <literal>MM</literal> ":" <literal>II</literal> [.:] [0-9]+ <literal>meridian</literal></entry> <entry>"4:08:39:12313am"</entry> </row> @@ -418,7 +418,7 @@ </para> </note> - <note> + <caution> <para> Возможен выход за границы диапазона форматов <literal>dd</literal> и <literal>DD</literal>. День месяца с порядковым номером 0 подразумевает последний день предыдущего месяца в @@ -426,7 +426,7 @@ "2008-07-31", а "2008-06-31" соответствует "2008-07-01" (в июне всего 30 дней). </para> <para> - Обратите внимание, что с PHP 5.1.0 диапазон дней ограничен 0-31, как указано выше + Обратите внимание, что диапазон дней ограничен 0-31, как указано выше регулярным выражением. Так что, например, "2008-06-32" - некорректная дата. </para> <para> @@ -441,7 +441,7 @@ будет преобразована к "-0001-11-30" (минус первый год в календаре ISO 8601 и 2 год до н.э. по григорианскому календарю). </para> - </note> + </caution> </sect1> <!--}}}--> diff --git a/reference/filesystem/functions/fgets.xml b/reference/filesystem/functions/fgets.xml index 04dc60549..126f6b1ff 100644 --- a/reference/filesystem/functions/fgets.xml +++ b/reference/filesystem/functions/fgets.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: shein Status: ready --> +<!-- EN-Revision: 359f21684be3993e948f8f7c994c125971665535 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fgets"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>string</type><methodname>fgets</methodname> + <type class="union"><type>string</type><type>false</type></type><methodname>fgets</methodname> <methodparam><type>resource</type><parameter>handle</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> </methodsynopsis> diff --git a/reference/session/ini.xml b/reference/session/ini.xml index 758769b1a..5bf837e5c 100644 --- a/reference/session/ini.xml +++ b/reference/session/ini.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: f3d6ada6156b28791a28efebe2e5c070159c3a94 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 7dc5a6466b5c49cd712fc19a520f106b4d2d1110 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; @@ -17,7 +17,7 @@ <entry>&Changelog;</entry> </row> </thead> - <tbody> + <tbody xml:id="session.configuration.list"> <row> <entry><link linkend="ini.session.save-path">session.save_path</link></entry> <entry>""</entry> @@ -94,7 +94,7 @@ <entry><link linkend="ini.session.cookie-httponly">session.cookie_httponly</link></entry> <entry>""</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 5.2.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.cookie-samesite">session.cookie_samesite</link></entry> @@ -106,7 +106,7 @@ <entry><link linkend="ini.session.use-strict-mode">session.use_strict_mode</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 5.5.2.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.use-cookies">session.use_cookies</link></entry> @@ -172,49 +172,43 @@ <entry><link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.cleanup">session.upload_progress.cleanup</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.prefix">session.upload_progress.prefix</link></entry> <entry>"upload_progress_"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.name">session.upload_progress.name</link></entry> <entry>"PHP_SESSION_UPLOAD_PROGRESS"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.freq">session.upload_progress.freq</link></entry> <entry>"1%"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.min-freq">session.upload_progress.min_freq</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.lazy-write">session.lazy_write</link></entry> <entry>"1"</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 7.0.0.</entry> - </row> - <row> - <entry><link linkend="ini.url-rewriter.tags">url_rewriter.tags</link></entry> - <entry>"a=href,area=href,frame=src,form="</entry> - <entry>PHP_INI_ALL</entry> - <entry>Доступно с PHP 7.1.0, но данная INI-настройка не используется сессиями</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>
diff --git a/language/predefined/serializable/serialize.xml b/language/predefined/serializable/serialize.xml index d67795b92..6aa9588c5 100644 --- a/language/predefined/serializable/serialize.xml +++ b/language/predefined/serializable/serialize.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 83d6523933ab364865e321ad8e127117435b0803 Maintainer: das Status: ready --> +<!-- EN-Revision: fc4e5c27fa0f37f42420ae24300ad0b3d6c1a77b Maintainer: das Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> - <refentry xml:id="serializable.serialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Serializable::serialize</refname> @@ -12,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Serializable::serialize</methodname> + <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Serializable::serialize</methodname> <void /> </methodsynopsis> <para> @@ -51,7 +50,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/datetime/formats.xml b/reference/datetime/formats.xml index ac937a03e..03f598bee 100644 --- a/reference/datetime/formats.xml +++ b/reference/datetime/formats.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a59ed9b526c8bae64a3e762063f2bd4de39a00da Maintainer: aur Status: ready --> +<!-- EN-Revision: f3bc618211dd65a97eb427aceb9473d3b4a0c3d0 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <chapter xml:id="datetime.formats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -116,7 +116,7 @@ <entry>"4:08:37 am", "7:19:19P.M."</entry> </row> <row> - <entry>MS SQL (Часы, минуты, секунды и дробная часть с Ante meridiem или Post meridiem), в версии не ниже PHP 5.3</entry> + <entry>MS SQL (Часы, минуты, секунды и дробная часть с Ante meridiem или Post meridiem)</entry> <entry><literal>hh</literal> ":" <literal>MM</literal> ":" <literal>II</literal> [.:] [0-9]+ <literal>meridian</literal></entry> <entry>"4:08:39:12313am"</entry> </row> @@ -418,7 +418,7 @@ </para> </note> - <note> + <caution> <para> Возможен выход за границы диапазона форматов <literal>dd</literal> и <literal>DD</literal>. День месяца с порядковым номером 0 подразумевает последний день предыдущего месяца в @@ -426,7 +426,7 @@ "2008-07-31", а "2008-06-31" соответствует "2008-07-01" (в июне всего 30 дней). </para> <para> - Обратите внимание, что с PHP 5.1.0 диапазон дней ограничен 0-31, как указано выше + Обратите внимание, что диапазон дней ограничен 0-31, как указано выше регулярным выражением. Так что, например, "2008-06-32" - некорректная дата. </para> <para> @@ -441,7 +441,7 @@ будет преобразована к "-0001-11-30" (минус первый год в календаре ISO 8601 и 2 год до н.э. по григорианскому календарю). </para> - </note> + </caution> </sect1> <!--}}}--> diff --git a/reference/filesystem/functions/fgets.xml b/reference/filesystem/functions/fgets.xml index 04dc60549..126f6b1ff 100644 --- a/reference/filesystem/functions/fgets.xml +++ b/reference/filesystem/functions/fgets.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: shein Status: ready --> +<!-- EN-Revision: 359f21684be3993e948f8f7c994c125971665535 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fgets"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>string</type><methodname>fgets</methodname> + <type class="union"><type>string</type><type>false</type></type><methodname>fgets</methodname> <methodparam><type>resource</type><parameter>handle</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> </methodsynopsis> diff --git a/reference/session/ini.xml b/reference/session/ini.xml index 758769b1a..5bf837e5c 100644 --- a/reference/session/ini.xml +++ b/reference/session/ini.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: f3d6ada6156b28791a28efebe2e5c070159c3a94 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 7dc5a6466b5c49cd712fc19a520f106b4d2d1110 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; @@ -17,7 +17,7 @@ <entry>&Changelog;</entry> </row> </thead> - <tbody> + <tbody xml:id="session.configuration.list"> <row> <entry><link linkend="ini.session.save-path">session.save_path</link></entry> <entry>""</entry> @@ -94,7 +94,7 @@ <entry><link linkend="ini.session.cookie-httponly">session.cookie_httponly</link></entry> <entry>""</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 5.2.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.cookie-samesite">session.cookie_samesite</link></entry> @@ -106,7 +106,7 @@ <entry><link linkend="ini.session.use-strict-mode">session.use_strict_mode</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 5.5.2.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.use-cookies">session.use_cookies</link></entry> @@ -172,49 +172,43 @@ <entry><link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.cleanup">session.upload_progress.cleanup</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.prefix">session.upload_progress.prefix</link></entry> <entry>"upload_progress_"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.name">session.upload_progress.name</link></entry> <entry>"PHP_SESSION_UPLOAD_PROGRESS"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.freq">session.upload_progress.freq</link></entry> <entry>"1%"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.upload-progress.min-freq">session.upload_progress.min_freq</link></entry> <entry>"1"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>Доступна с PHP 5.4.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.lazy-write">session.lazy_write</link></entry> <entry>"1"</entry> <entry>PHP_INI_ALL</entry> - <entry>Доступна с PHP 7.0.0.</entry> - </row> - <row> - <entry><link linkend="ini.url-rewriter.tags">url_rewriter.tags</link></entry> - <entry>"a=href,area=href,frame=src,form="</entry> - <entry>PHP_INI_ALL</entry> - <entry>Доступно с PHP 7.1.0, но данная INI-настройка не используется сессиями</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>