Docs 11622fix

source/reference/command/killOp.txt

@@ -39,6 +39,14 @@ Definition
 
    .. include:: /includes/extracts/warning-terminating-ops-command.rst
 
+
+.. versionchanged:: 4.0
+
+   The ``killOp`` command can be run on a :binary:`~bin.mongos` and can
+   kill queries that span shards in a cluster. For information on how
+   to list sharding operations that are active on a mongos, see the
+   ``localOps`` parameter in  :pipeline:`$currentOp`.
+
 Access Control
 --------------
 

source/reference/method/db.killOp.txt

@@ -27,6 +27,13 @@ Description
 
    .. include:: /includes/extracts/warning-terminating-ops-method.rst
 
+.. versionchanged:: 4.0
+
+   The ``db.killOp()`` method can be run on a :binary:`~bin.mongos` and can
+   kill queries that are running on more than one shard in a cluster.
+   For information on how to list sharding operations that are active on
+   a mongos, see the ``localOps`` parameter in  :pipeline:`$currentOp`.
+
 Access Control
 --------------
 

source/release-notes/4.0.txt

@@ -727,6 +727,10 @@ Commands
   :dbcommand:`getMore` outside the session. Similarly, for cursors
   created outside of a session, you cannot call :dbcommand:`getMore`
   inside a session.
+
+- The command :dbcommand:`killOp` now supports termination of queries that are
+  running on a :binary:`~bin.mongos`. When run on the ``mongos``, :dbcommand:`killOp` 
+  can kill queries that are running in more than one shard.
 
 - The command :dbcommand:`dbHash` includes the following fields in its
   output:

source/tutorial/configure-ssl.txt

@@ -55,6 +55,20 @@ Certificate Authorities
 
 .. include:: /includes/fact-ssl-certificate-authorities.rst
 
+Public and Private Keys
+~~~~~~~~~~~~~~~~~~~~~~~
+
+There are two options for configuring your MongoDB server to use
+TLS/SSL. You can provide a ``.pem`` file on the command line, or
+configure the instance to use a ``secure transport`` store (available on
+Mac and Windows). Secure transport stores are effectively repositories
+for private keys and certificates that allow you to more easily manage
+your TLS/SSL keypairs.
+
+For the purposes of this tutorial, you will be provided examples using the
+``.pem`` file method first. Each command will be followed with an example
+of how you would do the same using a secure transport store.
+
 ``.pem`` File
 ~~~~~~~~~~~~~
 
@@ -96,6 +110,12 @@ in the following example:
 
    cat mongodb-cert.key mongodb-cert.crt > mongodb.pem
 
+.. note::
+
+   If you are using a Secure Transport store on Mac or Windows, consult the
+   appopriate Mac or Windows documentation on how to generate and/or import
+   keyfiles.
+
 .. seealso:: :doc:`/tutorial/configure-x509-client-authentication`
 
 .. [#FIPS]