Skip to content

Commit 9aa0ee1

Browse files
committed
merge conflict
2 parents cc21e5a + 2194d7e commit 9aa0ee1

File tree

152 files changed

+5840
-5716
lines changed

Some content is hidden

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

152 files changed

+5840
-5716
lines changed

config/redirects

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ raw: ${prefix}/stable -> ${base}/current/
1010
[*-master]: ${prefix}/${version}/fundamentals/versioned-api/ -> ${base}/${version}/fundamentals/stable-api/
1111
[*-master]: ${prefix}/${version}/fundamentals/connection/lambda/ -> ${base}/${version}/fundamentals/connection/
1212
[*-master]: ${prefix}/${version}/fundamentals/csfle -> ${base}/${version}/fundamentals/encrypt-fields/
13+
[*-master]: ${prefix}/${version}/faq/ -> ${base}/${version}/
1314

1415
[*-v5.0]: ${prefix}/${version}/quick-start/connect-to-mongodb/ -> ${base}/${version}/quick-start/
1516
[*-v5.0]: ${prefix}/${version}/quick-start/create-a-connection-string/ -> ${base}/${version}/quick-start/
@@ -23,4 +24,84 @@ raw: ${prefix}/stable -> ${base}/current/
2324
[*-v5.5]: ${prefix}/${version}/fundamentals/run-command/ -> ${base}/${version}/usage-examples/command/
2425
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/change-a-document/ -> ${base}/${version}/fundamentals/crud/write-operations/modify/
2526

