CVS update: phpdoc/functions

Date: Sunday June 20, 1999 @ 13:15 Author: jim Update of /repository/phpdoc/functions In directory php:/tmp/cvs-serv4181 Modified Files: calendar.sgml datetime.sgml Log Message: Move easter_* documentation to the calendar.sgml section. Index: phpdoc/functions/calendar.sgml diff -u phpdoc/functions/calendar.sgml:1.2 phpdoc/functions/calendar.sgml:1.3 --- phpdoc/functions/calendar.sgml:1.2 Sat Jun 19 23:04:55 1999 +++ phpdoc/functions/calendar.sgml Sun Jun 20 13:15:59 1999 @@ -320,6 +320,116 @@ </refsect1> </refentry> + <refentry id="function.easter-date"> + <refnamediv> + <refname>easter_date</refname> + <refpurpose>get UNIX timestamp for midnight on Easter of a given year</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <funcsynopsis> + <funcdef>int <function>easter_date</function></funcdef> + <paramdef>int <parameter>year</parameter></paramdef> + </funcsynopsis> + <para> + Returns the UNIX timestamp corresponding to midnight on + Easter of the given year. If no year is specified, the + current year is assumed. + </para> + <para> + <emphasis>Warning:</emphasis> This function will generate + a warning if the year is outside of the range for UNIX + timestamps (i.e. before 1970 or after 2037). + <example> + <title><function>easter_date</function> example</title> + <programlisting> +echo date( "M-d-Y", easter_date(1999) ); /* "Apr-04-1999" */ +echo date( "M-d-Y", easter_date(2000) ); /* "Apr-23-2000" */ +echo date( "M-d-Y", easter_date(2001) ); /* "Apr-15-2001" */ +</programlisting> + </example> + </para> + <para> + The date of Easter Day was defined by the Council of + Nicaea in AD325 as the Sunday after the first full moon + which falls on or after the Spring Equinox. The + Equinox is assumed to always fall on 21st March, so the + calculation reduces to determining the date of the full + moon and the date of the following Sunday. The algorithm + used here was introduced around the year 532 by Dionysius + Exiguus. Under the Julian Calendar (for years before 1753) + a simple 19-year cycle is used to track the phases of the Moon. + Under the Gregorian Calendar (for years after 1753 - devised + by Clavius and Lilius, and introduced by Pope Gregory XIII + in October 1582, and into Britain and its then colonies in + September 1752) two correction factors are added to make the + cycle more accurate. + </para> + <para> + (The code is based on a C program by Simon Kershaw, + &lt;webmaster@ely.anglican.org&gt;) + </para> + <para> + See <function>easter_days</function> for calculating Easter + before 1970 or after 2037. + </para> + </refsect1> + </refentry> + + <refentry id="function.easter-days"> + <refnamediv> + <refname>easter_days</refname> + <refpurpose>get number of days after March 21 on which Easter falls for a given year</refpurpose> + </refnamediv> + <refsect1> + <title>Description</title> + <funcsynopsis> + <funcdef>int <function>easter_days</function></funcdef> + <paramdef>int <parameter>year</parameter></paramdef> + </funcsynopsis> + <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 assumed. + </para> + <para> + This function can be used instead of <function>easter_date</function> + to calculate Easter for years which fall outside the range of UNIX + timestamps (i.e. before 1970 or after 2037). + <example> + <title><function>easter_date</function> example</title> + <programlisting> +echo easter_days(1999); /* 14, i.e. April 4 */ +echo easter_days(1492); /* 32, i.e. April 22 */ +echo easter_days(1913); /* 2, i.e. March 23 */ +</programlisting> + </example> + </para> + <para> + The date of Easter Day was defined by the Council of + Nicaea in AD325 as the Sunday after the first full moon + which falls on or after the Spring Equinox. The + Equinox is assumed to always fall on 21st March, so the + calculation reduces to determining the date of the full + moon and the date of the following Sunday. The algorithm + used here was introduced around the year 532 by Dionysius + Exiguus. Under the Julian Calendar (for years before 1753) + a simple 19-year cycle is used to track the phases of the Moon. + Under the Gregorian Calendar (for years after 1753 - devised + by Clavius and Lilius, and introduced by Pope Gregory XIII + in October 1582, and into Britain and its then colonies in + September 1752) two correction factors are added to make the + cycle more accurate. + </para> + <para> + (The code is based on a C program by Simon Kershaw, + &lt;webmaster@ely.anglican.org&gt;) + </para> + <para> + See also <function>easter_date</function>. + </para> + </refsect1> + </refentry> + </reference> <!-- Keep this comment at the end of the file Index: phpdoc/functions/datetime.sgml diff -u phpdoc/functions/datetime.sgml:1.4 phpdoc/functions/datetime.sgml:1.5 --- phpdoc/functions/datetime.sgml:1.4 Sat Jun 19 23:04:56 1999 +++ phpdoc/functions/datetime.sgml Sun Jun 20 13:15:59 1999 @@ -275,116 +275,6 @@ </refsect1> </refentry> - <refentry id="function.easter-date"> - <refnamediv> - <refname>easter_date</refname> - <refpurpose>get UNIX timestamp for midnight on Easter of a given year</refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <funcsynopsis> - <funcdef>int <function>easter_date</function></funcdef> - <paramdef>int <parameter>year</parameter></paramdef> - </funcsynopsis> - <para> - Returns the UNIX timestamp corresponding to midnight on - Easter of the given year. If no year is specified, the - current year is assumed. - </para> - <para> - <emphasis>Warning:</emphasis> This function will generate - a warning if the year is outside of the range for UNIX - timestamps (i.e. before 1970 or after 2037). - <example> - <title><function>easter_date</function> example</title> - <programlisting> -echo date( "M-d-Y", easter_date(1999) ); /* "Apr-04-1999" */ -echo date( "M-d-Y", easter_date(2000) ); /* "Apr-23-2000" */ -echo date( "M-d-Y", easter_date(2001) ); /* "Apr-15-2001" */ -</programlisting> - </example> - </para> - <para> - The date of Easter Day was defined by the Council of - Nicaea in AD325 as the Sunday after the first full moon - which falls on or after the Spring Equinox. The - Equinox is assumed to always fall on 21st March, so the - calculation reduces to determining the date of the full - moon and the date of the following Sunday. The algorithm - used here was introduced around the year 532 by Dionysius - Exiguus. Under the Julian Calendar (for years before 1753) - a simple 19-year cycle is used to track the phases of the Moon. - Under the Gregorian Calendar (for years after 1753 - devised - by Clavius and Lilius, and introduced by Pope Gregory XIII - in October 1582, and into Britain and its then colonies in - September 1752) two correction factors are added to make the - cycle more accurate. - </para> - <para> - (The code is based on a C program by Simon Kershaw, - &lt;webmaster@ely.anglican.org&gt;) - </para> - <para> - See <function>easter_days</function> for calculating Easter - before 1970 or after 2037. - </para> - </refsect1> - </refentry> - - <refentry id="function.easter-days"> - <refnamediv> - <refname>easter_days</refname> - <refpurpose>get number of days after March 21 on which Easter falls for a given year</refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <funcsynopsis> - <funcdef>int <function>easter_days</function></funcdef> - <paramdef>int <parameter>year</parameter></paramdef> - </funcsynopsis> - <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 assumed. - </para> - <para> - This function can be used instead of <function>easter_date</function> - to calculate Easter for years which fall outside the range of UNIX - timestamps (i.e. before 1970 or after 2037). - <example> - <title><function>easter_date</function> example</title> - <programlisting> -echo easter_days(1999); /* 14, i.e. April 4 */ -echo easter_days(1492); /* 32, i.e. April 22 */ -echo easter_days(1913); /* 2, i.e. March 23 */ -</programlisting> - </example> - </para> - <para> - The date of Easter Day was defined by the Council of - Nicaea in AD325 as the Sunday after the first full moon - which falls on or after the Spring Equinox. The - Equinox is assumed to always fall on 21st March, so the - calculation reduces to determining the date of the full - moon and the date of the following Sunday. The algorithm - used here was introduced around the year 532 by Dionysius - Exiguus. Under the Julian Calendar (for years before 1753) - a simple 19-year cycle is used to track the phases of the Moon. - Under the Gregorian Calendar (for years after 1753 - devised - by Clavius and Lilius, and introduced by Pope Gregory XIII - in October 1582, and into Britain and its then colonies in - September 1752) two correction factors are added to make the - cycle more accurate. - </para> - <para> - (The code is based on a C program by Simon Kershaw, - &lt;webmaster@ely.anglican.org&gt;) - </para> - <para> - See also <function>easter_date</function>. - </para> - </refsect1> - </refentry> - <refentry id="function.mktime"> <refnamediv>