diff --git a/reference/mongo/mongobindata/construct.xml b/reference/mongo/mongobindata/construct.xml
index 79b93ec681..0c394780fc 100644
--- a/reference/mongo/mongobindata/construct.xml
+++ b/reference/mongo/mongobindata/construct.xml
@@ -83,8 +83,6 @@
0 (MongoBinData::GENERIC).
-
-
1.2.11
diff --git a/reference/mongo/mongocollection/batchinsert.xml b/reference/mongo/mongocollection/batchinsert.xml
index 8e4277d435..16e2b0101d 100644
--- a/reference/mongo/mongocollection/batchinsert.xml
+++ b/reference/mongo/mongocollection/batchinsert.xml
@@ -74,11 +74,10 @@
&mongo.writes.parameters.fsync;
&mongo.writes.parameters.journal;
-
&mongo.writes.parameters.writeconcern;
&mongo.writes.parameters.writeconcerntimeout;
+ &mongo.writes.parameters.writeconcerntimeoutms;
&mongo.writes.parameters.safe;
&mongo.writes.parameters.timeout;
@@ -121,13 +120,16 @@
-
1.2.7
Added "continueOnError" option.
diff --git a/reference/mongo/mongocollection/insert.xml b/reference/mongo/mongocollection/insert.xml
index 618efbf11d..b2ebe4566a 100644
--- a/reference/mongo/mongocollection/insert.xml
+++ b/reference/mongo/mongocollection/insert.xml
@@ -54,11 +54,10 @@
&mongo.writes.parameters.fsync;
&mongo.writes.parameters.journal;
-
&mongo.writes.parameters.writeconcern;
&mongo.writes.parameters.writeconcerntimeout;
+ &mongo.writes.parameters.writeconcerntimeoutms;
&mongo.writes.parameters.safe;
&mongo.writes.parameters.timeout;
@@ -221,13 +220,16 @@
-
1.3.0
diff --git a/reference/mongo/mongocollection/remove.xml b/reference/mongo/mongocollection/remove.xml
index 2008af13a7..6552693f64 100644
--- a/reference/mongo/mongocollection/remove.xml
+++ b/reference/mongo/mongocollection/remove.xml
@@ -49,11 +49,10 @@
&mongo.writes.parameters.fsync;
&mongo.writes.parameters.journal;
-
&mongo.writes.parameters.writeconcern;
&mongo.writes.parameters.writeconcerntimeout;
+ &mongo.writes.parameters.writeconcerntimeoutms;
&mongo.writes.parameters.safe;
&mongo.writes.parameters.timeout;
@@ -93,13 +92,16 @@
-
1.3.0
diff --git a/reference/mongo/mongocollection/save.xml b/reference/mongo/mongocollection/save.xml
index 1d1e5a6909..53962bcf3c 100644
--- a/reference/mongo/mongocollection/save.xml
+++ b/reference/mongo/mongocollection/save.xml
@@ -53,11 +53,10 @@
&mongo.writes.parameters.fsync;
&mongo.writes.parameters.journal;
-
&mongo.writes.parameters.writeconcern;
&mongo.writes.parameters.writeconcerntimeout;
+ &mongo.writes.parameters.writeconcerntimeoutms;
&mongo.writes.parameters.safe;
&mongo.writes.parameters.timeout;
@@ -99,13 +98,16 @@
-
1.2.0
Added "timeout" option.
diff --git a/reference/mongo/mongocollection/toindexstring.xml b/reference/mongo/mongocollection/toindexstring.xml
index c1c81fb9a6..f52d00009e 100644
--- a/reference/mongo/mongocollection/toindexstring.xml
+++ b/reference/mongo/mongocollection/toindexstring.xml
@@ -13,6 +13,11 @@
static protected stringMongoCollection::toIndexString
mixedkeys
+
+
+ This method is deprecated since version 1.5.0.
+
+
@@ -77,6 +82,30 @@ echo MyCollection::toIndexString(array('name' => 1, 'age' => -1)), "\n";
+
+ &reftitle.changelog;
+
+
+
+
+
+ &Version;
+ &Description;
+
+
+
+
+ 1.5.0
+
+ This method has been deprecated.
+
+
+
+
+
+
+
+
&mongo.writes.parameters.writeconcern;
&mongo.writes.parameters.writeconcerntimeout;
+ &mongo.writes.parameters.writeconcerntimeoutms;
&mongo.writes.parameters.safe;
&mongo.writes.parameters.timeout;
@@ -129,13 +128,16 @@
-
1.3.0
diff --git a/reference/mongo/mongocursor/setreadpreference.xml b/reference/mongo/mongocursor/setreadpreference.xml
index f4b2a15527..74bdc19892 100644
--- a/reference/mongo/mongocursor/setreadpreference.xml
+++ b/reference/mongo/mongocursor/setreadpreference.xml
@@ -36,7 +36,7 @@
&reftitle.examples;
- <methodname>MongoCursor::setReadPreference</methodname> tag set array syntaxexample
+ <title><methodname>MongoCursor::setReadPreference</methodname> tag set array syntax example
MongoCursor::slaveOkay
- Sets whether this query can be done on a secondary
+ Sets whether this query can be done on a secondary [deprecated]
@@ -13,18 +13,25 @@
public MongoCursorMongoCursor::slaveOkay
boolokaytrue
+
+
+ This method is deprecated since version 1.5.0. Instead, please use
+ MongoCursor::setReadPreference and .
+
+
Calling this will make the driver route reads to secondaries if:
- You are using a replica set and
+ You are using a replica set, and
You created a MongoClient instance using the option
- "replicaSet" => "setName" and
+ "replicaSet" => "setName", and
@@ -125,6 +132,31 @@ $cursor = $collection->find()->slaveOkay(false);
+
+ &reftitle.changelog;
+
+
+
+
+
+ &Version;
+ &Description;
+
+
+
+
+ 1.5.0
+
+ This method has been deprecated in favour of
+ MongoCursor::setReadPreference and .
+
+
+
+
+
+
+
-
- &reftitle.changelog;
-
-
-
-
-
- &Version;
- &Description;
-
-
-
-
- 1.3.0
-
- This functionality has been removed and no longer does anything other
- than emit deprecation warnings. This class is only kept around for
- backwards compatability and will be removed in the near future.
-
-
-
- 1.2.11
-
- Emits E_DEPRECATED when used.
-
-
-
-
-
-
-
+
+ &reftitle.changelog;
+
+
+
+
+
+ &Version;
+ &Description;
+
+
+
+
+ 1.3.0
+
+ This functionality has been removed and no longer does anything other
+ than emit deprecation warnings. This class is only kept around for
+ backwards compatability and will be removed in the near future.
+
+
+
+ 1.2.11
+
+ Emits E_DEPRECATED when used.
+
+
+
+
+
+
+