DOCSP-13083 Remove unused sharding commands

jason-price-mongodb · andf-mongodb · commit 4ac3f9e6cbde · 2021-02-24T17:23:56.000-05:00
diff --git a/draft/commands-locks.txt b/draft/commands-locks.txt
@@ -325,7 +325,7 @@ command>` in MongoDB.
      - 
      - 
      - 
-   * - :dbcommand:`resetError`
+   * - :dbcommand:`resetError` (*Removed in MongoDB 5.0*)
      - 
      - 
      - 
@@ -369,7 +369,7 @@ command>` in MongoDB.
      - 
      - 
      - 
-   * - :dbcommand:`unsetSharding`
+   * - :dbcommand:`unsetSharding` (*Removed in MongoDB 5.0*)
      - 
      - 
      - 
diff --git a/source/reference/command.txt b/source/reference/command.txt
@@ -135,7 +135,7 @@ Query and Write Operation Commands
 
    * - :dbcommand:`resetError`
 
-     - *Deprecated*. Resets the last error status.
+     - *Removed in MongoDB 5.0.* Resets the last error status.
 
    * - :dbcommand:`update`
 
@@ -538,8 +538,8 @@ Sharding Commands
 
    * - :dbcommand:`unsetSharding`
 
-     - *Deprecated*. Internal command that affects connections between instances in a
-       MongoDB deployment.
+     - *Removed in MongoDB 5.0.* Internal command that affects
+       connections between instances in a MongoDB deployment.
 
    * - :dbcommand:`updateZoneKeyRange`
 
@@ -828,7 +828,7 @@ Diagnostic Commands
 
    * - :dbcommand:`shardConnPoolStats`
 
-     - *Deprecated in 4.4 Use :dbcommand:`connPoolStats` instead.*
+     - *Removed in MongoDB 5.0.* Use :dbcommand:`connPoolStats` instead.
 
        Reports statistics on a :binary:`~bin.mongos`'s connection pool for client
        operations against shards. 
diff --git a/source/reference/command/nav-crud.txt b/source/reference/command/nav-crud.txt
@@ -46,7 +46,7 @@ Query and Write Operation Commands
 
    * - :dbcommand:`resetError`
 
-     - *Deprecated*. Resets the last error status.
+     - *Removed in MongoDB 5.0.* Resets the last error status.
 
    * - :dbcommand:`update`
 
diff --git a/source/reference/command/nav-sharding.txt b/source/reference/command/nav-sharding.txt
@@ -140,8 +140,8 @@ Sharding Commands
 
    * - :dbcommand:`unsetSharding`
 
-     - *Deprecated*. Internal command that affects connections between instances in a
-       MongoDB deployment.
+     - *Removed in MongoDB 5.0.* Internal command that affects
+       connections between instances in a MongoDB deployment.
 
    * - :dbcommand:`updateZoneKeyRange`
 
diff --git a/source/reference/command/resetError.txt b/source/reference/command/resetError.txt
@@ -12,8 +12,9 @@ resetError
 
 .. dbcommand:: resetError
 
-   *Deprecated*
+   *Removed in MongoDB 5.0.*
 
    The :dbcommand:`resetError` command resets the last error status.
 
-   .. seealso:: :method:`db.resetError()`
+   .. seealso:: :method:`db.resetError()` (*also removed in MongoDB
+      5.0*)
diff --git a/source/reference/command/shardConnPoolStats.txt b/source/reference/command/shardConnPoolStats.txt
@@ -17,7 +17,7 @@ Definition
 
 .. dbcommand:: shardConnPoolStats
 
-   .. deprecated:: 4.4 Use :dbcommand:`connPoolStats` instead.
+   *Removed in MongoDB 5.0.* Use :dbcommand:`connPoolStats` instead.
 
    Returns information on the pooled and cached connections in the sharded
    connection pool. The command also returns information on the per-thread
diff --git a/source/reference/command/unsetSharding.txt b/source/reference/command/unsetSharding.txt
@@ -12,9 +12,9 @@ unsetSharding
 
 .. dbcommand:: unsetSharding
 
-   .. deprecated:: 4.4
+   *Removed in MongoDB 5.0.*
 
-   :dbcommand:`unsetSharding` is an internal command that supports sharding
-   functionality.
+   :dbcommand:`unsetSharding` is an internal command that supports
+   sharding functionality.
 
    .. slave-ok, admin-only
