updates for site merge

Author: kay-kim

conf-sitemap.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site
-  base_url="http://docs.mongodb.org/v2.2/"
+  base_url="http://docs.mongodb.com/v2.2/"
   store_into="build/v2.2/sitemap.xml.gz"
   verbose="1"
   >
 
 <directory
         path="build/public/v2.2/"
-        url="http://docs.mongodb.org/v2.2/"
+        url="http://docs.mongodb.com/v2.2/"
         default_file="index.html"
         />
 <filter  action="drop"  type="wildcard"  pattern="*~" />

conf.py

@@ -66,15 +66,16 @@ def has(self, *args):
 pygments_style = 'sphinx'
 
 extlinks = {
-    'hardlink' : ( 'http://docs.mongodb.org/{0}/%s'.format(conf.git.branches.current), ''),
+    'hardlink' : ( 'http://docs.mongodb.com/{0}/%s'.format(conf.git.branches.current), ''),
     'issue': ('https://jira.mongodb.org/browse/%s', '' ),
-    'api': ('http://api.mongodb.org/%s', ''),
-    'manual': ('http://docs.mongodb.org/manual%s', ''),
-    'ecosystem': ('http://docs.mongodb.org/ecosystem%s', ''),
-    'meta-driver': ('http://docs.mongodb.org/meta-driver/latest%s', ''),
-    'mms': ('https://mms.mongodb.com/help%s', ''),
-    'mms-hosted': ('https://mms.mongodb.org/help-hosted%s', ''),
-    'about': ('http://www.mongodb.org/about%s', '')
+    'api': ('https://api.mongodb.com/%s', ''),
+    'gettingstarted': ('https://docs.mongodb.com/getting-started%s', ''),
+    'manual': ('https://docs.mongodb.org/manual%s', ''),
+    'ecosystem': ('https://docs.mongodb.com/ecosystem%s', ''),
+    'mms-docs': ('https://docs.cloud.mongodb.com%s', ''),
+    'mms-home': ('https://cloud.mongodb.com%s', ''),
+    'opsmgr': ('https://docs.opsmanager.mongodb.com/current%s', ''),
+    'products': ('https://www.mongodb.com/products%s', '')
 }
 
 ## add `extlinks` for each published version.

config/build_conf.yaml

@@ -5,7 +5,7 @@ git:
 project:
   name: 'manual'
   tag: 'manual'
-  url: 'http://docs.mongodb.org'
+  url: 'https://docs.mongodb.com'
   title: 'MongoDB Manual'
   branched: true
   siteroot: true

source/faq/sharding.txt

@@ -387,6 +387,7 @@ Consider the following error message:
 
 .. code-block:: none
 
+
    ERROR: moveChunk commit failed: version is at <n>|<nn> instead of <N>|<NN>" and "ERROR: TERMINATING"
 
 :program:`mongod` issues this message if, during a :ref:`chunk