svn: /phpdoc/ru/trunk/reference/ fileinfo/finfo/buffer.xml fileinfo/finfo/construct.xml fileinfo/finfo/file.xml fileinfo/finfo/set-flags.xml fileinfo/functions/finfo-buffer.xml fileinfo/functions/finfo-file.xml fileinfo/functions/finfo-open.xml fileinfo/functions/finfo-set-flags.xml fileinfo/functions/mime-content-type.xml gettext/functions/dngettext.xml

Modified: phpdoc/ru/trunk/reference/fileinfo/finfo/buffer.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/finfo/buffer.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/finfo/buffer.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347865 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="finfo.buffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>string</type><methodname>finfo::buffer</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::buffer</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    &info.function.alias; <link linkend="function.finfo-buffer">finfo_buffer()</link>
@@ -21,7 +21,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/fileinfo/finfo/construct.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/finfo/construct.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/finfo/construct.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347865 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="finfo.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -10,10 +10,10 @@

  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="oop">
    <modifier>public</modifier> <methodname>finfo::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
   </constructorsynopsis>
   <para>
    &info.function.alias; <function>finfo_open</function>
@@ -20,7 +20,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/fileinfo/finfo/file.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/finfo/file.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/finfo/file.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347865 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="finfo.file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>string</type><methodname>finfo::file</methodname>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::file</methodname>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    &info.function.alias; <link linkend="function.finfo-file">finfo_file()</link>

Modified: phpdoc/ru/trunk/reference/fileinfo/finfo/set-flags.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/finfo/set-flags.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/finfo/set-flags.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 339319 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="finfo.set-flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>finfo::set_flags</methodname>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
   <para>
    &info.function.alias; <link linkend="function.finfo-set-flags">finfo_set_flags()</link>
@@ -19,7 +19,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/fileinfo/functions/finfo-buffer.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/functions/finfo-buffer.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/functions/finfo-buffer.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347865 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
@@ -13,18 +13,18 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis role="procedural">
-   <type>string</type><methodname>finfo_buffer</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>finfo_buffer</methodname>
    <methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>string</type><methodname>finfo::buffer</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::buffer</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>

   <para>
@@ -53,7 +53,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Одна или несколько объединенных через бинарное ИЛИ
@@ -79,6 +79,28 @@
   </para>
  </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>context</parameter> теперь допускает значение null.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -112,7 +134,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/fileinfo/functions/finfo-file.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/functions/finfo-file.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/functions/finfo-file.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347865 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
@@ -13,22 +13,22 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis role="procedural">
-   <type>string</type><methodname>finfo_file</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>finfo_file</methodname>
    <methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>string</type><methodname>finfo::file</methodname>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::file</methodname>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>

   <para>
-   Эта функция используется для получения информации о файле.
+   Функция используется для получения информации о файле.
   </para>

  </refsect1>
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>file_name</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        Название проверяемого файла.
@@ -53,7 +53,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Одна или несколько объединенных через бинарное ИЛИ
@@ -76,9 +76,31 @@
   &reftitle.returnvalues;
   <para>
    Возвращает текстовое описание содержимого файла
-   <parameter>file_name</parameter> или &false; в случае ошибки.
+   <parameter>filename</parameter> или &false; в случае ошибки.
   </para>
  </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>context</parameter> теперь допускает значение null.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -118,7 +140,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/fileinfo/functions/finfo-open.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/functions/finfo-open.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/functions/finfo-open.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351135 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.finfo-open" xmlns="http://docbook.org/ns/docbook">
@@ -14,14 +14,14 @@
   <para>Процедурный стиль</para>
   <methodsynopsis role="procedural">
    <type class="union"><type>resource</type><type>false</type></type><methodname>finfo_open</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>&style.oop; (конструктор):</para>
-  <constructorsynopsis>
+  <constructorsynopsis role="oop">
    <modifier>public</modifier> <methodname>finfo::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Данная функция открывает магическую базу данных и возвращает ресурс на нее.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Одна или несколько объединенных через бинарное ИЛИ
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>magic_file</parameter></term>
+     <term><parameter>magic_database</parameter></term>
      <listitem>
       <para>
        Имя файла магической базы данных, обычно что-то наподобие этого:
@@ -83,7 +83,7 @@
   <note>
    <para>
     Обычно использование встроенной магической базы данных (при
-    неустановленных <parameter>magic_file</parameter> и <literal>MAGIC</literal>)
+    неустановленных <parameter>magic_database</parameter> и <literal>MAGIC</literal>)
     лучший выбор, если вам не нужна определенная версия магической базы данных.
    </para>
   </note>
@@ -146,7 +146,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/fileinfo/functions/finfo-set-flags.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/functions/finfo-set-flags.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/functions/finfo-set-flags.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 330543 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
@@ -15,12 +15,12 @@
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>finfo_set_flags</methodname>
    <methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>finfo::set_flags</methodname>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>

   <para>
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Одна или несколько объединенных через бинарное ИЛИ
@@ -62,7 +62,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/fileinfo/functions/mime-content-type.xml
===================================================================
--- phpdoc/ru/trunk/reference/fileinfo/functions/mime-content-type.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/fileinfo/functions/mime-content-type.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351135 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.mime-content-type" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>mime_content_type</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+   <methodparam><type class="union"><type>resource</type><type>string</type></type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
    Возвращает MIME-тип содержимого файла, используя для определения
@@ -84,7 +84,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/gettext/functions/dngettext.xml
===================================================================
--- phpdoc/ru/trunk/reference/gettext/functions/dngettext.xml	2020-11-19 05:23:05 UTC (rev 351446)
+++ phpdoc/ru/trunk/reference/gettext/functions/dngettext.xml	2020-11-19 05:32:22 UTC (rev 351447)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 351407 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.dngettext" xmlns="http://docbook.org/ns/docbook">