26-
[*-v6.0): ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/
27+
[*-v6.0]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/
28+
29+
# Comprehensive Coverage Redirects
30+
31+
[v6.16-master]: ${prefix}/${version}/quick-start/download-and-install/ -> ${base}/${version}/get-started/
32+
[v6.16-master]: ${prefix}/${version}/quick-start/create-a-deployment/ -> ${base}/${version}/get-started/
33+
[v6.16-master]: ${prefix}/${version}/quick-start/create-a-connection-string/ -> ${base}/${version}/get-started/
34+
[v6.16-master]: ${prefix}/${version}/quick-start/connect-to-mongodb/ -> ${base}/${version}/get-started/
35+
[v6.16-master]: ${prefix}/${version}/quick-start/next-steps/ -> ${base}/${version}/get-started/
36+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/ -> ${base}/${version}/connect/
37+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/connect/ -> ${base}/${version}/connect/mongoclient/
38+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/connection-options/ -> ${base}/${version}/connect/connection-options/
39+
[v6.16-master]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/connect/connection-troubleshooting/
40+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/network-compression/ -> ${base}/${version}/connect/connection-options/network-compression/
41+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/csot/ -> ${base}/${version}/connect/connection-options/csot/
42+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/bulk/ -> ${base}/${version}/crud/bulk-write/
43+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/insert/ -> ${base}/${version}/crud/insert/
44+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/upsert/ -> ${base}/${version}/crud/update/
45+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/delete/ -> ${base}/${version}/crud/delete/
46+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/ -> ${base}/${version}/crud/query/
47+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/query-document/ -> ${base}/${version}/crud/query/query-document/
48+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/compound-operations/ -> ${base}/${version}/crud/compound-operations/
49+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-write-pref/ -> ${base}/${version}/crud/configure/
50+
[v6.16-master]: ${prefix}/${version}/fundamentals/transactions/ -> ${base}/${version}/crud/transactions/
51+
[v6.16-master]: ${prefix}/${version}/fundamentals/gridfs/ -> ${base}/${version}/crud/gridfs/
52+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/retrieve/ -> ${base}/${version}/crud/query/retrieve/
53+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/project/ -> ${base}/${version}/crud/query/project/
54+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/distinct/ -> ${base}/${version}/crud/query/distinct/
55+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/cursor/ -> ${base}/${version}/crud/query/cursor/
56+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/geo/ -> ${base}/${version}/crud/query/geo/
57+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/time-series/ -> ${base}/${version}/data-formats/time-series/
58+
[v6.16-master]: ${prefix}/${version}/fundamentals/bson/ -> ${base}/${version}/data-formats/bson/
59+
[v6.16-master]: ${prefix}/${version}/fundamentals/indexes/ -> ${base}/${version}/indexes/
60+
[v6.16-master]: ${prefix}/${version}/fundamentals/run-command/ -> ${base}/${version}/run-command/
61+
[v6.16-master]: ${prefix}/${version}/fundamentals/monitoring/ -> ${base}/${version}/monitoring-and-logging/monitoring/
62+
[v6.16-master]: ${prefix}/${version}/fundamentals/logging/ -> ${base}/${version}/monitoring-and-logging/logging/
63+
[v6.16-master]: ${prefix}/${version}/usage-examples/changeStream -> ${base}/monitoring-and-logging/change-streams/
64+
[v6.16-master]: ${prefix}/${version}/fundamentals/aggregation/ -> ${base}/${version}/aggregation/
65+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/ -> ${base}/aggregation/
66+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/filtered-subset/ -> ${base}/aggregation/filtered-subset/
67+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/group-total/ -> ${base}/aggregation/group-total/
68+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/multi-field-join/ -> ${base}/aggregation/multi-field-join/
69+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/one-to-one-join/ -> ${base}/aggregation/one-to-one-join/
70+
[v6.16-master]: ${prefix}/${version}/aggregation-tutorials/unpack-arrays/ -> ${base}/aggregation/unpack-arrays/
71+
[v6.16-master]: ${prefix}/${version}/fundamentals/authentication -> ${base}/security/authentication/
72+
[v6.16-master]: ${prefix}/${version}/fundamentals/authentication/mechanisms/ -> ${base}/security/authentication/mechanisms/
73+
[v6.16-master]: ${prefix}/${version}/fundamentals/authentication/enterprise-mechanisms/ -> ${base}/security/authentication/enterprise-mechanisms/
74+
[v6.16-master]: ${prefix}/${version}/fundamentals/encrypt-fields/ -> ${base}/security/encrypt-fields/
75+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/tls/ -> ${base}/security/tls/
76+
[v6.16-master]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/security/socks/
77+
[v6.16-master]: ${prefix}/${version}/fundamentals/typescript/ -> ${base}/typescript/
78+
[v6.16-master]: ${prefix}/${version}/whats-new/ -> ${base}/reference/release-notes/
79+
[v6.16-master]: ${prefix}/${version}/compatibility/ -> ${base}/reference/compatibility/
80+
[v6.16-master]: ${prefix}/${version}/upgrade/ -> ${base}/reference/upgrade/
81+
[v6.16-master]: ${prefix}/${version}/quick-reference/ -> ${base}/reference/quick-reference/
82+
[v6.16-master]: ${prefix}/${version}/fundamentals/collations/ -> ${base}/crud/configure/
83+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/read-operations/text/ -> ${base}/crud/query/text/
84+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/ -> ${base}/crud/update/modify/
85+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/embedded-arrays/ -> ${base}/crud/update/embedded-arrays/
86+
[v6.16-master]: ${prefix}/${version}/fundamentals/crud/write-operations/pkFactory/ -> ${base}/crud/pkFactory/
87+
[v6.16-master]: ${prefix}/${version}/security/authentication/enterprise-mechanisms/ -> ${base}/security/authentication
88+
[v6.16-master]: ${prefix}/${version}/fundamentals/promises/ -> ${base}/promises/
89+
90+
# Usage Example Redirects
91+
92+
[v6.16-master]: ${prefix}/${version}/usage-examples/findOne/ -> ${base}/crud/query/retrieve/
93+
[v6.16-master]: ${prefix}/${version}/usage-examples/find/ -> ${base}/crud/query/retrieve/
94+
[v6.16-master]: ${prefix}/${version}/usage-examples/insertOne/ -> ${base}/crud/insert/
95+
[v6.16-master]: ${prefix}/${version}/usage-examples/insertMany/ -> ${base}/crud/insert/
96+
[v6.16-master]: ${prefix}/${version}/usage-examples/updateOne/ -> ${base}/crud/update/modify/
97+
[v6.16-master]: ${prefix}/${version}/usage-examples/updateMany/ -> ${base}/crud/update/modify/
98+
[v6.16-master]: ${prefix}/${version}/usage-examples/replaceOne/ -> ${base}/crud/update/replace/
99+
[v6.16-master]: ${prefix}/${version}/usage-examples/deleteOne/ -> ${base}/crud/delete/
100+
[v6.16-master]: ${prefix}/${version}/usage-examples/deleteMany/ -> ${base}/crud/delete/
101+
[v6.16-master]: ${prefix}/${version}/usage-examples/count/ -> ${base}/crud/query/count/
102+
[v6.16-master]: ${prefix}/${version}/usage-examples/distinct/ -> ${base}/crud/query/distinct/
103+
[v6.16-master]: ${prefix}/${version}/usage-examples/command/ -> ${base}/run-command/
104+
[v6.16-master]: ${prefix}/${version}/usage-examples/bulkWrite/ -> ${base}/bulk-write/
105+
[v6.16-master]: ${prefix}/${version}/usage-examples/transactions/ -> ${base}/crud/transactions/
106+
[v6.16-master]: ${prefix}/${version}/usage-examples/transaction-conv/ -> ${base}/crud/transactions/transaction-conv/
107+
[v6.16-master]: ${prefix}/${version}/usage-examples/transaction-core/ -> ${base}/crud/transactions/transaction-core/

snooty.toml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ intersphinx = [
77
]
88

99
toc_landing_pages = [
10-
"/fundamentals/authentication",
11-
"/fundamentals",
12-
"/fundamentals/connection",
13-
"/fundamentals/crud",
14-
"/fundamentals/bson",
15-
"/usage-examples",
16-
"/quick-start",
10+
"/get-started",
11+
"/connect",
12+
"/aggregation",
13+
"/aggregation/aggregation-tutorials",
14+
"/security",
15+
"/security/authentication",
1716
"/aggregation-tutorials",
17+
"/data-formats",
18+
"/connect/connection-options",
19+
"/crud",
20+
"/crud/query",
21+
"crud/update",
22+
"/crud/transactions",
23+
"/monitoring-and-logging"
1824
]
1925
sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
2026

@@ -26,3 +32,5 @@ driver-short = "Node.js driver"
2632
mdb-server = "MongoDB Server"
2733
min-node-version = "v16.20.1"
2834
stable-api = "Stable API"
35+
vector-search = "Atlas Vector Search"
36+
language = "JavaScript"

source/aggregation-tutorials.txt

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

0 commit comments

Comments
 (0)