svn: /phpdoc/ru/trunk/reference/datetime/functions/ date-default-timezone-set.xml date-parse.xml date-sun-info.xml date-sunrise.xml date-sunset.xml date.xml getdate.xml gmdate.xml gmmktime.xml gmstrftime.xml idate.xml localtime.xml mktime.xml strftime.xml strtotime.xml

Modified: phpdoc/ru/trunk/reference/datetime/functions/date-default-timezone-set.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date-default-timezone-set.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date-default-timezone-set.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350653 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date-default-timezone-set" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>date_default_timezone_set</methodname>
-   <methodparam><type>string</type><parameter>timezoneID</parameter></methodparam>
+   <methodparam><type>string</type><parameter>timezoneId</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>date_default_timezone_set</function> устанавливает временную
@@ -41,7 +41,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>timezoneID</parameter></term>
+     <term><parameter>timezoneId</parameter></term>
      <listitem>
       <para>
        Идентификатор временной зоны, как например <literal>UTC</literal>,
@@ -58,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Функция возвращает &false;, если <parameter>timezoneID</parameter>
+   Функция возвращает &false;, если <parameter>timezoneId</parameter>
    имеет неверное значение, в остальных случаях &true;.
   </para>
  </refsect1>
@@ -92,12 +92,11 @@
   <para>
    <simplelist>
     <member><function>date_default_timezone_get</function></member>
-    <member><xref linkend="timezones" /></member>
+    <member><xref linkend="timezones"/></member>
    </simplelist>
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/date-parse.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date-parse.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date-parse.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351135 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes Maintainer: rjhdby -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date-parse" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>date_parse</methodname>
+   <type>array</type><methodname>date_parse</methodname>
    <methodparam><type>string</type><parameter>datetime</parameter></methodparam>
   </methodsynopsis>
  </refsect1>
@@ -166,7 +166,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/datetime/functions/date-sun-info.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date-sun-info.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date-sun-info.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351135 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date-sun-info" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>date_sun_info</methodname>
+   <type>array</type><methodname>date_sun_info</methodname>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
    <methodparam><type>float</type><parameter>latitude</parameter></methodparam>
    <methodparam><type>float</type><parameter>longitude</parameter></methodparam>
@@ -257,7 +257,6 @@
  </refsect1>

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

Modified: phpdoc/ru/trunk/reference/datetime/functions/date-sunrise.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date-sunrise.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date-sunrise.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351133 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date-sunrise" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -13,13 +13,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>date_sunrise</methodname>
+   <type class="union"><type>string</type><type>int</type><type>float</type><type>false</type></type><methodname>date_sunrise</methodname>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>returnFormat</parameter><initializer>SUNFUNCS_RET_STRING</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>latitude</parameter><initializer>ini_get("date.default_latitude")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>longitude</parameter><initializer>ini_get("date.default_longitude")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>zenith</parameter><initializer>ini_get("date.sunrise_zenith")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>utcOffset</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>returnFormat</parameter><initializer><constant>SUNFUNCS_RET_STRING</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>latitude</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>longitude</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>zenith</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>utcOffset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>date_sunrise</function> возвращает время рассвета для
@@ -172,6 +172,31 @@
    &date.timezone.errors.description;

  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>latitude</parameter>, <parameter>longitude</parameter>,
+        <parameter>zenith</parameter> и <parameter>latitude</parameter> теперь допускают значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -231,7 +256,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/date-sunset.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date-sunset.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date-sunset.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351133 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date-sunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -13,14 +13,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>date_sunset</methodname>
+   <type class="union"><type>string</type><type>int</type><type>float</type><type>false</type></type><methodname>date_sunset</methodname>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>returnFormat</parameter><initializer>SUNFUNCS_RET_STRING</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>latitude</parameter><initializer>ini_get("date.default_latitude")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>longitude</parameter><initializer>ini_get("date.default_longitude")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>zenith</parameter><initializer>ini_get("date.sunset_zenith")</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>utcOffset</parameter><initializer>0</initializer></methodparam>
-   </methodsynopsis>
+   <methodparam choice="opt"><type>int</type><parameter>returnFormat</parameter><initializer><constant>SUNFUNCS_RET_STRING</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>latitude</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>longitude</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>zenith</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>utcOffset</parameter><initializer>0</initializer></methodparam>
+  </methodsynopsis>
    <para>
     <function>date_sunset</function> возвращает время захода солнца для
     определенных дня (заданного аргументом <parameter>timestamp</parameter>)
