mirror of
https://github.com/sigmasternchen/php-doc-en
synced 2025-03-16 00:48:54 +00:00
- Update docs for new constants and correct since when the first parameter can
be ommited. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@85235 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
e91f0dc882
commit
806e937f28
3 changed files with 75 additions and 8 deletions
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- $Revision: 1.1 $ -->
|
||||
<!-- $Revision: 1.2 $ -->
|
||||
<section id="calendar.constants">
|
||||
&reftitle.constants;
|
||||
&extension.constants;
|
||||
|
@ -155,6 +155,55 @@
|
|||
<listitem>
|
||||
<simpara>
|
||||
|
||||
</simpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
<para>
|
||||
The following constants are available since <literal>PHP</literal> 4.3.0 :
|
||||
</para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<constant>CAL_EASTER_DEFAULT</constant>
|
||||
(<link linkend="language.types.integer">integer</link>)
|
||||
</term>
|
||||
<listitem>
|
||||
<simpara>
|
||||
|
||||
</simpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<constant>CAL_EASTER_ROMAN</constant>
|
||||
(<link linkend="language.types.integer">integer</link>)
|
||||
</term>
|
||||
<listitem>
|
||||
<simpara>
|
||||
|
||||
</simpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<constant>CAL_EASTER_ALWAYS_GREGORIAN</constant>
|
||||
(<link linkend="language.types.integer">integer</link>)
|
||||
</term>
|
||||
<listitem>
|
||||
<simpara>
|
||||
|
||||
</simpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<constant>CAL_EASTER_ALWAYS_JULIAN</constant>
|
||||
(<link linkend="language.types.integer">integer</link>)
|
||||
</term>
|
||||
<listitem>
|
||||
<simpara>
|
||||
|
||||
</simpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- $Revision: 1.2 $ -->
|
||||
<!-- $Revision: 1.3 $ -->
|
||||
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
|
||||
<refentry id="function.easter-date">
|
||||
<refnamediv>
|
||||
|
@ -12,12 +12,16 @@
|
|||
<title>Description</title>
|
||||
<methodsynopsis>
|
||||
<type>int</type><methodname>easter_date</methodname>
|
||||
<methodparam><type>int</type><parameter>year</parameter></methodparam>
|
||||
<methodparam choice="opt"><type>int</type><parameter>year</parameter></methodparam>
|
||||
</methodsynopsis>
|
||||
<para>
|
||||
Returns the UNIX timestamp corresponding to midnight on Easter of
|
||||
the given year. If no year is specified, the current year is
|
||||
assumed.
|
||||
the given year.
|
||||
</para>
|
||||
<para>
|
||||
Since <literal>PHP</literal> 4.3.0, the <parameter>year</parameter>
|
||||
parameter is optional and defaults to the current year according to the
|
||||
localtime if ommited.
|
||||
</para>
|
||||
<para>
|
||||
<emphasis>Warning:</emphasis> This function will generate
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- $Revision: 1.2 $ -->
|
||||
<!-- $Revision: 1.3 $ -->
|
||||
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
|
||||
<refentry id="function.easter-days">
|
||||
<refnamediv>
|
||||
|
@ -13,13 +13,27 @@
|
|||
<title>Description</title>
|
||||
<methodsynopsis>
|
||||
<type>int</type><methodname>easter_days</methodname>
|
||||
<methodparam><type>int</type><parameter>year</parameter></methodparam>
|
||||
<methodparam choice="opt"><type>int</type><parameter>year</parameter></methodparam>
|
||||
<methodparam choice="opt"><type>int</type><parameter>method</parameter></methodparam>
|
||||
</methodsynopsis>
|
||||
<para>
|
||||
Returns the number of days after March 21 on which Easter falls
|
||||
for a given year. If no year is specified, the current year is
|
||||
for a given year. If no year is specified, the current year is
|
||||
assumed.
|
||||
</para>
|
||||
<para>
|
||||
Since <literal>PHP</literal> 4.3.0, the <parameter>year</parameter>
|
||||
parameter is optional and defaults to the current year according to the
|
||||
localtime if ommited.
|
||||
</para>
|
||||
<para>
|
||||
The <parameter>method</parameter> parameter was also introduced in
|
||||
<literal>PHP</literal> 4.3.0 and allows to calculate easter dates based
|
||||
on the Gregorian calendar during the years 1582 - 1752 when set to
|
||||
<constant>CAL_EASTER_ROMAN</constant>. See the <link
|
||||
linkend="calendar.constants">calendar constants</link> for more valid
|
||||
constants.
|
||||
</para>
|
||||
<para>
|
||||
This function can be used instead of
|
||||
<function>easter_date</function> to calculate Easter for years
|
||||
|
|
Loading…
Reference in a new issue