resolve cherrypick conflicts

Author: stephmarie17

source/fundamentals/connections/connection-guide.txt

@@ -174,6 +174,10 @@ connections:
 - Require you to :manual:`specify a secondary read preference </core/read-preference/#mongodb-readmode-secondary>`
   when the specified host isn't the **primary**.
 
+.. note:: Replica Set in Docker
+
+   .. sharedinclude:: dbx/docker-replica-set.rst
+
 .. _golang-connection-options:
 
 ------------------