SERVER-2113

source/includes/example-filter-current-op.rst

@@ -1,29 +1,28 @@
-- Return all pending write operations:
+- Return all write operations waiting for lock:
 
   .. code-block:: javascript
 
-     db.currentOp().inprog.forEach(
-        function(d){
-          if(d.waitingForLock && d.lockType != "read")
-             printjson(d)
+     db.currentOp({
+             "waitingForLock" : true, 
+             "op" : { "$in" : [ "insert", "update", "remove" ] }
           })
 
-- Return the active write operation:
+- Return all active running operation that have never yielded:
 
   .. code-block:: javascript
 
-     db.currentOp().inprog.forEach(
-        function(d){
-          if(d.active && d.lockType == "write")
-             printjson(d)
+     db.currentOp({
+             "active" : true, 
+             "numYields" : 0, 
+             "waitingForLock" : false
           })
 
-- Return all active read operations:
+- Return all active queries for database "db1" that have been running longer than 3 seconds:
 
   .. code-block:: javascript
 
-     db.currentOp().inprog.forEach(
-        function(d){
-          if(d.active && d.lockType == "read")
-             printjson(d)
+     db.currentOp({
+             "active" : true, 
+             "secs_running" : { "$gt" : 3 }, 
+             "ns" : /^db1./     
           })

source/tutorial/configure-sharded-cluster-balancer.txt

@@ -30,7 +30,7 @@ migrate chunks, as described in the following procedures:
 
 - :ref:`sharding-balancing-remove-window`.
 
-The :program:`mongos` instances user their own local timezones to when
+The :program:`mongos` instances use their own local timezones when
 respecting balancer window.
 
 .. _sharded-cluster-config-default-chunk-size:
@@ -117,7 +117,7 @@ Require Replication before Chunk Migration (Secondary Throttle)
    ``_secondaryThrottle`` became an option to the balancer and to
    :dbcommand:`moveChunk` in 2.2.1. ``_secondaryThrottle`` makes it
    possible to require the balancer wait for replication to
-   secondaries during migrations.
+   secondaries for all documents during migrations.
 
 .. versionchanged:: 2.4
    ``_secondaryThrottle`` became the default mode for all balancer and