mfischer Mon Jun 10 03:53:22 2002 EDT
Modified files:
/phpdoc/en/reference/calendar constants.xml
/phpdoc/en/reference/calendar/functions easter-date.xml
easter-days.xml
Log:
- Update docs for new constants and correct since when the first parameter can
be ommited.
Index: phpdoc/en/reference/calendar/constants.xml
diff -u phpdoc/en/reference/calendar/constants.xml:1.1
phpdoc/en/reference/calendar/constants.xml:1.2
--- phpdoc/en/reference/calendar/constants.xml:1.1 Fri Apr 19 09:49:59 2002
+++ phpdoc/en/reference/calendar/constants.xml Mon Jun 10 03:53:21 2002
@@ -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;
@@ -150,6 +150,55 @@
<varlistentry>
<term>
<constant>CAL_MONTH_FRENCH</constant>
+ (<link linkend="language.types.integer">integer</link>)
+ </term>
+ <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>
Index: phpdoc/en/reference/calendar/functions/easter-date.xml
diff -u phpdoc/en/reference/calendar/functions/easter-date.xml:1.2
phpdoc/en/reference/calendar/functions/easter-date.xml:1.3
--- phpdoc/en/reference/calendar/functions/easter-date.xml:1.2 Wed Apr 17 02:36:37
2002
+++ phpdoc/en/reference/calendar/functions/easter-date.xml Mon Jun 10 03:53:22
+2002
@@ -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
Index: phpdoc/en/reference/calendar/functions/easter-days.xml
diff -u phpdoc/en/reference/calendar/functions/easter-days.xml:1.2
phpdoc/en/reference/calendar/functions/easter-days.xml:1.3
--- phpdoc/en/reference/calendar/functions/easter-days.xml:1.2 Wed Apr 17 02:36:37
2002
+++ phpdoc/en/reference/calendar/functions/easter-days.xml Mon Jun 10 03:53:22
+2002
@@ -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,12 +13,26 @@
<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
