com doc/ru: Fix after merge: language/predefined/variables.xml reference/errorfunc/setup.xml reference/info/setup.xml reference/misc/setup.xml
reference/outcontrol/constants.xml reference/outcontrol/setup.xml reference/session/setup.xml reference/shmop/examples.xml reference/stream/errors.xml
reference/stream/filters.xml reference/stream/setup.xml reference/zip/functions/zip-close.xml reference/zip/functions/zip-entry-close.xml
reference/zip/func
| From: | Alexey Pyltsyn | Date: | Tue, 05 Jan 2021 17:49:13 +0000 |
| Subject: | com doc/ru: Fix after merge: language/predefined/variables.xml reference/errorfunc/setup.xml reference/info/setup.xml reference/misc/setup.xml reference/outcontrol/constants.xml reference/outcontrol/setup.xml reference/session/setup.xml reference/shmop/examples.xml reference/stream/errors.xml reference/stream/filters.xml reference/stream/setup.xml reference/zip/functions/zip-close.xml reference/zip/functions/zip-entry-close.xml reference/zip/func |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8717@lists.php.net to get a copy of this message | ||
Commit: d56893bf0f9ce62c53e9b8cd384b4ac55294bf69
Author: Alexey Pyltsyn <lex61rus@gmail.com> Tue, 5 Jan 2021 20:20:44 +0300
Parents: 68c04d75ccc5841ec56701dae4575458a0e005c6
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=d56893bf0f9ce62c53e9b8cd384b4ac55294bf69
Log:
Fix after merge
Closes GH-9
Changed paths:
M language/predefined/variables.xml
M reference/errorfunc/setup.xml
M reference/info/setup.xml
M reference/misc/setup.xml
M reference/outcontrol/constants.xml
M reference/outcontrol/setup.xml
M reference/session/setup.xml
M reference/shmop/examples.xml
M reference/stream/errors.xml
M reference/stream/filters.xml
M reference/stream/setup.xml
M reference/zip/functions/zip-close.xml
M reference/zip/functions/zip-entry-close.xml
M reference/zip/functions/zip-entry-compressedsize.xml
M reference/zip/functions/zip-entry-compressionmethod.xml
M reference/zip/functions/zip-entry-filesize.xml
M reference/zip/functions/zip-entry-name.xml
M reference/zip/functions/zip-entry-read.xml
M reference/zip/functions/zip-open.xml
M reference/zip/functions/zip-read.xml
diff --git a/language/predefined/variables.xml b/language/predefined/variables.xml index 942318d13..3ab60e1d2 100644 --- a/language/predefined/variables.xml +++ b/language/predefined/variables.xml @@ -55,4 +55,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/errorfunc/setup.xml b/reference/errorfunc/setup.xml index 43c56bcba..5d2e093e8 100644 --- a/reference/errorfunc/setup.xml +++ b/reference/errorfunc/setup.xml @@ -44,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/info/setup.xml b/reference/info/setup.xml index 9a95bb897..919bbe352 100644 --- a/reference/info/setup.xml +++ b/reference/info/setup.xml @@ -45,4 +45,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/misc/setup.xml b/reference/misc/setup.xml index 7acf52d58..aa126d6a8 100644 --- a/reference/misc/setup.xml +++ b/reference/misc/setup.xml @@ -45,4 +45,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/outcontrol/constants.xml b/reference/outcontrol/constants.xml index 51ad96511..99806b21a 100644 --- a/reference/outcontrol/constants.xml +++ b/reference/outcontrol/constants.xml @@ -189,4 +189,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/outcontrol/setup.xml b/reference/outcontrol/setup.xml index dd57098e7..111e7b443 100644 --- a/reference/outcontrol/setup.xml +++ b/reference/outcontrol/setup.xml @@ -44,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/session/setup.xml b/reference/session/setup.xml index 6c0f908c3..eab9159c7 100644 --- a/reference/session/setup.xml +++ b/reference/session/setup.xml @@ -57,4 +57,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/shmop/examples.xml b/reference/shmop/examples.xml index 2379406de..f34c0e67b 100644 --- a/reference/shmop/examples.xml +++ b/reference/shmop/examples.xml @@ -71,4 +71,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/errors.xml b/reference/stream/errors.xml index cb6d092d9..8339e04cd 100644 --- a/reference/stream/errors.xml +++ b/reference/stream/errors.xml @@ -40,4 +40,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/filters.xml b/reference/stream/filters.xml index 724c88f30..e388f1803 100644 --- a/reference/stream/filters.xml +++ b/reference/stream/filters.xml @@ -37,4 +37,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/setup.xml b/reference/stream/setup.xml index 0e7bbfda4..6d644ed50 100644 --- a/reference/stream/setup.xml +++ b/reference/stream/setup.xml @@ -58,4 +58,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/zip/functions/zip-close.xml b/reference/zip/functions/zip-close.xml index f4cd2dacf..eb11abdd8 100644 --- a/reference/zip/functions/zip-close.xml +++ b/reference/zip/functions/zip-close.xml @@ -8,11 +8,11 @@ <refname>zip_close</refname> <refpurpose>Закрывает дескриптор ZIP-архива</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> - + <refsect1 role="description"> &reftitle.description; <methodsynopsis> diff --git a/reference/zip/functions/zip-entry-close.xml b/reference/zip/functions/zip-entry-close.xml index 872b0c873..e7e96ae17 100644 --- a/reference/zip/functions/zip-entry-close.xml +++ b/reference/zip/functions/zip-entry-close.xml @@ -8,7 +8,7 @@ <refname>zip_entry_close</refname> <refpurpose>Закрывает дескриптор директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-compressedsize.xml b/reference/zip/functions/zip-entry-compressedsize.xml index 5ace13961..9c6ae8f61 100644 --- a/reference/zip/functions/zip-entry-compressedsize.xml +++ b/reference/zip/functions/zip-entry-compressedsize.xml @@ -8,7 +8,7 @@ <refname>zip_entry_compressedsize</refname> <refpurpose>Возвращает сжатый размер файла для дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-compressionmethod.xml b/reference/zip/functions/zip-entry-compressionmethod.xml index e6210c30a..cb48467f9 100644 --- a/reference/zip/functions/zip-entry-compressionmethod.xml +++ b/reference/zip/functions/zip-entry-compressionmethod.xml @@ -8,7 +8,7 @@ <refname>zip_entry_compressionmethod</refname> <refpurpose>Возвращает метод сжатия дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-filesize.xml b/reference/zip/functions/zip-entry-filesize.xml index 6cd7eeef8..f3af8ce2c 100644 --- a/reference/zip/functions/zip-entry-filesize.xml +++ b/reference/zip/functions/zip-entry-filesize.xml @@ -8,7 +8,7 @@ <refname>zip_entry_filesize</refname> <refpurpose>Возвращает реальный размер файла для дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-name.xml b/reference/zip/functions/zip-entry-name.xml index 5ca5e15ab..19657db65 100644 --- a/reference/zip/functions/zip-entry-name.xml +++ b/reference/zip/functions/zip-entry-name.xml @@ -8,7 +8,7 @@ <refname>zip_entry_name</refname> <refpurpose>Получает имя дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-read.xml b/reference/zip/functions/zip-entry-read.xml index 44ffa3961..03a8a6168 100644 --- a/reference/zip/functions/zip-entry-read.xml +++ b/reference/zip/functions/zip-entry-read.xml @@ -8,7 +8,7 @@ <refname>zip_entry_read</refname> <refpurpose>Читает данные из открытого ранее дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-open.xml b/reference/zip/functions/zip-open.xml index 6ba2c7515..3ddc52630 100644 --- a/reference/zip/functions/zip-open.xml +++ b/reference/zip/functions/zip-open.xml @@ -8,7 +8,7 @@ <refname>zip_open</refname> <refpurpose>Открывает ZIP-архив</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-read.xml b/reference/zip/functions/zip-read.xml index 7b01e2a10..293d519e2 100644 --- a/reference/zip/functions/zip-read.xml +++ b/reference/zip/functions/zip-read.xml @@ -8,7 +8,7 @@ <refname>zip_read</refname> <refpurpose>Считывает следующую запись в ZIP-архиве</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv>
diff --git a/language/predefined/variables.xml b/language/predefined/variables.xml index 942318d13..3ab60e1d2 100644 --- a/language/predefined/variables.xml +++ b/language/predefined/variables.xml @@ -55,4 +55,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/errorfunc/setup.xml b/reference/errorfunc/setup.xml index 43c56bcba..5d2e093e8 100644 --- a/reference/errorfunc/setup.xml +++ b/reference/errorfunc/setup.xml @@ -44,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/info/setup.xml b/reference/info/setup.xml index 9a95bb897..919bbe352 100644 --- a/reference/info/setup.xml +++ b/reference/info/setup.xml @@ -45,4 +45,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/misc/setup.xml b/reference/misc/setup.xml index 7acf52d58..aa126d6a8 100644 --- a/reference/misc/setup.xml +++ b/reference/misc/setup.xml @@ -45,4 +45,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/outcontrol/constants.xml b/reference/outcontrol/constants.xml index 51ad96511..99806b21a 100644 --- a/reference/outcontrol/constants.xml +++ b/reference/outcontrol/constants.xml @@ -189,4 +189,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/outcontrol/setup.xml b/reference/outcontrol/setup.xml index dd57098e7..111e7b443 100644 --- a/reference/outcontrol/setup.xml +++ b/reference/outcontrol/setup.xml @@ -44,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/session/setup.xml b/reference/session/setup.xml index 6c0f908c3..eab9159c7 100644 --- a/reference/session/setup.xml +++ b/reference/session/setup.xml @@ -57,4 +57,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/shmop/examples.xml b/reference/shmop/examples.xml index 2379406de..f34c0e67b 100644 --- a/reference/shmop/examples.xml +++ b/reference/shmop/examples.xml @@ -71,4 +71,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/errors.xml b/reference/stream/errors.xml index cb6d092d9..8339e04cd 100644 --- a/reference/stream/errors.xml +++ b/reference/stream/errors.xml @@ -40,4 +40,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/filters.xml b/reference/stream/filters.xml index 724c88f30..e388f1803 100644 --- a/reference/stream/filters.xml +++ b/reference/stream/filters.xml @@ -37,4 +37,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/stream/setup.xml b/reference/stream/setup.xml index 0e7bbfda4..6d644ed50 100644 --- a/reference/stream/setup.xml +++ b/reference/stream/setup.xml @@ -58,4 +58,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - diff --git a/reference/zip/functions/zip-close.xml b/reference/zip/functions/zip-close.xml index f4cd2dacf..eb11abdd8 100644 --- a/reference/zip/functions/zip-close.xml +++ b/reference/zip/functions/zip-close.xml @@ -8,11 +8,11 @@ <refname>zip_close</refname> <refpurpose>Закрывает дескриптор ZIP-архива</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> - + <refsect1 role="description"> &reftitle.description; <methodsynopsis> diff --git a/reference/zip/functions/zip-entry-close.xml b/reference/zip/functions/zip-entry-close.xml index 872b0c873..e7e96ae17 100644 --- a/reference/zip/functions/zip-entry-close.xml +++ b/reference/zip/functions/zip-entry-close.xml @@ -8,7 +8,7 @@ <refname>zip_entry_close</refname> <refpurpose>Закрывает дескриптор директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-compressedsize.xml b/reference/zip/functions/zip-entry-compressedsize.xml index 5ace13961..9c6ae8f61 100644 --- a/reference/zip/functions/zip-entry-compressedsize.xml +++ b/reference/zip/functions/zip-entry-compressedsize.xml @@ -8,7 +8,7 @@ <refname>zip_entry_compressedsize</refname> <refpurpose>Возвращает сжатый размер файла для дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-compressionmethod.xml b/reference/zip/functions/zip-entry-compressionmethod.xml index e6210c30a..cb48467f9 100644 --- a/reference/zip/functions/zip-entry-compressionmethod.xml +++ b/reference/zip/functions/zip-entry-compressionmethod.xml @@ -8,7 +8,7 @@ <refname>zip_entry_compressionmethod</refname> <refpurpose>Возвращает метод сжатия дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-filesize.xml b/reference/zip/functions/zip-entry-filesize.xml index 6cd7eeef8..f3af8ce2c 100644 --- a/reference/zip/functions/zip-entry-filesize.xml +++ b/reference/zip/functions/zip-entry-filesize.xml @@ -8,7 +8,7 @@ <refname>zip_entry_filesize</refname> <refpurpose>Возвращает реальный размер файла для дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-name.xml b/reference/zip/functions/zip-entry-name.xml index 5ca5e15ab..19657db65 100644 --- a/reference/zip/functions/zip-entry-name.xml +++ b/reference/zip/functions/zip-entry-name.xml @@ -8,7 +8,7 @@ <refname>zip_entry_name</refname> <refpurpose>Получает имя дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-entry-read.xml b/reference/zip/functions/zip-entry-read.xml index 44ffa3961..03a8a6168 100644 --- a/reference/zip/functions/zip-entry-read.xml +++ b/reference/zip/functions/zip-entry-read.xml @@ -8,7 +8,7 @@ <refname>zip_entry_read</refname> <refpurpose>Читает данные из открытого ранее дескриптора директории</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-open.xml b/reference/zip/functions/zip-open.xml index 6ba2c7515..3ddc52630 100644 --- a/reference/zip/functions/zip-open.xml +++ b/reference/zip/functions/zip-open.xml @@ -8,7 +8,7 @@ <refname>zip_open</refname> <refpurpose>Открывает ZIP-архив</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv> diff --git a/reference/zip/functions/zip-read.xml b/reference/zip/functions/zip-read.xml index 7b01e2a10..293d519e2 100644 --- a/reference/zip/functions/zip-read.xml +++ b/reference/zip/functions/zip-read.xml @@ -8,7 +8,7 @@ <refname>zip_read</refname> <refpurpose>Считывает следующую запись в ZIP-архиве</refpurpose> </refnamediv> - + <refsynopsisdiv> &warn.deprecated.function-8-0-0; </refsynopsisdiv>