From 56e5ae9126f5587a3b1cf7e42c50d4ce36315af3 Mon Sep 17 00:00:00 2001
From: jonathan <jonathan.destefano@10gen.com>
Date: Fri, 3 Nov 2017 11:29:34 -0400
Subject: [PATCH] DOCS-10958 networkMessageCompressors disabled by default in
 shell.

---
 source/includes/fact-networkMessageCompressors.rst |  2 +-
 source/includes/options-conf.yaml                  | 11 +++++++----
 source/includes/options-mongo.yaml                 |  4 +++-
 source/includes/options-mongod.yaml                | 10 +++++++---
 source/includes/options-mongos.yaml                | 11 +++++++++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/source/includes/fact-networkMessageCompressors.rst b/source/includes/fact-networkMessageCompressors.rst
index 21cafe88481..0fa96af0545 100644
--- a/source/includes/fact-networkMessageCompressors.rst
+++ b/source/includes/fact-networkMessageCompressors.rst
@@ -6,7 +6,7 @@
 
 You can specify the following compressors:
 
-- :term:`snappy` (Default)
+- :term:`snappy`
 
 - :term:`zlib`
 
diff --git a/source/includes/options-conf.yaml b/source/includes/options-conf.yaml
index b2c5b3d73d4..de4576afb3c 100644
--- a/source/includes/options-conf.yaml
+++ b/source/includes/options-conf.yaml
@@ -707,10 +707,12 @@ description: |
    .. versionadded:: 3.4
 
    .. versionchanged:: 3.6
+      \ 
 
-      - Add support for :term:`zlib` compressor.
+   - Add support for :term:`zlib` compressor.
 
-      - Enabled by default. To disable, set to ``disabled``.
+   - Enabled by default using the :term:`snappy` compressor. To
+     disable compression, set this option to ``disabled``.
 
    Enables network compression for communication between this
    :program:`mongod` or :program:`mongos` instance and:
@@ -718,8 +720,9 @@ description: |
    - other members in the deployment, if a member of a replica set or a
      sharded cluster
 
-   - a :program:`mongo` shell
-   
+   - a :program:`mongo` shell when network compression is enabled
+     (disabled by default)
+
    - drivers that support the ``OP_COMPRESSED`` message format.
 
    .. include:: /includes/fact-networkMessageCompressors.rst
diff --git a/source/includes/options-mongo.yaml b/source/includes/options-mongo.yaml
index 99ad1e666d5..7910cc8051e 100644
--- a/source/includes/options-mongo.yaml
+++ b/source/includes/options-mongo.yaml
@@ -411,9 +411,11 @@ description: |
    .. versionadded:: 3.4
 
    .. versionchanged:: 3.6
+      \ 
 
       - Add support for :term:`zlib` compressor.
-      - Enabled by default. To disable, set to ``disabled``.
+
+      - Disabled by default in the :program:`mongo` shell.
 
    Enables network compression for communication between this
    {{program}} shell and:
diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml
index 535821048d7..a5bbb2dc408 100644
--- a/source/includes/options-mongod.yaml
+++ b/source/includes/options-mongod.yaml
@@ -2624,9 +2624,12 @@ description: |
    .. versionadded:: 3.4
 
    .. versionchanged:: 3.6
+      \ 
 
-      - Add support for :term:`zlib` compressor.
-      - Enabled by default. To disable, set to ``disabled``.
+   - Add support for :term:`zlib` compressor.
+
+   - Enabled by default using the :term:`snappy` compressor. To
+     disable compression, set this option to ``disabled``.
 
    Enables network compression for communication between this
    {{program}} instance and:
@@ -2637,7 +2640,8 @@ description: |
    - other members of the sharded cluster, if the instance is part of a
      sharded cluster
 
-   - a :program:`mongo` shell,
+   - a :program:`mongo` shell when network compression is enabled
+     (disabled by default)
 
    - drivers that support the ``OP_COMPRESSED`` message format.
 
diff --git a/source/includes/options-mongos.yaml b/source/includes/options-mongos.yaml
index 11bcff81b50..c334415bf14 100644
--- a/source/includes/options-mongos.yaml
+++ b/source/includes/options-mongos.yaml
@@ -486,15 +486,22 @@ description: |
    .. versionadded:: 3.4
 
    .. versionchanged:: 3.6
+      \ 
 
-      Add support for :term:`zlib` compressor.
+   - Add support for :term:`zlib` compressor.
+
+   - Enabled by default using the :term:`snappy` compressor. To
+     disable compression, set this option to ``disabled``.
 
    Enables network compression for communication between this
    {{program}} instance and:
       
    - other members of the sharded cluster
 
-   - a :program:`mongo` shell.
+   - a :program:`mongo` shell when network compression is enabled
+     (disabled by default)
+
+   - drivers that support the ``OP_COMPRESSED`` message format.
 
    .. include:: /includes/fact-networkMessageCompressors.rst