DOCSP-14409 insert return value units v4.2 backport

.tx/config

@@ -3252,6 +3252,11 @@ file_filter = locale/<lang>/LC_MESSAGES/reference/method/db.cloneCollection.po
 source_file = locale/pot/reference/method/db.cloneCollection.pot
 source_lang = en
 
+[mongodb-manual.reference--method--db_printSecondaryReplicationInfo]
+file_filter = locale/<lang>/LC_MESSAGES/reference/method/db.printSecondaryReplicationInfo.po
+source_file = locale/pot/reference/method/db.printSecondaryReplicationInfo.pot
+source_lang = en
+
 [mongodb-manual.reference--method--db_printSlaveReplicationInfo]
 file_filter = locale/<lang>/LC_MESSAGES/reference/method/db.printSlaveReplicationInfo.po
 source_file = locale/pot/reference/method/db.printSlaveReplicationInfo.pot
@@ -4087,6 +4092,11 @@ file_filter = locale/<lang>/LC_MESSAGES/reference/method/db.collection.copyTo.po
 source_file = locale/pot/reference/method/db.collection.copyTo.pot
 source_lang = en
 
+[mongodb-manual.reference--method--rs_printSecondaryReplicationInfo]
+file_filter = locale/<lang>/LC_MESSAGES/reference/method/rs.printSecondaryReplicationInfo.po
+source_file = locale/pot/reference/method/rs.printSecondaryReplicationInfo.pot
+source_lang = en
+
 [mongodb-manual.reference--method--rs_printSlaveReplicationInfo]
 file_filter = locale/<lang>/LC_MESSAGES/reference/method/rs.printSlaveReplicationInfo.po
 source_file = locale/pot/reference/method/rs.printSlaveReplicationInfo.pot

CONTRIBUTING.rst

@@ -19,10 +19,10 @@ pull request.
 Please review the following documents for our style, conventions,
 processes and practices for the MongoDB Documentation:
 
-- `Style Guide <http://docs.mongodb.org/manual/meta/style-guide>`_
-- `Documentation Practices <http://docs.mongodb.org/manual/meta/practices>`_
-- `Documentation Organization <http://docs.mongodb.org/manual/meta/organization>`_
-- `Build Instructions <http://docs.mongodb.org/manual/meta/build>`_
+- `Style Guide <http://docs.mongodb.org/meta/style-guide>`_
+- `Documentation Practices <http://docs.mongodb.org/meta/practices>`_
+- `Documentation Organization <http://docs.mongodb.org/meta/organization>`_
+- `Documentation Build Tools <https://docs.mongodb.com/meta/tutorials/install/>`_
 
 Do not hesitate to open a ticket in our `Jira`_ project
 or to contact the `documentation team`_

Makefile

@@ -115,8 +115,8 @@ examples:
 	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/master/test/examples/query_array_of_documents.js              -o ${DRIVERS_PATH}/node_query_array_of_documents.js
 	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/master/test/examples/query_for_null_fields.js                 -o ${DRIVERS_PATH}/node_query_for_null_fields.js
 	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/master/test/examples/remove_documents.js                      -o ${DRIVERS_PATH}/node_remove.js
-	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/next/test/examples/transactions.js                            -o ${DRIVERS_PATH}/node_transactions.js
-	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/master/test/examples/update_documents.js                      -o ${DRIVERS_PATH}/node_update.js
+	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/master/test/examples/transactions.js                            -o ${DRIVERS_PATH}/node_transactions.js
+	curl -SfL https://raw.githubusercontent.com/mongodb/node-mongodb-native/3.6/test/examples/update_documents.js                      -o ${DRIVERS_PATH}/node_update.js
 
 # ruby
 	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-ruby-driver/master/spec/integration/shell_examples_spec.rb -o ${DRIVERS_PATH}/shell_examples_spec.rb
@@ -141,6 +141,7 @@ examples:
 
 # c++
 	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-cxx-driver/master/src/mongocxx/test/transactions.cpp -o ${DRIVERS_PATH}/cpp-transactions.cpp 
+	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-cxx-driver/master/examples/mongocxx/with_transaction.cpp -o ${DRIVERS_PATH}/cpp-with-transaction.cpp 
 
 # go
 	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-go-driver/master/examples/documentation_examples/examples.go -o ${DRIVERS_PATH}/go_examples.go

README.rst

@@ -3,7 +3,7 @@ MongoDB Documentation
 =====================
 
 This repository contains a major revision of the MongoDB documentation,
