DOCS-533 minor cleanup & verification of correct locks

Ed Costello · Ed Costello · commit 668327afedc2 · 2012-10-02T16:53:18.000-04:00
diff --git a/source/reference/command/applyOps.txt b/source/reference/command/applyOps.txt
@@ -37,6 +37,8 @@ applyOps (internal)
    corresponding expected result in the ``res`` field that must match
    in order to apply the oplog entry.
 
+   .. include:: /includes/warning-blocking-global.rst
+
    .. write-lock
 
    .. see: DOCS-133; SERVER-4259
diff --git a/source/reference/command/collStats.txt b/source/reference/command/collStats.txt
@@ -48,3 +48,5 @@ collStats
       produce unpredictable and unexpected results in some situations.
 
    .. seealso:: ":doc:`/reference/collection-statistics`."
+   
+   .. READ lock
diff --git a/source/reference/command/convertToCapped.txt b/source/reference/command/convertToCapped.txt
@@ -26,4 +26,4 @@ convertToCapped
       indexes on this collection you will need to create these indexes
       after the conversion is complete.
 
-   .. include:: /includes/warning-blocking-database.rst
+   .. include:: /includes/warning-blocking-global.rst
diff --git a/source/reference/command/dataSize.txt b/source/reference/command/dataSize.txt
@@ -22,3 +22,5 @@ dataSize
 
    The amount of time required to return :dbcommand:`dataSize` depends on the
    amount of data in the collection.
+
+   .. read-lock
diff --git a/source/reference/command/dbStats.txt b/source/reference/command/dbStats.txt
@@ -27,3 +27,5 @@ dbStats
    a wrapper around this functionality. See the
    ":doc:`/reference/database-statistics`" document for an overview of
    this output.
+ 
+   .. read-lock
diff --git a/source/reference/command/emptyCapped.txt b/source/reference/command/emptyCapped.txt
@@ -15,3 +15,5 @@ emptycapped
 
    This command removes all records from the capped collection named
    ``events``.
+
+   .. include:: /includes/warning-blocking-database.rst
diff --git a/source/reference/command/filemd5.txt b/source/reference/command/filemd5.txt
@@ -16,3 +16,4 @@ filemd5
 
       { filemd5: ObjectId("4f1f10e37671b50e4ecd2776"), root: "fs" }
 
+   .. read-lock
diff --git a/source/reference/command/findAndModify.txt b/source/reference/command/findAndModify.txt
@@ -87,3 +87,5 @@ findAndModify
       cluster. :dbcommand:`findAndModify` operations issued against
       :program:`mongos` instances for non-sharded collections function
       normally.
+
+   .. include:: /includes/warning-blocking-database.rst
diff --git a/source/reference/command/reIndex.txt b/source/reference/command/reIndex.txt
@@ -26,3 +26,5 @@ reIndex
    .. code-block:: javascript
 
       db.collection.reIndex();
+
+   .. include:: /includes/warning-blocking-database.rst
diff --git a/source/reference/command/renameCollection.txt b/source/reference/command/renameCollection.txt
@@ -42,3 +42,5 @@ renameCollection
 
    .. warning:: You cannot use :dbcommand:`renameCollection` with
       sharded collections.
+
+   .. include:: /includes/warning-blocking-global.rst
diff --git a/source/reference/command/replSetReconfig.txt b/source/reference/command/replSetReconfig.txt
@@ -49,4 +49,11 @@ replSetReconfig
      the members of the replica set. When this happens, the set will
      drop all current connections.
 
+
+   .. note::
+
+         The :dbcommand:`replSetReconfig` command will obtain a mutually
+         exclusive lock to prevent multiple replSetReconfig operations
+         from occurring at the same time.
+
    .. slave-ok, admin-only
diff --git a/source/reference/command/resync.txt b/source/reference/command/resync.txt
@@ -11,6 +11,6 @@ resync
    that this command is relevant to master-slave replication only. It does
    no apply to replica sets.
    
-   .. include:: /includes/warning-blocking-database.rst
+   .. include:: /includes/warning-blocking-global.rst
 
    .. write-lock, slave-ok, admin-only.
diff --git a/source/reference/command/shardingState.txt b/source/reference/command/shardingState.txt
@@ -14,4 +14,6 @@ shardingState
 
       { shardingState: 1 }
 
+   .. include:: /includes/warning-blocking-database.rst
+
    .. admin-only
diff --git a/source/reference/command/sleep.txt b/source/reference/command/sleep.txt
@@ -22,5 +22,11 @@ sleep (internal)
    seconds. Without arguments, :dbcommand:`sleep`, causes a "read
    lock" for 100 seconds.
 
-   .. include:: /includes/warning-blocking-global.rst
+   .. warning::
 
+      This command obtains a global read or write lock depending on
+      the options specified  and will block other operations until
+      it has completed.
+
+
+   .. read-lock, write-lock, global-lock
diff --git a/source/reference/command/top.txt b/source/reference/command/top.txt
@@ -48,3 +48,5 @@ top
 
    You must issue the :dbcommand:`buildInfo` command against the
    ``admin`` database.
+
+.. read-lock
diff --git a/source/reference/command/validate.txt b/source/reference/command/validate.txt
@@ -41,3 +41,5 @@ validate
       impact on the performance of your MongoDB instance.
 
    .. TODO link to the document with these statistics
+   
+   .. read-lock

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,4 @@ filemd5`
`16`	`16`
`17`	`17`	`{ filemd5: ObjectId("4f1f10e37671b50e4ecd2776"), root: "fs" }`
`18`	`18`
	`19`	`+ .. read-lock`