Skip to content

Commit 18f324c

Browse files
sarah-olson-mongodbSarah Olsonjeff-allen-mongoschmalliso
authored
DOCSP-20352 backport for v5.3 (#1068)
* "Fix Merge conflicts" PR for DOCSP-20352 Subdomain consolidation (#1032) * DOCSP-20352: Update intersphix links * DOCSP-20352: Update readme file with new link structure * DOCSP-20352: Update contributing.rst with new link structure. * DOCSP-20352: Update redirects file * DOCSP-20352: Update some links * DOCSP-20352: More subdomain link edits * DOCSP-20352: Subdomain link updates * DOCSP-20352: Subdomain link updates * DOCSP-20352: Delete conf-sitemap * DOCSP-20352: One more link * Update source/includes/driver-examples/driver-example-insert-2.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/reference/program.txt Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/tutorial/analyze-query-plan.txt Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/tutorial/manage-client-side-encryption-data-keys.txt Co-authored-by: jeff-allen-mongo <[email protected]> * DOCSP-20352: Fix role typo "DOCSP-20352: Resolve merge conflicts" * DOCSP-20352: More link edits * DOCSP-20352: Build testing * DOCSP-20352: Link format testing * DOCSP-20352: Test link format * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * Update source/.static/osd.xml Co-authored-by: Allison Reinheimer Moore <[email protected]> * DOCSP-20352: Review feedback * DOCSP-20352: Fix two minor errors Co-authored-by: Sarah Olson <[email protected]> Co-authored-by: jeff-allen-mongo <[email protected]> Co-authored-by: Allison Reinheimer Moore <[email protected]> * "Revert the merge conflict fixes. This is a rapid release" Revert ""Fix Merge conflicts"" This reverts commit c63c7aedfc13f4ccad6a7a333408ab5395aee19f. * PR for DOCSP-20352 Subdomain consolidation (#1032) "DOCSP-20352: Fix merge conflicts" * DOCSP-20352: Update intersphix links * DOCSP-20352: Update readme file with new link structure * DOCSP-20352: Update contributing.rst with new link structure. * DOCSP-20352: Update redirects file * DOCSP-20352: Update some links * DOCSP-20352: More subdomain link edits * DOCSP-20352: Subdomain link updates * DOCSP-20352: Subdomain link updates * DOCSP-20352: Delete conf-sitemap * DOCSP-20352: One more link * Update source/includes/driver-examples/driver-example-insert-2.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/includes/list-table-products-supported-architecture.rst Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/reference/program.txt Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/tutorial/analyze-query-plan.txt Co-authored-by: jeff-allen-mongo <[email protected]> * Update source/tutorial/manage-client-side-encryption-data-keys.txt Co-authored-by: jeff-allen-mongo <[email protected]> * DOCSP-20352: Fix role typo "DOCSP-20352: Resolve merge conflicts" * DOCSP-20352: More link edits * DOCSP-20352: Build testing * DOCSP-20352: Link format testing * DOCSP-20352: Test link format * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * DOCSP-20352: Minor format edit * Update source/.static/osd.xml Co-authored-by: Allison Reinheimer Moore <[email protected]> * DOCSP-20352: Review feedback * DOCSP-20352: Fix two minor errors Co-authored-by: Sarah Olson <[email protected]> Co-authored-by: jeff-allen-mongo <[email protected]> Co-authored-by: Allison Reinheimer Moore <[email protected]> Co-authored-by: Sarah Olson <[email protected]> Co-authored-by: jeff-allen-mongo <[email protected]> Co-authored-by: Allison Reinheimer Moore <[email protected]>
1 parent a8fa361 commit 18f324c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+135
-184
lines changed

‎CONTRIBUTING.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Contributing to the MongoDB Documentation Project
33
=================================================
44

55
We welcome your contributions to the MongoDB documentation project.
6-
The primary site is http://docs.mongodb.org/ and translated versions
6+
The primary site is https://www.mongodb.com/docs/ and translated versions
77
of the site are listed in `MongoDB Manual Translation
8-
<http://docs.mongodb.org/manual/meta/translation/>`_.
8+
<https://www.mongodb.com/docs/meta/translation/>`_.
99

1010
MongoDB documentation is distributed under a `Creative Commons
1111
Attribution-NonCommercial-ShareAlike 3.0 Unported`_ license. MongoDB,
@@ -19,10 +19,10 @@ pull request.
1919
Please review the following documents for our style, conventions,
2020
processes and practices for the MongoDB Documentation:
2121

22-
- `Style Guide <http://docs.mongodb.org/meta/style-guide>`_
23-
- `Documentation Practices <http://docs.mongodb.org/meta/practices>`_
24-
- `Documentation Organization <http://docs.mongodb.org/meta/organization>`_
25-
- `Documentation Build Tools <https://docs.mongodb.com/meta/tutorials/install/>`_
22+
- `Style Guide <https://www.mongodb.com/docs/meta/style-guide>`_
23+
- `Documentation Practices <https://www.mongodb.com/docs/meta/practices>`_
24+
- `Documentation Organization <https://www.mongodb.com/docs/meta/organization>`_
25+
- `Documentation Build Tools <https://www.mongodb.com/docs/meta/tutorials/install/>`_
2626

2727
Do not hesitate to open a ticket in our `Jira`_ project
2828
or to contact the `documentation team`_

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MongoDB Documentation
33
=====================
44

55
This repository contains a major revision of the MongoDB documentation,
6-
currently accessible at http://docs.mongodb.com/manual/. You can build
6+
currently accessible at https://www.mongodb.com/docs/manual/. You can build
77
the documentation locally if you have `giza
88
<https://pypi.python.org/pypi/giza>`_ installed: ::
99

‎conf-sitemap.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎config/build_conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git:
55
project:
66
name: 'manual'
77
tag: 'manual'
8-
url: 'https://docs.mongodb.com'
8+
url: 'https://www.mongodb.com/docs'
99
title: 'MongoDB Manual'
1010
branched: true
1111
siteroot: true

‎config/redirects

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,18 +1047,18 @@ raw: ${prefix}/master/release-notes/3.3-dev-series-reference -> ${base}/master/r
10471047
[v2.2]: ${prefix}/${version}/MongoDB-manual-v2.2.pdf -> ${base}/${version}/meta/pdfs/
10481048
[v2.2]: ${prefix}/${version}/MongoDB-reference-manual-v2.2.pdf -> ${base}/${version}/meta/pdfs/
10491049
[v2.2]: ${prefix}/${version}/MongoDB-crud-guide-v2.2.pdf -> ${base}/${version}/meta/pdfs/
1050-
(v3.0-*]: ${prefix}/${version}/products/bi-connector -> https://docs.mongodb.com/bi-connector/
1050+
(v3.0-*]: ${prefix}/${version}/products/bi-connector -> https://www.mongodb.com/docs/bi-connector/
10511051
(v3.0-*]: ${prefix}/${version}/reference/business-intelligence-programs -> ${base}/bi-connector/
1052-
(v3.0-*]: ${prefix}/${version}/products/faq-bi-connector -> https://docs.mongodb.com/bi-connector/faq/
1053-
(v3.0-*]: ${prefix}/${version}/products/components-bi-connector -> https://docs.mongodb.com/bi-connector/components/
1054-
(v3.0-*]: ${prefix}/${version}/products/release-notes/bi-connector -> https://docs.mongodb.com/bi-connector/release-notes/
1055-
(v3.0-*]: ${prefix}/${version}/reference/program/mongobischema -> https://docs.mongodb.com/bi-connector/reference/mongobischema/
1056-
(v3.0-*]: ${prefix}/${version}/reference/program/mongobiuser -> https://docs.mongodb.com/bi-connector/reference/mongobiuser/
1057-
(v3.0-*]: ${prefix}/${version}/reference/program/mongodrdl -> https://docs.mongodb.com/bi-connector/reference/mongodrdl/
1058-
(v3.0-*]: ${prefix}/${version}/products/compass -> https://docs.mongodb.com/compass/
1052+
(v3.0-*]: ${prefix}/${version}/products/faq-bi-connector -> https://www.mongodb.com/docs/bi-connector/faq/
1053+
(v3.0-*]: ${prefix}/${version}/products/components-bi-connector -> https://www.mongodb.com/docs/bi-connector/components/
1054+
(v3.0-*]: ${prefix}/${version}/products/release-notes/bi-connector -> https://www.mongodb.com/docs/bi-connector/release-notes/
1055+
(v3.0-*]: ${prefix}/${version}/reference/program/mongobischema -> https://www.mongodb.com/docs/bi-connector/reference/mongobischema/
1056+
(v3.0-*]: ${prefix}/${version}/reference/program/mongobiuser -> https://www.mongodb.com/docs/bi-connector/reference/mongobiuser/
1057+
(v3.0-*]: ${prefix}/${version}/reference/program/mongodrdl -> https://www.mongodb.com/docs/bi-connector/reference/mongodrdl/
1058+
(v3.0-*]: ${prefix}/${version}/products/compass -> https://www.mongodb.com/docs/compass/
10591059
[*]: ${prefix}/${version}/products -> ${base}/${version}/
1060-
(v3.0-*]: ${prefix}/${version}/products/cloud-manager -> https://docs.cloud.mongodb.com/
1061-
(v3.0-*]: ${prefix}/${version}/products/ops-manager -> https://docs.opsmanager.mongodb.com/current/
1060+
(v3.0-*]: ${prefix}/${version}/products/cloud-manager -> https://www.mongodb.com/docs/cloud-manager/
1061+
(v3.0-*]: ${prefix}/${version}/products/ops-manager -> https://www.mongodb.com/docs/ops-manager/current/
10621062
(v2.6-*]: ${prefix}/${version}/reference/command/getoptime -> ${base}/${version}/reference/command/nav-replication/
10631063
(v2.6-*]: ${prefix}/${version}/reference/command/closeAllDatabases -> ${base}/${version}/reference/command/nav-administration/
10641064
[*-v2.6]: ${prefix}/${version}/reference/operator/aggregation/dateToString -> ${base}/${version}/reference/operator/aggregation/
@@ -1084,9 +1084,9 @@ raw: ${prefix}/master/release-notes/3.3-dev-series-reference -> ${base}/master/r
10841084
(v2.6-*]: ${prefix}/${version}/tutorial/backup-with-mongodump -> ${base}/${version}/tutorial/backup-and-restore-tools/
10851085
[*-v2.6]: ${prefix}/${version}/tutorial/backup-and-restore-tools -> ${base}/${version}/tutorial/backup-with-mongodump/
10861086
[*-v2.6]: ${prefix}/${version}/administration/analyzing-mongodb-performance -> ${base}/${version}/administration/optimization/
1087-
raw: ${prefix}/master/tutorial/generate-test-data -> http://docs.mongodb.com/getting-started/shell/
1088-
raw: ${prefix}/manual/tutorial/generate-test-data -> http://docs.mongodb.com/getting-started/shell/
1089-
[v3.0]: ${prefix}/${version}/tutorial/generate-test-data -> ${base}/${version}http://docs.mongodb.com/getting-started/shell/
1087+
raw: ${prefix}/master/tutorial/generate-test-data -> https://www.mongodb.com/docs/getting-started/shell/
1088+
raw: ${prefix}/manual/tutorial/generate-test-data -> https://www.mongodb.com/docs/getting-started/shell/
1089+
[v3.0]: ${prefix}/${version}/tutorial/generate-test-data -> https://www.mongodb.com/docs/getting-started/shell/
10901090
(v2.4-*]: ${prefix}/${version}/reference/transparent-huge-pages -> ${base}/${version}/tutorial/transparent-huge-pages/
10911091
[*-v2.2]: ${prefix}/${version}/tutorial/transparent-huge-pages -> ${base}/${version}/administration/production-notes/
10921092
[*-v3.0]: ${prefix}/${version}/tutorial/perform-findAndModify-quorum-reads -> ${base}/${version}/reference/method/db.collection.findAndModify/

‎snooty.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
55

66
intersphinx = [ "https://pymongo.readthedocs.io/en/stable/objects.inv",
77
"https://motor.readthedocs.io/en/stable/objects.inv",
8-
"https://docs.atlas.mongodb.com/objects.inv",
9-
"https://docs.mongodb.com/php-library/master/objects.inv",
10-
"https://docs.mongodb.com/compass/current/objects.inv",
11-
"https://docs.mongodb.com/database-tools/objects.inv",
12-
"https://docs.mongodb.com/mongodb-shell/objects.inv"
8+
"https://www.mongodb.com/docs/atlas/objects.inv",
9+
"https://www.mongodb.com/docs/php-library/upcoming/objects.inv",
10+
"https://www.mongodb.com/docs/compass/current/objects.inv",
11+
"https://www.mongodb.com/docs/database-tools/objects.inv",
12+
"https://www.mongodb.com/docs/mongodb-shell/objects.inv"
1313
]
1414

1515
# toc_landing_pages are pages that have pages nested beneath them

‎source/.static/osd.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Description>Google Custom Search of MongoDB documentation (docs.mongodb.com)</Description>
66
<Tags>mongodb mongo mongodocs</Tags>
77
<Query role="example" searchTerms="mongodb"/>
8-
<Image height="32" width="32" type="image/vnd.microsoft.icon">https://docs.mongodb.com/favicon.ico</Image>
8+
<Image height="32" width="32" type="image/vnd.microsoft.icon">https://www.mongodb.com/docs/favicon.ico</Image>
99
<Developer>MongoDB, Inc.</Developer>
1010
<Contact>[email protected]</Contact>
11-
<Url type="text/html" rel="results" template="https://docs.mongodb.com/manual/?query={searchTerms}" />
12-
<Url type="application/opensearchdescription+xml" rel="self" template="https://docs.mongodb.com/osd.xml"/>
11+
<Url type="text/html" rel="results" template="https://www.mongodb.com/docs/search/?query={searchTerms}" />
12+
<Url type="application/opensearchdescription+xml" rel="self" template="https://www.mongodb.com/docs/osd.xml"/>
1313
</OpenSearchDescription>

‎source/about.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ About MongoDB Documentation
1212
:depth: 1
1313
:class: singlecol
1414

15-
`The MongoDB Manual <https://docs.mongodb.com/manual/#>`_ contains
15+
The :manual:`MongoDB Manual </#>` contains
1616
comprehensive documentation on MongoDB. This page describes the
1717
manual's licensing, editions, and versions, and describes how to make a
1818
change request and how to contribute to the manual.
@@ -29,7 +29,7 @@ Attribution-NonCommercial-ShareAlike 3.0 United States License
2929
Man Pages
3030
---------
3131

32-
In addition to the `MongoDB Manual <https://docs.mongodb.com/manual/#>`_, you can
32+
In addition to the :manual:`MongoDB Manual </#>`, you can
3333
access the :manual:`MongoDB Man Pages </manpages.tar.gz>`,
3434
which are also distributed with the official MongoDB Packages.
3535

@@ -39,14 +39,14 @@ Version and Revisions
3939
This version of the manual reflects version {+latest-lts-version+}
4040
of MongoDB.
4141

42-
See the `MongoDB Documentation Project Page <https://docs.mongodb.com>`_
42+
See the `MongoDB Documentation Project Page <https://www.mongodb.com/docs>`_
4343
for an overview of all editions and output formats of the MongoDB
4444
Manual. You can see the full revision history and track ongoing
4545
improvements and additions for all versions of the manual from its `GitHub
4646
repository <https://github.com/mongodb/docs>`_.
4747

4848
The most up-to-date, current, and stable version of the manual is
49-
always available at "https://docs.mongodb.com/manual/".
49+
always available at "https://www.mongodb.com/docs/manual/".
5050

5151
Report an Issue or Make a Change Request
5252
----------------------------------------
@@ -92,7 +92,7 @@ necessary Sphinx extensions and build tools, are available in the same
9292
repository as the documentation.
9393

9494
For more information on the MongoDB documentation process, see the
95-
`Meta Documentation <https://docs.mongodb.com/meta/>`__.
95+
`Meta Documentation <https://www.mongodb.com/docs/meta/>`__.
9696

9797
If you have any questions, please feel free to open a :issue:`Jira Case
9898
<DOCS>`.

‎source/administration/production-notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ current stable release, even if you are installing via a package
127127
manager.
128128

129129
For other MongoDB products, refer either to the :dl:`MongoDB Download Center <>`
130-
page or their `respective documentation <https://docs.mongodb.com/?tck=docs_server>`_.
130+
page or their `respective documentation <https://www.mongodb.com/docs/?tck=docs_server>`_.
131131

132132
MongoDB ``dbPath``
133133
------------------

‎source/changeStreams.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ upper-right to set the language of the examples on this page.
241241
:tabid: php
242242

243243
The examples below assume that you have `connected to a MongoDB replica set and have accessed a database
244-
<https://docs.mongodb.com/php-library/current/reference/method/MongoDBClient__construct/>`__
244+
<https://www.mongodb.com/docs/php-library/current/reference/method/MongoDBClient__construct/>`__
245245
that contains an ``inventory`` collection.
246246

247247
.. literalinclude:: /driver-examples/DocumentationExamplesTest.php
@@ -254,7 +254,7 @@ upper-right to set the language of the examples on this page.
254254
:tabid: ruby
255255

256256
The examples below assume that you have `connected to a MongoDB replica set and have accessed a database
257-
<https://docs.mongodb.com/ruby-driver/master/tutorials/ruby-driver-create-client/>`__
257+
<https://www.mongodb.com/docs/ruby-driver/master/tutorials/ruby-driver-create-client/>`__
258258
that contains an ``inventory`` collection.
259259

260260

0 commit comments

Comments
 (0)