Update URLs for subdomain consolidation

Author: i80and

Makefile

@@ -14,8 +14,8 @@ DOTCOM_STAGING_URL="https://mongodbcom-cdn.website.staging.corp.mongodb.com"
 DOTCOM_STAGING_BUCKET=docs-mongodb-org-dotcomstg
 DOTCOM_PRODUCTION_URL="https://mongodb.com"
 DOTCOM_PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd
-DOTCOM_PREFIX=docs-qa/ruby-driver
-DOTCOM_STGPREFIX=docs-qa/ruby-driver
+DOTCOM_PREFIX=docs/ruby-driver
+DOTCOM_STGPREFIX=docs/ruby-driver
 
 TARGET_DIR=source-${GIT_BRANCH}
 
@@ -57,28 +57,16 @@ publish: migrate ## Build publishable artifacts, and also migrates assets
 	if [ ${GIT_BRANCH} = master ]; then mut-redirects config/redirects -o build/public/.htaccess; fi
 
 stage: ## Host online for review
-	mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${PROJECT} --stage ${ARGS}
-	@echo "Hosted at ${STAGING_URL}/${PROJECT}/${USER}/${GIT_BRANCH}/index.html"
-
 	mut-publish build/${GIT_BRANCH}/html ${DOTCOM_STAGING_BUCKET} --prefix=${DOTCOM_STGPREFIX} --stage ${ARGS}
 	@echo "Hosted at ${DOTCOM_STAGING_URL}/${DOTCOM_STGPREFIX}/${USER}/${GIT_BRANCH}/index.html"
 
 fake-deploy: build/public/${GIT_BRANCH} ## Create a fake deployment in the staging bucket
-	mut-publish build/public/ ${STAGING_BUCKET} --prefix=${PROJECT} --deploy --verbose  --redirects build/public/.htaccess ${ARGS}
-	@echo "Hosted at ${STAGING_URL}/${PROJECT}/${GIT_BRANCH}/index.html"
-
 	mut-publish build/public/ ${DOTCOM_STAGING_BUCKET} --prefix=${DOTCOM_STGPREFIX} --deploy --verbose  --redirects build/public/.htaccess ${ARGS}
 	@echo "Hosted at ${DOTCOM_STAGING_BUCKET}/${DOTCOM_STGPREFIX}/${GIT_BRANCH}/index.html"
 
 deploy: build/public/${GIT_BRANCH} ## Deploy to the production bucket
-	mut-publish build/public/ ${PRODUCTION_BUCKET} --prefix=${PROJECT} --deploy --redirects build/public/.htaccess ${ARGS}
-
-	@echo "Hosted at ${PRODUCTION_URL}/${PROJECT}/${GIT_BRANCH}"
-
 	mut-publish build/public/ ${DOTCOM_PRODUCTION_BUCKET} --prefix=${DOTCOM_PREFIX} --deploy --redirects build/public/.htaccess ${ARGS}
-
 	@echo "Hosted at ${DOTCOM_PRODUCTION_URL}/${DOTCOM_PREFIX}/${GIT_BRANCH}"
-
 	$(MAKE) deploy-search-index
 
 deploy-search-index: ## Update the search index for this branch

conf.py

@@ -61,7 +61,7 @@
 pygments_style = 'sphinx'
 
 extlinks = {
-    'manual': ('https://docs.mongodb.com/manual%s', ''),
+    'manual': ('https://www.mongodb.com/docs/manual%s', ''),
 }
 
 ## add `extlinks` for each published version.

config/intersphinx.yaml

@@ -4,6 +4,6 @@ url: https://docs.python.org/2/
 path: python2.inv
 ---
 name: mongodb
-url: https://docs.mongodb.com/manual/
+url: https://www.mongodb.com/docs/manual/
 path: mongodb.inv
 ...