@@ -172,6 +172,31 @@
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>latitude</parameter>, <parameter>longitude</parameter>,
+        <parameter>zenith</parameter> и <parameter>latitude</parameter> теперь допускают значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -230,8 +255,6 @@
   </para>
  </refsect1>
 </refentry>
-
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/date.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/date.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/date.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350653 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.date" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>string</type><methodname>date</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Возвращает строку, отформатированную в соответствии с указанным шаблоном
@@ -56,6 +56,30 @@

  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -197,7 +221,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/getdate.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/getdate.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/getdate.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 311354 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.getdate" xmlns="http://docbook.org/ns/docbook">
@@ -12,13 +12,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>getdate</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Возвращает ассоциативный массив (<type>array</type>), содержащий
    информацию о дате, представленной меткой времени
    <parameter>timestamp</parameter> или текущим системным временем,
-   если <parameter>timestamp</parameter> не был передан.
+   если <parameter>timestamp</parameter> не был передан или &null;.
   </para>
  </refsect1>

@@ -118,6 +118,30 @@
    </table>
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -168,7 +192,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/gmdate.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/gmdate.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/gmdate.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350653 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.gmdate" xmlns="http://docbook.org/ns/docbook">
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>string</type><methodname>gmdate</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Эта функция идентична функции <function>date</function> за
@@ -44,12 +44,33 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает строку с форматированной датой. Если для параметра
-   <parameter>timestamp</parameter> указано нечисловое значение, то
-   будет возращено &false; и вызвана ошибка уровня
-   <constant>E_WARNING</constant>.
+   Возвращает строку с форматированной датой.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -84,7 +105,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/gmmktime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/gmmktime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/gmmktime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351133 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352144 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.gmmktime" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>gmmktime</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>hour</parameter><initializer>gmdate("H")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>minute</parameter><initializer>gmdate("i")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>second</parameter><initializer>gmdate("s")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>month</parameter><initializer>gmdate("n")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>day</parameter><initializer>gmdate("j")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>year</parameter><initializer>gmdate("Y")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>isDST</parameter><initializer>-1</initializer></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>gmmktime</methodname>
+   <methodparam><type>int</type><parameter>hour</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>minute</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>second</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>month</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>day</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>year</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Эта функция идентична функции <function>mktime</function>, за исключением того, что
@@ -31,6 +30,10 @@
    опущены в порядке справа налево, в этом случае они предполагаются
    равными соответствующим компонентам текущего времени по Гринвичу.
   </para>
+  <simpara>
+   Вызов <function>gmmktime</function> без аргументов устарел.
+   Для получения текущей отметки времени можно использовать <function>time</function>.
+  </simpara>
  </refsect1>

  <refsect1 role="parameters">
@@ -127,9 +130,40 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает временную метку Unix (<type>int</type>).
+   Возвращает временную метку Unix (<type>int</type>) в случае успешного выполнения, &return.falseforfailure;..
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>hour</parameter> больше не является необязательным.
+       </entry>
+      </row>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>minute</parameter>, <parameter>second</parameter>, <parameter>month</parameter>,
+        <parameter>day</parameter> и <parameter>year</parameter> теперь допускают значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -159,7 +193,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/gmstrftime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/gmstrftime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/gmstrftime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.gmstrftime" xmlns="http://docbook.org/ns/docbook">
@@ -11,9 +11,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>gmstrftime</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>gmstrftime</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Эта функция идентична функции <function>strftime</function> за
@@ -50,8 +50,33 @@
    указана. Названия месяцев, дней недели и других языкозависимых строк
    будут показаны с учетом настроек текущей локали, установленных
    с помощью функции <function>setlocale</function>.
+   В случае возникновения ошибки возвращает &false;.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -80,7 +105,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/idate.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/idate.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/idate.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision:  351133 Maintainer: tmn Status: ready -->
+<!-- EN-Revision:  352143 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.idate" xmlns="http://docbook.org/ns/docbook">
@@ -11,9 +11,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>idate</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>idate</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Преобразует текущую дату и время в целое число в соответствии со строкой
@@ -135,7 +135,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает целое число (<type>int</type>).
+   Возвращает целое число (<type>int</type>) в случае успешного выполнения, &return.falseforfailure;.
   </para>
   <para>
    <function>idate</function> всегда возвращает тип