diff --git a/source/reference/method.txt b/source/reference/method.txt
@@ -538,7 +538,7 @@ Database
 
    * - :method:`db.resetError()`
 
-     - *Deprecated*. Resets the last error status.
+     - *Removed in MongoDB 5.0.* Resets the last error status.
 
    * - :method:`db.runCommand()`
 
diff --git a/source/reference/method/db.resetError.txt b/source/reference/method/db.resetError.txt
@@ -12,7 +12,7 @@ db.resetError()
 
 .. method:: db.resetError()
 
-   .. deprecated:: 1.6
+   *Removed in MongoDB 5.0.*
 
-   Provides a wrapper around the
-   :dbcommand:`resetError` command.
+   Provides a wrapper around the :dbcommand:`resetError` command
+   (*also removed in MongoDB 5.0*).
diff --git a/source/reference/method/js-database.txt b/source/reference/method/js-database.txt
@@ -158,7 +158,7 @@ Database Methods
 
    * - :method:`db.resetError()`
 
-     - *Deprecated*. Resets the last error status.
+     - *Removed in MongoDB 5.0.* Resets the last error status.
 
    * - :method:`db.runCommand()`
 
diff --git a/source/reference/privilege-actions.txt b/source/reference/privilege-actions.txt
@@ -47,7 +47,7 @@ Query and Write Actions
    - :dbcommand:`listCollections`
    - :dbcommand:`listIndexes`
    - :dbcommand:`mapReduce` with the ``{out: inline}`` option.
-   - :dbcommand:`resetError` (*Deprecated*)
+   - :dbcommand:`resetError` (*Removed in MongoDB 5.0*)
 
    Required for the query portion of the :dbcommand:`mapReduce` command and
    :method:`db.collection.mapReduce` helper method when :ref:`outputting
@@ -752,9 +752,8 @@ Diagnostic Actions
 
 .. authaction:: connPoolStats
 
-   User can perform the :dbcommand:`connPoolStats` and the deprecated
-   :dbcommand:`shardConnPoolStats` commands. Apply this action to the
-   ``cluster`` resource.
+   User can perform the :dbcommand:`connPoolStats` command. Apply this
+   action to the ``cluster`` resource.
 
 .. authaction:: cursorInfo
 
diff --git a/source/reference/sharding.txt b/source/reference/sharding.txt
@@ -276,8 +276,8 @@ The following database commands support :term:`sharded clusters
 
    * - :dbcommand:`unsetSharding`
 
-     - *Deprecated*. Internal command that affects connections between instances in a
-       MongoDB deployment.
+     - *Removed in MongoDB 5.0.* Internal command that affects
+       connections between instances in a MongoDB deployment.
 
    * - :dbcommand:`updateZoneKeyRange`
 
diff --git a/source/release-notes/5.0-compatibility.txt b/source/release-notes/5.0-compatibility.txt
@@ -17,6 +17,16 @@ versions of MongoDB.
 Removed Commands
 ----------------
 
+Starting in MongoDB 5.0, these commands are removed:
+
+- :dbcommand:`shardConnPoolStats` (use :dbcommand:`connPoolStats`
+  instead). Deprecated since MongoDB 4.4.
+
+- :dbcommand:`unsetSharding`. Deprecated since MongoDB 4.4.
+
+- :dbcommand:`resetError` and :method:`db.resetError()`. Deprecated
+  since MongoDB 1.6.
+
 Removed Parameters
 ------------------
 

Original file line number	Diff line number	Diff line change
@@ -325,7 +325,7 @@ command>` in MongoDB.
`325`	`325`	`-`
`326`	`326`	`-`
`327`	`327`	`-`
`328`		- * - :dbcommand:`resetError`
	`328`	+ * - :dbcommand:`resetError` (Removed in MongoDB 5.0)
`329`	`329`	`-`
`330`	`330`	`-`
`331`	`331`	`-`
@@ -369,7 +369,7 @@ command>` in MongoDB.
`369`	`369`	`-`
`370`	`370`	`-`
`371`	`371`	`-`
`372`		- * - :dbcommand:`unsetSharding`
	`372`	+ * - :dbcommand:`unsetSharding` (Removed in MongoDB 5.0)
`373`	`373`	`-`
`374`	`374`	`-`
`375`	`375`	`-`