Modified: phpdoc/en/trunk/language-snippets.ent
===================================================================
--- phpdoc/en/trunk/language-snippets.ent	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/language-snippets.ent	2013-01-28 23:36:42 UTC (rev 329318)
@@ -1709,8 +1709,9 @@

 <!-- Mongo -->
 <!ENTITY mongo.setreadpreference.parameters '<variablelist xmlns="http://docbook.org/ns/docbook"><varlistentry><term><parameter>read_preference</parameter></term><listitem><para>The read preference mode: <constant>MongoClient::RP_PRIMARY</constant>, <constant>MongoClient::RP_PRIMARY_PREFERRED</constant>, <constant>MongoClient::RP_SECONDARY</constant>, <constant>MongoClient::RP_SECONDARY_PREFERRED</constant>, or <constant>MongoClient::RP_NEAREST</constant>.</para></listitem></varlistentry><varlistentry><term><parameter>tags</parameter></term><listitem><para>An array of zero or more tag sets, where each tag set is itself an array of criteria used to match tags on replica set members.</para></listitem></varlistentry></variablelist>'>
-<!ENTITY mongo.setreadpreference.return '<para xmlns="http://docbook.org/ns/docbook">Returns &true; on success, or &false; otherwise.</para>'>
-<!ENTITY mongo.getreadpreference.return '<para xmlns="http://docbook.org/ns/docbook">This function returns an array describing the read preference. The array contains the values <literal>type</literal> for the string read preference mode (corresponding to the <classname>MongoClient</classname> constants), and <literal>tagsets</literal> containing a list of all tag set criteria. If no tag sets were specified, <literal>tagsets</literal> will not be present in the array.</para>'>
+<!ENTITY mongo.setreadpreference.returnvalues '<para xmlns="http://docbook.org/ns/docbook">Returns &true; on success, or &false; otherwise.</para>'>
+<!ENTITY mongo.setreadpreference.errors '<para xmlns="http://docbook.org/ns/docbook">Emits <constant>E_WARNING</constant> if either parameter is invalid, or if one or more tag sets are provided with the <constant>MongoClient::RP_PRIMARY</constant> read preference mode.</para>'>
+<!ENTITY mongo.getreadpreference.returnvalues '<para xmlns="http://docbook.org/ns/docbook">This function returns an array describing the read preference. The array contains the values <literal>type</literal> for the string read preference mode (corresponding to the <classname>MongoClient</classname> constants), and <literal>tagsets</literal> containing a list of all tag set criteria. If no tag sets were specified, <literal>tagsets</literal> will not be present in the array.</para>'>
 <!ENTITY mongo.writes.parameters.writeconcern '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"w"</literal></para><para>See <link linkend="mongo.writeconcerns">WriteConcerns</link>. The default value for <classname>MongoClient</classname> is <literal>1</literal>.</para></listitem>'>
 <!ENTITY mongo.writes.parameters.fsync '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"fsync"</literal></para><para>Boolean, defaults to &false;. Forces the insert to be synced to disk before returning success. If &true;, an acknowledged insert is implied and will override setting <literal>w</literal> to <literal>0</literal>.</para></listitem>'>
 <!ENTITY mongo.writes.parameters.timeout '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"timeout"</literal></para><para>Integer, defaults to <literal>MongoCursor::$timeout</literal>.  If "safe" is set, this sets how long (in milliseconds) for the client to wait for a database response.  If the database does not respond within the timeout period, a <classname>MongoCursorTimeoutException</classname> will be thrown.</para></listitem>'>

Modified: phpdoc/en/trunk/reference/mongo/mongoclient/getreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongoclient/getreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongoclient/getreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -22,7 +22,7 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.getreadpreference.return;
+  &mongo.getreadpreference.returnvalues;
  </refsect1>

  <refsect1 role="changelog">

Modified: phpdoc/en/trunk/reference/mongo/mongoclient/setreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongoclient/setreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongoclient/setreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -23,9 +23,14 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.setreadpreference.return;
+  &mongo.setreadpreference.returnvalues;
  </refsect1>

+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mongo.setreadpreference.errors;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>

Modified: phpdoc/en/trunk/reference/mongo/mongocollection/getreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongocollection/getreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongocollection/getreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -22,14 +22,7 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   This function returns an array describing the read preference. The array
-   contains the values <literal>type</literal> for the numeric read preference
-   mode, <literal>type_string</literal> for the name of the read preference
-   mode, and <literal>tagsets</literal> containing a list of all tag set
-   criteria. If no tag sets were specified, <literal>tagsets</literal> will not
-   be present in the array.
-  </para>
+  &mongo.getreadpreference.returnvalues;
  </refsect1>

  <refsect1 role="changelog">

Modified: phpdoc/en/trunk/reference/mongo/mongocollection/setreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongocollection/setreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongocollection/setreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -23,9 +23,14 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.setreadpreference.return;
+  &mongo.setreadpreference.returnvalues;
  </refsect1>

+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mongo.setreadpreference.errors;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>

Modified: phpdoc/en/trunk/reference/mongo/mongocursor/getreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongocursor/getreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongocursor/getreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -22,14 +22,7 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   This function returns an array describing the read preference. The array
-   contains the values <literal>type</literal> for the numeric read preference
-   mode, <literal>type_string</literal> for the name of the read preference
-   mode, and <literal>tagsets</literal> containing a list of all tag set
-   criteria. If no tag sets were specified, <literal>tagsets</literal> will not
-   be present in the array.
-  </para>
+  &mongo.getreadpreference.returnvalues;
  </refsect1>

  <refsect1 role="examples">

Modified: phpdoc/en/trunk/reference/mongo/mongocursor/setreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongocursor/setreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongocursor/setreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -23,9 +23,14 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.setreadpreference.return;
+  &mongo.setreadpreference.returnvalues;
  </refsect1>

+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mongo.setreadpreference.errors;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>

Modified: phpdoc/en/trunk/reference/mongo/mongodb/getreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongodb/getreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongodb/getreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -22,14 +22,7 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   This function returns an array describing the read preference. The array
-   contains the values <literal>type</literal> for the numeric read preference
-   mode, <literal>type_string</literal> for the name of the read preference
-   mode, and <literal>tagsets</literal> containing a list of all tag set
-   criteria. If no tag sets were specified, <literal>tagsets</literal> will not
-   be present in the array.
-  </para>
+  &mongo.getreadpreference.returnvalues;
  </refsect1>

  <refsect1 role="changelog">

Modified: phpdoc/en/trunk/reference/mongo/mongodb/setreadpreference.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongodb/setreadpreference.xml	2013-01-28 21:54:52 UTC (rev 329317)
+++ phpdoc/en/trunk/reference/mongo/mongodb/setreadpreference.xml	2013-01-28 23:36:42 UTC (rev 329318)
@@ -23,9 +23,14 @@

  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.setreadpreference.return;
+  &mongo.setreadpreference.returnvalues;
  </refsect1>

+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mongo.setreadpreference.errors;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>