@@ -151,6 +151,30 @@
    &date.timezone.errors.description;

  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -184,7 +208,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/localtime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/localtime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/localtime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350653 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.localtime" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>localtime</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>associative</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -104,6 +104,30 @@
    &date.timezone.errors.description;

  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

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

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

Modified: phpdoc/ru/trunk/reference/datetime/functions/mktime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/mktime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/mktime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351730 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352144 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.mktime" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>mktime</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>hour</parameter><initializer>date("H")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>minute</parameter><initializer>date("i")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>second</parameter><initializer>date("s")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>month</parameter><initializer>date("n")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>day</parameter><initializer>date("j")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>year</parameter><initializer>date("Y")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>isDST</parameter><initializer>-1</initializer></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>mktime</methodname>
+   <methodparam><type>int</type><parameter>hour</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>minute</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>second</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>month</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>day</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>year</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Функция возвращает метку времени Unix, соответствующую дате и времени, переданных в
@@ -29,19 +28,12 @@
    Аргументы могут быть опущены в порядке справа налево. В этом случае их значения по
    умолчанию равны соответствующим компонентам локальной даты/времени.
   </para>
+  <simpara>
+   Вызов <function>mktime</function> без аргументов устарел.
+   Для получения текущей отметки времени можно использовать <function>time</function>.
+  </simpara>
  </refsect1>

- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Начиная с версии PHP 5.1, если <function>mktime</function> вызывается без аргументов,
-    то будет сгенерировано замечание уровня <constant>E_STRICT</constant>. Используйте
-    вместо этого функцию <function>time</function>.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -167,6 +159,37 @@
   &reftitle.errors;
   &date.timezone.errors.description;
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>hour</parameter> больше не является необязательным.
+       </entry>
+      </row>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>minute</parameter>, <parameter>second</parameter>, <parameter>month</parameter>,
+        <parameter>day</parameter> и <parameter>year</parameter> теперь допускают значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>

  <refsect1 role="examples">
   &reftitle.examples;
@@ -256,7 +279,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/strftime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/strftime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/strftime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 352122 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.strftime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,9 +11,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>strftime</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>strftime</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timestamp</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>timestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Форматирует дату/время с учетом текущих настроек локали. Названия месяцев, дней недели
@@ -371,6 +371,30 @@
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>timestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -646,7 +670,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ru/trunk/reference/datetime/functions/strtotime.xml
===================================================================
--- phpdoc/ru/trunk/reference/datetime/functions/strtotime.xml	2020-12-21 05:30:17 UTC (rev 352151)
+++ phpdoc/ru/trunk/reference/datetime/functions/strtotime.xml	2020-12-21 13:29:41 UTC (rev 352152)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351196 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 352143 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
 <!-- $Revision$ -->
 <!-- splitted from ./en/functions/datetime.xml, last change in rev 1.8 -->
@@ -11,16 +11,16 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>strtotime</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>strtotime</methodname>
    <methodparam><type>string</type><parameter>datetime</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>now</parameter><initializer>time()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>baseTimestamp</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <simpara>
    Первым параметром функции должна быть строка с датой на английском языке, которая
    будет преобразована в метку времени Unix (количество секунд, прошедших с 1 января 1970
    года 00:00:00 UTC) относительно метки времени, переданной в
-   <parameter>now</parameter>, или текущего времени, если аргумент
-   <parameter>now</parameter> опущен.
+   <parameter>baseTimestamp</parameter>, или текущего времени, если аргумент
+   <parameter>baseTimestamp</parameter> опущен.
   </simpara>
   <warning>
    <para>
@@ -49,7 +49,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>now</parameter></term>
+     <term><parameter>baseTimestamp</parameter></term>
      <listitem>
       <para>
        Временная метка, используемая в качестве базы для вычисления
@@ -75,6 +75,30 @@

  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <parameter>baseTimestamp</parameter> теперь допускает значение null.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -188,7 +212,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml