3.1.7 release notes

Author: kay-kim

source/includes/fact-enterprise-only-admonition.rst

@@ -0,0 +1,3 @@
+.. admonition:: Enterprise Feature
+
+   Available in MongoDB Enterprise only.

source/reference/glossary.txt

@@ -973,13 +973,13 @@ Glossary
       See :ref:`read-operations-query-optimization`.
 
    upsert
-      An option for update operations. If set to true, the update
-      operation will either update the first document matched by a
-      query or insert a new document if none matches. The new document
-      will have the fields implied by the operation. The
-      :method:`~db.collection.update()` and
-      :method:`~db.collection.findAndModify()` have the option. See
-      :ref:`upsert-parameter`.
+      An option for update operations; e.g.
+      :method:`~db.collection.update()`,
+      :method:`~db.collection.findAndModify()`. If set to true, the
+      update operation will either update the document(s) matched by
+      the specified query or if no documents match, insert a new
+      document. The new document will have the fields indicated in the
+      operation. See :ref:`upsert-parameter`.
 
    virtual memory
       An application's working memory, typically residing on both

source/release-notes/3.1-dev-series-configure-encryption.txt

@@ -23,11 +23,13 @@ Features are subject to change. See also
 Overview
 --------
 
+.. include:: /includes/fact-enterprise-only-admonition.rst
+
 .. important::
 
    Available for the WiredTiger Storage Engine Only.
 
-MongoDB |version-dev| introduces a native encryption option for the
+MongoDB Enterprise |version-dev| introduces a native encryption option for the
 WiredTiger storage engine. With storage encryption, the secure
 management of the encryption keys is critical.
 
@@ -46,11 +48,11 @@ encryption and key management.
 Key Manager
 -----------
 
-MongoDB supports secure transfer of keys with compatible key management
-appliances. Using a key manager allows for the keys to be stored in the
-key manager.
+MongoDB Enterprise supports secure transfer of keys with compatible key
+management appliances. Using a key manager allows for the keys to be
+stored in the key manager.
 
-MongoDB supports secure transfer of keys with Key Management
+MongoDB Enterprise supports secure transfer of keys with Key Management
 Interoperability Protocol (KMIP) compliant key management appliances.
 While any appliance vendor that provides support for KMIP is expected
 to be compatible, MongoDB has certified against SafeNet KeySecure and