-currently accessible at http://docs.mongodb.org/manual/. You can build
+currently accessible at http://docs.mongodb.com/manual/. You can build
 the documentation locally if you have `giza
 <https://pypi.python.org/pypi/giza>`_ installed: ::
 
@@ -33,17 +33,6 @@ Report Issues
 To file issues or requests regarding the documentation, go to the
 `Documentation Jira Project <https://jira.mongodb.org/browse/DOCS>`_.
 
-Additional Information
-----------------------
-
-For an overview of the documentation style, process, and overall
-organization, see the following pages:
-
-- `Style Guide <https://docs.mongodb.com/meta/style-guide>`_
-- `Documentation Practices <http://docs.mongodb.com/meta/practices>`_
-- `Documentation Organization <https://docs.mongodb.com/meta/organization>`_
-- `Build Instructions <https://docs.mongodb.com/meta/build>`_
-
 License
 -------
 

changelogs/generatechangelogs.py

@@ -52,7 +52,7 @@ def get_jira_issues(fixVersion):
     # Run the JIRA query
     query = "project in {0} and fixVersion = {1} and resolution = 'Fixed' ORDER BY key ASC".format(
         projects, fixVersion)
-    issues = auth_jira.search_issues(query, maxResults=200)
+    issues = auth_jira.search_issues(query, maxResults=500)
 
     logger.info("building changelog for {0} with {1} issue(s)".format(
         fixVersion, len(issues)))

conf-sitemap.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site
-  base_url="http://docs.mongodb.com/manual/"
-  store_into="build/master/sitemap.xml.gz"
+  base_url="http://docs.mongodb.com/v4.2/"
+  store_into="build/v4.2/sitemap.xml.gz"
   verbose="1"
   >
 
 <directory
-        path="build/public/master/"
-        url="http://docs.mongodb.com/manual/"
+        path="build/public/v4.2/"
+        url="http://docs.mongodb.com/v4.2/"
         default_file="index.html"
         />
 <filter  action="drop"  type="wildcard"  pattern="*~" />
@@ -19,7 +19,7 @@
 <filter  action="drop"  type="wildcard"  pattern="*.gif" />
 <filter  action="drop"  type="wildcard"  pattern="*.png" />
 <filter  action="drop"  type="regexp"  pattern="/\.[^/]*" />
-<filter  action="drop"  type="wildcard"  pattern="*/master/single*"/>
+<filter  action="drop"  type="wildcard"  pattern="*/v4.2/single*"/>
 <filter  action="drop"  type="wildcard"  pattern="*/meta/*"/>
 
 <filter  action="drop"  type="wildcard"  pattern="*/_static/*" />

conf.py

