From 361be308200b022ac4e3f34094aebc140b6380f3 Mon Sep 17 00:00:00 2001
From: Maciej Sobaczewski <sobak@php.net>
Date: Mon, 18 Aug 2014 10:10:20 +0000
Subject: [PATCH] Mention these not only in changelogs

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@334560 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/calendar/functions/easter-date.xml    |  5 +++--
 reference/calendar/functions/easter-days.xml    |  5 +++--
 reference/uodbc/functions/odbc-fetch-array.xml  |  9 +++++++++
 reference/uodbc/functions/odbc-fetch-object.xml | 13 +++++++++++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/reference/calendar/functions/easter-date.xml b/reference/calendar/functions/easter-date.xml
index e4ab52eff5..effe00b1ba 100644
--- a/reference/calendar/functions/easter-date.xml
+++ b/reference/calendar/functions/easter-date.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>easter_date</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>year</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>year</parameter><initializer>date("Y")</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the Unix timestamp corresponding to midnight on Easter of
@@ -47,7 +47,8 @@
      <term><parameter>year</parameter></term>
      <listitem>
       <para>
-       The year as a number between 1970 an 2037
+       The year as a number between 1970 an 2037. If omitted, defaults to the
+       current year according to the local time.
       </para>
      </listitem>
     </varlistentry>  
diff --git a/reference/calendar/functions/easter-days.xml b/reference/calendar/functions/easter-days.xml
index 16b85ab838..b106b6bddf 100644
--- a/reference/calendar/functions/easter-days.xml
+++ b/reference/calendar/functions/easter-days.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>easter_days</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>year</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>year</parameter><initializer>date("Y")</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>method</parameter><initializer>CAL_EASTER_DEFAULT</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -49,7 +49,8 @@
      <term><parameter>year</parameter></term>
      <listitem>
       <para>
-       The year as a positive number
+       The year as a positive number. If omitted, defaults to the
+       current year according to the local time.
       </para>
      </listitem>
     </varlistentry>  
diff --git a/reference/uodbc/functions/odbc-fetch-array.xml b/reference/uodbc/functions/odbc-fetch-array.xml
index 419b7544db..8748f406a6 100644
--- a/reference/uodbc/functions/odbc-fetch-array.xml
+++ b/reference/uodbc/functions/odbc-fetch-array.xml
@@ -87,6 +87,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <simpara>
+    This function exists when compiled with DBMaker, IBM DB2 or UnixODBC support.
+   </simpara>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/uodbc/functions/odbc-fetch-object.xml b/reference/uodbc/functions/odbc-fetch-object.xml
index 20e9fa75ec..56aa3a1ccb 100644
--- a/reference/uodbc/functions/odbc-fetch-object.xml
+++ b/reference/uodbc/functions/odbc-fetch-object.xml
@@ -14,8 +14,8 @@
    <methodparam choice="opt"><type>int</type><parameter>rownumber</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Fetch an <type>object</type> from an ODBC query. See the changelog below
-   for when this function is available.
+   Fetch an <type>object</type> from an ODBC query. See the 
+   changelog below for when this function is available.
   </para>
  </refsect1>
 
@@ -87,6 +87,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <simpara>
+    This function exists when compiled with DBMaker, IBM DB2 or UnixODBC support.
+   </simpara>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>