From 24c03662328c2dbd3cb934647590494df4eff2a8 Mon Sep 17 00:00:00 2001
From: Kristina Chodorow <kristina@php.net>
Date: Thu, 23 Sep 2010 15:12:19 +0000
Subject: [PATCH] clarified cursor count behavior

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@303733 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/mongo/construct.xml           | 14 +----------
 reference/mongo/mongocollection/count.xml     | 24 +++++++++++++++++++
 reference/mongo/mongocursor/count.xml         |  6 +++++
 .../mongocursor/{getquery.xml => info.xml}    |  3 ++-
 4 files changed, 33 insertions(+), 14 deletions(-)
 rename reference/mongo/mongocursor/{getquery.xml => info.xml} (92%)

diff --git a/reference/mongo/mongo/construct.xml b/reference/mongo/mongo/construct.xml
index 5d886eb5e4..9b1dc26057 100644
--- a/reference/mongo/mongo/construct.xml
+++ b/reference/mongo/mongo/construct.xml
@@ -21,7 +21,7 @@
    <link linkend="ini.mongo.default-port">mongo.default_port</link>).
   </para>
   <para>
-   As of version 1.0.2, <parameter>server</parameter> should have the form: 
+   <parameter>server</parameter> should have the form: 
    <programlisting>
 <![CDATA[
 mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
@@ -50,18 +50,6 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
    will be used.
   </para>
 
-  <warning>
-
-   <title><parameter>server</parameter> Format</title>
-
-   <para>
-    Before version 1.0.2, <parameter>server</parameter> could not be prefixed
-    with <literal>mongodb://</literal>, contain username and password, or 
-    contain more than two hostnames.  See the changelog below for more details.
-   </para>
-
-  </warning>
-
   <para>
    If you elect not to connect immediately (you pass the option 
    <literal>array("connect" => false)</literal>), you will need to call 
diff --git a/reference/mongo/mongocollection/count.xml b/reference/mongo/mongocollection/count.xml
index 65ade1f77c..5802b640a7 100644
--- a/reference/mongo/mongocollection/count.xml
+++ b/reference/mongo/mongocollection/count.xml
@@ -62,6 +62,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>1.0.7</entry>
+       <entry>
+        Added <literal>limit</literal> and <literal>skip</literal> parameters.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/mongo/mongocursor/count.xml b/reference/mongo/mongocursor/count.xml
index a2a61ea1b5..a7dce55fbc 100644
--- a/reference/mongo/mongocursor/count.xml
+++ b/reference/mongo/mongocursor/count.xml
@@ -13,6 +13,12 @@
    <modifier>public</modifier> <type>int</type><methodname>MongoCursor::count</methodname>
    <methodparam choice="opt"><type>boolean</type><parameter>foundOnly</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
+  <para>
+   This method does not affect the state of the cursor: if you haven't queried 
+   yet, you can still apply limits, skips, etc.  If you have started iterating
+   through results, it will not move the current position of the cursor.  If you
+   have exhasted the cursor, it will not reset it.
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mongo/mongocursor/getquery.xml b/reference/mongo/mongocursor/info.xml
similarity index 92%
rename from reference/mongo/mongocursor/getquery.xml
rename to reference/mongo/mongocursor/info.xml
index 2323d7a669..c6b6e51fa1 100644
--- a/reference/mongo/mongocursor/getquery.xml
+++ b/reference/mongo/mongocursor/info.xml
@@ -26,7 +26,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;  
   <para>
-   The query, fields, limit, and skip for this cursor as an associative array.
+   Returns the namespace, limit, skip, query, and fields for this cursor.  In 
+   version 1.0.10+, it also returns whether the cursor is pre- or post-query.
   </para>
  </refsect1>