@@ -91,9 +91,9 @@ def has(self, *args):
 
 
 extlinks = {
-    'hardlink' : ( 'http://docs.mongodb.com/{0}/%s'.format(conf.git.branches.current), ''),
+    'hardlink' : ( 'https://docs.mongodb.com/{0}/%s'.format(conf.git.branches.current), ''),
     'issue': ('https://jira.mongodb.org/browse/%s', '' ),
-    'api': ('https://api.mongodb.com/%s', ''),
+    'api': ('https://docs.mongodb.com/drivers/%s', ''),
     'gettingstarted': ('https://docs.mongodb.com/getting-started%s', ''),
     'manual': ('https://docs.mongodb.com/manual%s', ''),
     'ecosystem': ('https://docs.mongodb.com/ecosystem%s', ''),
@@ -102,22 +102,30 @@ def has(self, *args):
     'opsmgr': ('https://docs.opsmanager.mongodb.com/current%s', ''),
     'atlas': ('https://docs.atlas.mongodb.com%s',''),
     'products': ('https://www.mongodb.com/products%s', ''),
-    'wtdocs': ('http://source.wiredtiger.com/mongodb-3.4%s', ''),
+    'wtdocs': ('https://source.wiredtiger.com/mongodb-3.4%s', ''),
     'perl-api': ('https://metacpan.org/pod/MongoDB::%s', ''),
-    'node-docs': ('http://mongodb.github.io/node-mongodb-native/3.3/%s', ''),
-    'node-api': ('http://mongodb.github.io/node-mongodb-native/3.3/api/%s', ''),
-    'ruby-api': ('http://api.mongodb.com/ruby/current/Mongo/%s', ''),
-    'scala-api': ('http://mongodb.github.io/mongo-scala-driver/2.0/scaladoc/org/mongodb/scala/MongoCollection.html#%s', ''),
+    'node-docs': ('https://mongodb.github.io/node-mongodb-native/3.3/%s', ''),
+    'node-api': ('https://mongodb.github.io/node-mongodb-native/3.3/api/%s', ''),
+    'ruby-api': ('https://api.mongodb.com/ruby/current/Mongo/%s', ''),
+    'scala-api': ('https://mongodb.github.io/mongo-scala-driver/2.0/scaladoc/org/mongodb/scala/MongoCollection.html#%s', ''),
     'csharp-api': ('https://api.mongodb.com/csharp/current/html/%s.htm', ''),
     'csharp-docs': ('https://mongodb.github.io/mongo-csharp-driver/2.4/reference/%s', ''),
-    'java-async-docs': ('http://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/%s', ''),
-    'java-async-api': ('http://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/javadoc/%s', ''),
-    'go-api': ('https://godoc.org/github.com/mongodb/mongo-go-driver/%s', '')
+    'java-async-docs': ('https://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/%s', ''),
+    'java-async-api': ('https://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/javadoc/%s', ''),
+    'go-api': ('https://godoc.org/github.com/mongodb/mongo-go-driver/%s', ''),
+    'v4.0': ('https://docs.mongodb.com/v4.0%s', ''),
+    'v3.6': ('https://docs.mongodb.com/v3.6%s', ''),
+    'v3.4': ('https://docs.mongodb.com/v3.4%s', ''),
+    'v3.2': ('https://docs.mongodb.com/v3.2%s', ''),
+    'v3.0': ('https://docs.mongodb.com/v3.0%s', ''),
+    'v2.6': ('https://docs.mongodb.com/v2.6%s', ''),
+    'v2.4': ('https://docs.mongodb.com/v2.4%s', ''),
+    'v2.2': ('https://docs.mongodb.com/v2.2%s', '')
 }
 
 ## add `extlinks` for each published version.
-for i in conf.git.branches.published:
-    extlinks[i] = ( ''.join([ conf.project.url, '/', i, '%s' ]), '' )
+#for i in conf.git.branches.published:
+#    extlinks[i] = ( ''.join([ conf.project.url, '/', i, '%s' ]), '' )
 
 intersphinx_mapping = {}
 for i in conf.system.files.data.intersphinx:
@@ -184,10 +192,7 @@ def has(self, *args):
     'stable': conf.version.stable,
     'sitename': sconf.theme.sitename,
     'nav_excluded': sconf.theme.nav_excluded,
-    'upcoming': conf.version.upcoming,
-    'banner': True,
-    'banner_msg': 'This is an upcoming (i.e. in progress) version of the manual.',
-
+    'upcoming': conf.version.upcoming
 }
 
 html_sidebars = sconf.sidebars
@@ -216,7 +221,7 @@ def has(self, *args):
     'preamble': '\n'.join(latex_preamble_elements),
     'pointsize': '10pt',
     'papersize': 'letterpaper',
-    'tableofcontents': '\\textcopyright{ MongoDB, Inc. 2008 - 2016 } This work is licensed under a \href{http://creativecommons.org/licenses/by-nc-sa/3.0/us/}{Creative Commons Attribution-NonCommercial-ShareAlike 3.0 United States License}\\clearpage\\tableofcontents'
+    'tableofcontents': '\\textcopyright{ MongoDB, Inc. 2008 - 2016 } This work is licensed under a \href{https://creativecommons.org/licenses/by-nc-sa/3.0/us/}{Creative Commons Attribution-NonCommercial-ShareAlike 3.0 United States License}\\clearpage\\tableofcontents'
 }
 
 latex_paper_size = 'letter'

config/build_conf.yaml

@@ -10,8 +10,8 @@ project:
   branched: true
   siteroot: true
 version:
-  release: '4.3.x'
-  branch: '4.4'
+  release: '4.2.14'
+  branch: '4.2'
 system:
   files:
     - 'pdfs.yaml'

config/changelog_conf.yaml

@@ -47,6 +47,7 @@ groups:
     - Mobile
   "Internals":
     - Testing
+    - Python tests
     - Testing Infrastructure
     - Stability
     - Performance

config/pdfs.yaml

@@ -5,13 +5,6 @@ author: 'MongoDB, Inc.'
 class: 'manual'
 tag: 'guide'
 ---
-source: 'meta/manual'
-title: 'MongoDB Documentation'
-output: 'MongoDB.tex'
-author: 'MongoDB, Inc.'
-class: 'manual'
-tag: 'manual'
----
 source: 'replication'
 title: 'Replication and MongoDB'
 output: 'MongoDB-replication.tex'
