From 75f56b6827550c5a85466584c6df158722665c8a Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 9 Apr 2014 22:17:55 +0000
Subject: [PATCH] Update for the last releases

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333298 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/changelog.xml | 62 +++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/reference/mongo/changelog.xml b/reference/mongo/changelog.xml
index 5e4259b8f5..ddec2ff087 100644
--- a/reference/mongo/changelog.xml
+++ b/reference/mongo/changelog.xml
@@ -5,8 +5,66 @@
  <title>&ChangelogListingTitle;</title>
  <para>&ChangelogListingDescription;</para>
 
- <!-- This should probably be changed to <section> once we start covering 1.4,
-      1.5, 1.6, etc etc etc -->
+ <simplesect xml:id="changelog.mongo.1.5">
+  <title>MongoDB PHP Driver 1.5.0</title>
+  <para>
+   It supports all new features for MongoDB 2.6, including: 
+  
+   <simplelist>
+    <member>Aggregate can now return a cursor</member>
+    <member>Aggregation pipelines can now be explained</member>
+    <member>Possible to set maxTimeMS for commands and queries</member>
+    <member>Transparent support for the new command-based MongoDB write API</member>
+    <member>New MongoWriteBatch classes (using the new MongoDB write API)</member>
+    <member>Support for MongoDB Enterprise features (e.g. Kerberos, LDAP, X509)</member>
+    <member>Option to tune acceptable server latency for secondary reads (secondaryAcceptableLatencyMS)</member>
+   </simplelist>
+  </para> 
+  <para>
+   With this release, some driver functionality which was previously 
+   documented as deprecated will now formally raise deprecation notices. This 
+   includes: 
+   <simplelist>
+    <member>Instantiating the Mongo class</member>
+    <member>Calling MongoCursor::slaveOkay()</member>
+    <member>"wtimeout" and "safe" options for MongoCollection write operations</member>
+    <member>Manipulating public properties on core classes (such as $collection->w)</member>
+   </simplelist>
+  </para>
+  <note>
+   <para>
+    No previously deprecated features have been removed. 
+   </para>
+  </note>
+  <para>
+   Changes in behaviour: 
+   <simplelist>
+    <member>Setting the mongo.native_long INI setting now raises an error on 32-bit 
+     platforms, and now defaults to true for 64-bit platforms.</member>
+   </simplelist>
+  </para>
+ </simplesect>
+
+ <simplesect xml:id="changelog.mongo.1.4">
+  <title>MongoDB PHP Driver 1.4.0</title>
+  <para>
+   The 1.4 series introduced fundemental changes in how connections are created to the MongoDB servers.
+   The driver now utilizes PHP native streams, so all normal PHP stream options apply.
+   Furthermore, an experimental Stream Context Support was added.
+  </para>
+  <para>
+   The 1.4.x series also added support for MongoDB 2.4.x.
+  </para>
+  <para>
+   The most important improvements however deal with the handling of replica sets, 
+   especially nodes that timeout and nodes that are unreachable for various 
+   reasons. Besides the improvements to replica set handling, this release 
+   addresses issues with read preferences through mongos nodes. It also 
+   adds support for SSL enabled connections as well as journal and fsync 
+   connection string options. 
+  </para>
+ </simplesect>
+
  <simplesect xml:id="changelog.mongo.1.3">
   <title>MongoDB PHP Driver 1.3.0</title>
   <para>