From 4b378cfca2b1213c88c4450c234af339b5645403 Mon Sep 17 00:00:00 2001
From: jim winstead <jimw@php.net>
Date: Tue, 18 Dec 2001 20:33:59 +0000
Subject: [PATCH] various: misc. cleanups; jdmonthname: list possible return
 values

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@65621 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/calendar.xml | 45 ++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/functions/calendar.xml b/functions/calendar.xml
index bc9d7bebed..ff9045e06a 100644
--- a/functions/calendar.xml
+++ b/functions/calendar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
  <reference id="ref.calendar">
   <title>Calendar functions</title>
   <titleabbrev>Calendar</titleabbrev>
@@ -66,7 +66,7 @@
     <para>
      Valid Range for Gregorian Calendar 4714 B.C. to 9999 A.D.</para>
     <para>
-     Although this software can handle dates all the way back to 4714
+     Although this function can handle dates all the way back to 4714
      B.C., such use may not be meaningful. The Gregorian calendar was
      not instituted until October 15, 1582 (or October 5, 1582 in the
      Julian calendar). Some countries did not accept it until much
@@ -133,7 +133,7 @@ echo "$gregorian\n";
      Valid Range for Julian Calendar 4713 B.C. to 9999 A.D.
     </para>
     <para>
-     Although this software can handle dates all the way back to 4713
+     Although this function can handle dates all the way back to 4713
      B.C., such use may not be meaningful. The calendar was created in
      46 B.C., but the details did not stabilize until at least 8 A.D.,
      and perhaps as late at the 4th century. Also, the beginning of a
@@ -182,14 +182,11 @@ echo "$gregorian\n";
      </funcprototype>
     </funcsynopsis>
     <para>
-     Valid Range Although this software can handle dates all the way
-     back to the year 1 (3761 B.C.), such use may not be meaningful.
-    </para>
-    <para>
-     The Jewish calendar has been in use for several thousand years,
-     but in the early days there was no formula to determine the start
-     of a month. A new month was started when the new moon was first
-     observed.
+     Although this function can handle dates all the way back to the year 1
+     (3761 B.C.), such use may not be meaningful.  The Jewish calendar has
+     been in use for several thousand years, but in the early days there was
+     no formula to determine the start of a month. A new month was started
+     when the new moon was first observed.
     </para>
    </refsect1>
   </refentry>
@@ -267,37 +264,44 @@ echo "$gregorian\n";
      to be returned.
      <table>
       <title>Calendar modes</title>
-      <tgroup cols="2">
+      <tgroup cols="3">
        <thead>
         <row>
          <entry>Mode</entry>
          <entry>Meaning</entry>
+         <entry>Values</entry>
         </row>
        </thead>
        <tbody>
         <row>
          <entry>0</entry>
          <entry>Gregorian - abbreviated</entry>
+         <entry>Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec</entry>
         </row>
         <row>
          <entry>1</entry>
          <entry>Gregorian</entry>
+         <entry>January, February, March, April, May, June, July, August, September, October, November, December</entry>
         </row>
         <row>
          <entry>2</entry>
          <entry>Julian - abbreviated</entry>
+         <entry>Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec</entry>
         </row>
         <row>
          <entry>3</entry>
          <entry>Julian</entry>
+         <entry>January, February, March, April, May, June, July, August, September, October, November, December</entry>
         </row>
         <row>
          <entry>4</entry>
          <entry>Jewish</entry>
+         <entry>Tishri, Heshvan, Kislev, Tevet, Shevat, AdarI, AdarII, Nisan, Iyyar, Sivan, Tammuz, Av, Elul</entry>
         </row>
         <row>
          <entry>5</entry>
          <entry>French Republican</entry>
+         <entry>Vendemiaire, Brumaire, Frimaire, Nivose, Pluviose, Ventose, Germinal, Floreal, Prairial, Messidor, Thermidor, Fructidor, Extra</entry>
         </row>
        </tbody>
       </tgroup>
@@ -321,7 +325,7 @@ echo "$gregorian\n";
      </funcprototype>
     </funcsynopsis>
     <para>
-     Returns the day of the week.  Can return a string or an int
+     Returns the day of the week.  Can return a string or an integer
      depending on the mode.
      <table>
       <title>Calendar week modes</title>
@@ -506,11 +510,6 @@ echo easter_days (1913);        /*  2, i.e. March 23  */
     <para>
      See also <function>jdtounix</function>.
     </para>
-    <note>
-     <para>
-      This function is only available in PHP versions after PHP 4RC1.
-     </para>
-    </note>
    </refsect1>
   </refentry>
   
@@ -537,11 +536,6 @@ echo easter_days (1913);        /*  2, i.e. March 23  */
     <para>
      See also <function>jdtounix</function>.
     </para>
-    <note>
-     <para>
-      This function is only available in PHP versions after PHP 4RC1.
-     </para>
-    </note>
    </refsect1>
   </refentry>
   
@@ -568,11 +562,6 @@ echo easter_days (1913);        /*  2, i.e. March 23  */
     <para>
      See also <function>jdtounix</function>.
     </para>
-    <note>
-     <para>
-      This function is only available in PHP versions after PHP 4RC1.
-     </para>
-    </note>
    </refsect1>
   </refentry>