From 1585a91cf9065851e6e9561c67947fc3ba64b20b Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Thu, 29 Nov 2012 06:06:32 +0000
Subject: [PATCH] Fixed bug#63624 (documentation concerning settings for
 Mongo-Database)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328556 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/ini.list.xml |  3 ++-
 reference/mongo/ini.xml | 32 ++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/appendices/ini.list.xml b/appendices/ini.list.xml
index 8df3c6f08c..58f99943cf 100644
--- a/appendices/ini.list.xml
+++ b/appendices/ini.list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
- <section xml:id="ini.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <section xml:id="ini.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>List of &php.ini; directives</title>
   <para>
    This list includes the &php.ini; directives you can set to configure your
@@ -1825,6 +1825,7 @@
        <entry>PHP_INI_SYSTEM</entry>
        <entry>Available since PHP 4.3.0.</entry>
       </row>
+      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongo.configuration.list')/*)" />
       <row>
        <entry><link linkend="ini.msql.allow-persistent">msql.allow_persistent</link></entry>
        <entry>"1"</entry>
diff --git a/reference/mongo/ini.xml b/reference/mongo/ini.xml
index a65cb11bfd..fa0ccc17d3 100644
--- a/reference/mongo/ini.xml
+++ b/reference/mongo/ini.xml
@@ -12,63 +12,75 @@
       <entry>&Name;</entry>
       <entry>&Default;</entry>
       <entry>&Changeable;</entry>
+      <entry>&Changelog;;</entry>
      </row>
     </thead>
-    <tbody>
+    <tbody xml:id="mongo.configuration.list">
      <row>
       <entry><link linkend="ini.mongo.allow-empty-keys">mongo.allow_empty_keys</link></entry>
-      <entry>false</entry>
+      <entry>0</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.allow-persistent">mongo.allow_persistent</link></entry>
-      <entry>true</entry>
-      <entry>PHP_INI_SYSTEM</entry>
+      <entry>1</entry>
+      <entry>PHP_INI_ALL</entry>
+      <entry>Removed in 1.3.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.chunk-size">mongo.chunk_size</link></entry>
       <entry>262144</entry>
-      <entry>PHP_INI_SYSTEM</entry>
+      <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.cmd">mongo.cmd</link></entry>
       <entry>"$"</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.default-host">mongo.default_host</link></entry>
       <entry>"localhost"</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.default-port">mongo.default_port</link></entry>
       <entry>27017</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.is-master-interval">mongo.is_master_interval</link></entry>
       <entry>60</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry>Added in 1.3.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.long-as-object">mongo.long_as_object</link></entry>
-      <entry>false</entry>
+      <entry>0</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.native-long">mongo.native_long</link></entry>
-      <entry>false<link linkend="ini.mongo.native-long">*</link></entry>
+      <entry>0<link linkend="ini.mongo.native-long">*</link></entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.ping-interval">mongo.ping_interval</link></entry>
       <entry>5</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mongo.utf8">mongo.utf8</link></entry>
-      <entry>"1"</entry>
+      <entry>1</entry>
       <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
@@ -104,7 +116,7 @@
    <varlistentry xml:id="ini.mongo.allow-persistent">
     <term>
      <parameter>mongo.allow_persistent</parameter>
-     <type>bool</type>
+     <type>int</type>
     </term>
     <listitem>
      <para>
@@ -214,7 +226,7 @@ $query = array( "i" => array( ":gt" => 20, ":lte" => 30 ) );
    <varlistentry xml:id="ini.mongo.long-as-object">
     <term>
      <parameter>mongo.long_as_object</parameter>
-     <type>string</type>
+     <type>int</type>
     </term>
     <listitem>
      <para>