@@ -26,27 +19,13 @@ author: 'MongoDB, Inc.'
 class: 'manual'
 tag: 'guide'
 ---
-source: 'meta/reference'
-title: 'MongoDB Reference Manual'
-output: 'MongoDB-reference.tex'
-author: 'MongoDB, Inc.'
-class: 'manual'
-tag: 'manual'
----
 source: 'crud'
 title: 'MongoDB CRUD Operations'
 output: 'MongoDB-crud.tex'
 author: 'MongoDB, Inc.'
 class: 'manual'
 tag: 'guide'
 ---
-source: 'meta/administration'
-title: 'MongoDB Administration'
-output: 'MongoDB-administration.tex'
-author: 'MongoDB, Inc.'
-class: 'manual'
-tag: 'guide'
----
 source: 'security'
 title: 'MongoDB Security Guide'
 output: 'MongoDB-security.tex'

config/redirects

@@ -1,8 +1,7 @@
 define: base https://docs.mongodb.com
-define: versions v2.2 v2.4 v2.6 v3.0 v3.2 v3.4 v3.6 v4.0 v4.2 v4.4 master
+define: versions v2.2 v2.4 v2.6 v3.0 v3.2 v3.4 v3.6 v4.0 v4.2 master
 symlink: manual -> v4.2
-symlink: v4.4 -> master
-symlink: upcoming -> master
+symlink: v4.2 -> master
 
 [v2.2]: /${version}/core/read-operations-introduction -> ${base}/${version}/core/read-operations
 [v2.2]: /${version}/core/write-operations-introduction -> ${base}/${version}/core/write-operations
@@ -1614,7 +1613,7 @@ raw: /v2.8/release-notes/2.8-changes -> ${base}/v3.0/release-notes/3.0
 [v3.0-v4.0]: /${version}/tutorial/rotate-x509-membership-certificates -> ${base}/${version}/tutorial/configure-x509-member-authentication
 [v3.0-v4.0]: /${version}/reference/mongodb-extended-json-v1 -> ${base}/${version}/reference/mongodb-extended-json
 
-
+[v3.0-v4.0]: /${version}/tutorial/update-documents-with-aggregation-pipeline -> ${base}/${version}/tutorial/update-documents
 
 # CSFLE Redirects
 [v3.0-v4.0]: /${version}/core/security-client-side-encryption -> ${base}/${version}/security 
@@ -1676,19 +1675,3 @@ raw: /manual/core/wildcard -> ${base}/manual/core/index-wildcard
 [v3.0-v3.4]: /${version}/tutorial/install-mongodb-on-windows-unattended  -> ${base}/${version}/tutorial/install-mongodb-on-windows
 [v3.0-v3.4]: /${version}/tutorial/install-mongodb-enterprise-on-windows-unattended  -> ${base}/${version}/tutorial/install-mongodb-enterprise-on-windows
 
-#
-# Redirects for 4.4 and greater (if pages are removed in 4.4 that used to exist in earlier versions)
-#
-
-#
-# Redirects for 4.2 or earlier (i.e. before 4.4 - for new pages added in 4.4)
-# For the earliest version, let's use v3.4 instead of all earlier version *,
-# That is [v3.4-4.2] instead of [*-v4.2] so that we try to limit the growth of redirects
-
-## Redirects for release notes - trying something more specific 
-
-[v4.2]: /${version}/release-notes/4.4 -> ${base}/${version}/release-notes/4.2
-[v4.0]: /${version}/release-notes/4.4 -> ${base}/${version}/release-notes/4.0
-[v3.6]: /${version}/release-notes/4.4 -> ${base}/${version}/release-notes/3.6
-[v3.4]: /${version}/release-notes/4.4 -> ${base}/${version}/release-notes/3.4
-

config/sphinx.yaml

@@ -23,10 +23,6 @@ root-base:
   languages: ['es', 'fr', 'ja', 'it', 'zh']
 web-base:
   inherit: root-base
-  excluded:
-    - /meta/reference.txt
-    - /meta/administration.txt
-    - /meta/manual.txt
   tags:
     - web
 print-base:

config/sphinx_local.yaml

@@ -88,7 +88,6 @@ theme:
     - /release-notes/3.6
     - /release-notes/4.0
     - /release-notes/4.2
-    - /release-notes/4.4
     - /security
     - /sharding
     - /changeStreams