Skip to content

Commit 6c860ea

Browse files
committed
DOCSP-15546 fix v5.0-specific build errors
1 parent 3761aa0 commit 6c860ea

File tree

10 files changed

+81
-100
lines changed

10 files changed

+81
-100
lines changed

snooty.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ toc_landing_pages = [
151151
"/release-notes/4.2",
152152
"/release-notes/4.4-downgrade",
153153
"/release-notes/4.4",
154+
"/release-notes/5.0",
154155
"/replication",
155156
"/security",
156157
"/sharding",
@@ -187,12 +188,13 @@ version = "{+version+}"
187188

188189

189190
[constants]
190-
package-branch = "5.0"
191+
package-branch = "5.0" # testing for dev rc releases
191192
windows-dir-version = "5.0" # wizard
192193
package-name-org = "mongodb-org"
193194
package-name-enterprise = "mongodb-enterprise"
194195
version = "5.0"
195196
release = "5.0"
197+
version-dev = "4.9"
196198
pgp-version = "{+version+}"
197199
rsa-key = "4B7C549A058F8B6B"
198200
pgp-fingerprint = "E162F504A20CDF15827F718D4B7C549A058F8B6B"

source/includes/changelogs/releases/4.4.5.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Sharding
99
- :issue:`SERVER-53462` Improve range-deleter logging
1010
- :issue:`SERVER-53827` range_deleter_server_status.js should use assert.soon to check the number of range deletion tasks
1111
- :issue:`SERVER-54014` Define a reasonable maxTimeMsOverride for the checkOID requests
12-
- :issue:`SERVER-54585` Unable to run `findAndModify` against the Config server collections
13-
- :issue:`SERVER-54701` shardCollection might succesfully write to the config server but end up with missing indexes on the primary Shard
12+
- :issue:`SERVER-54585` Unable to run ``findAndModify`` against the Config server collections
13+
- :issue:`SERVER-54701` shardCollection might successfully write to the config server but end up with missing indexes on the primary Shard
1414

1515
Replication
1616
~~~~~~~~~~~

source/includes/fact-timezone-description-no-option.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ If no ``timezone`` is provided, the result is displayed in ``UTC``.
99
:header-rows: 1
1010
:widths: 30 70
1111

12-
* - ``Format``
13-
- ``Examples``
12+
* - Format
13+
- Examples
1414

15-
* - `Olson Timezone Identifier`
15+
* - Olson Timezone Identifier
1616

17-
- ::
17+
- .. code-block:: bash
1818

19-
"America/New_York"
20-
"Europe/London"
21-
"GMT"
19+
"America/New_York"
20+
"Europe/London"
21+
"GMT"
2222

23-
* - `UTC Offset`
23+
* - UTC Offset
2424

25-
- ::
25+
- .. code-block:: bash
2626

27-
+/-[hh]:[mm], e.g. "+04:45"
28-
+/-[hh][mm], e.g. "-0530"
29-
+/-[hh], e.g. "+03"
27+
+/-[hh]:[mm], e.g. "+04:45"
28+
+/-[hh][mm], e.g. "-0530"
29+
+/-[hh], e.g. "+03"

source/reference/command/serverStatus.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ asserts
218218

219219
A document that reports on the number of assertions raised since the
220220
MongoDB process started. While assert errors are typically uncommon,
221-
if there are non-zero values for the :data:`asserts`, you should
222-
examine the log file for more information. In many cases, these
223-
errors are trivial, but are worth investigating.
221+
if there are non-zero values for the :serverstatus:`asserts`, you
222+
should examine the log file for more information. In many cases,
223+
these errors are trivial, but are worth investigating.
224224

225225
.. serverstatus:: asserts.regular
226226

source/reference/method/db.collection.ensureIndex.txt

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,10 @@ db.collection.ensureIndex()
66

77
.. method:: db.collection.ensureIndex(keys, options)
88

9-
.. admonition:: Removed in 5.0
10-
:class: note
9+
.. note:: Removed in 5.0
1110

12-
<<<<<<< HEAD
1311
:method:`db.collection.ensureIndex()` has been replaced by
1412
:method:`db.collection.createIndex()`.
15-
=======
16-
.. include:: /includes/fact-mongo-shell-method.rst
17-
18-
19-
.. deprecated:: 3.0
20-
21-
:method:`db.collection.ensureIndex()` has been replaced by
22-
:method:`db.collection.createIndex()`.
23-
24-
Creates an index on the specified field if the index does not
25-
already exist.
26-
27-
Additional Information
28-
----------------------
29-
30-
- Use :method:`db.collection.createIndex()` rather than
31-
:method:`db.collection.ensureIndex()` to create new indexes.
32-
>>>>>>> 22fb3e9e4... DOCSP-14923 fix deprecated directive for NextGen
3313

3414
.. seealso::
3515

source/reference/operator/aggregation/dateDiff.txt

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ Create a collection of customer orders:
169169

170170
The following example:
171171

172-
- Returns the average number of days for a delivery.
173-
- Uses ``dateDiff`` to calculate the difference between the
174-
``purchased`` date and the ``delivered`` date.
172+
- Returns the average number of days for a delivery.
173+
- Uses ``dateDiff`` to calculate the difference between the
174+
``purchased`` date and the ``delivered`` date.
175175

176176
.. code-block:: javascript
177177
:emphasize-lines: 11-16
@@ -304,33 +304,33 @@ precision:
304304

305305
The results are summarized in this table:
306306

307-
.. list-table::
308-
:header-rows: 1
309-
:widths: 23 23 18 18 18
310-
311-
* - Start
312-
- End
313-
- Years
314-
- Months
315-
- Days
316-
317-
* - 2010-01-01
318-
- 2011-01-01
319-
- 1
320-
- 12
321-
- 365
322-
323-
* - 2010-01-01
324-
- 2011-07-01
325-
- 1
326-
- 18
327-
- 546
328-
329-
* - 2010-03-01
330-
- 2010-04-30
331-
- 0
332-
- 1
333-
- 60
307+
.. list-table::
308+
:header-rows: 1
309+
:widths: 23 23 18 18 18
310+
311+
* - Start
312+
- End
313+
- Years
314+
- Months
315+
- Days
316+
317+
* - 2010-01-01
318+
- 2011-01-01
319+
- 1
320+
- 12
321+
- 365
322+
323+
* - 2010-01-01
324+
- 2011-07-01
325+
- 1
326+
- 18
327+
- 546
328+
329+
* - 2010-03-01
330+
- 2010-04-30
331+
- 0
332+
- 1
333+
- 60
334334

335335
The count only increments when a new ``unit`` starts, so 18 months are
336336
reported as 1 year in the second row and 60 days are reported as one
@@ -411,29 +411,29 @@ weeks in each month with the following code:
411411

412412
The results are summarized in this table:
413413

414-
.. list-table::
415-
:header-rows: 1
416-
:widths: 40 20 20 20
417-
418-
* - Month
419-
- Sunday
420-
- Monday
421-
- Friday
422-
423-
* - January
424-
- 5
425-
- 4
426-
- 4
427-
428-
* - February
429-
- 4
430-
- 3
431-
- 4
432-
433-
* - March
434-
- 4
435-
- 4
436-
- 4
414+
.. list-table::
415+
:header-rows: 1
416+
:widths: 40 20 20 20
417+
418+
* - Month
419+
- Sunday
420+
- Monday
421+
- Friday
422+
423+
* - January
424+
- 5
425+
- 4
426+
- 4
427+
428+
* - February
429+
- 4
430+
- 3
431+
- 4
432+
433+
* - March
434+
- 4
435+
- 4
436+
- 4
437437

438438
From the results:
439439

source/reference/operator/aggregation/dateSubtract.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,9 @@ aggregation pipeline to decrement the ``logoutTime``.
220220
Two similar comparisons are made in the :pipeline:`$match` stage. First
221221
the :expression:`$year` and :expression:`$month` operators extract the
222222
year and month, respectively, from the ``logoutTime`` Date object. Then
223-
the month and year are checked to see if they :expression:`$match` the
224-
selection targets. Since "January" is encoded as "1", :query:`$expr`
225-
is true when the year and month are equal (:expression:`$eq`) to "2021"
226-
and "1".
223+
the month and year are checked to see if they match the selection
224+
targets. Since "January" is encoded as "1", :query:`$expr` is true when
225+
the year and month are equal (:expression:`$eq`) to "2021" and "1".
227226

228227
The :pipeline:`$project` stage uses ``$dateSubtract`` to subtract 3
229228
hours from the ``logoutTime`` of each selected dcoument.

source/reference/read-concern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ with causally consistent sessions.
588588

589589
It is not possible to specify :ref:`atClusterTime <atClusterTime>` in
590590
conjunction with ``afterClusterTime``. To use :ref:`atClusterTime
591-
<atClusterTime>` with read concern `"snapshot"` you have to disable
591+
<atClusterTime>` with read concern ``"snapshot"`` you have to disable
592592
:ref:`causally consistent sessions <sessions>`.
593593

594594
To satisfy a read request with an ``afterClusterTime`` value of ``T``,

source/reference/replica-configuration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ Replica Set Configuration Fields
210210

211211
Each replica set member must have a unique
212212
:rsconf:`_id <members[n]._id>`. Avoid re-using ``_id`` values
213-
*even if* no :rsconf:`members[n]` entry is using that ``_id`` in
213+
*even if* no ``members[n]`` entry is using that ``_id`` in
214214
the current configuration.
215215

216216
Once set, you cannot change the

source/release-notes/5.0-compatibility.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ Projection Compatibility Changes
9191
Map Reduce Changes
9292
------------------
9393

94-
Read Concern `Snapshot` on Capped Collections
95-
---------------------------------------------
94+
Read Concern ``snapshot`` on Capped Collections
95+
-----------------------------------------------
9696

9797
.. include:: /includes/extracts/transactions-capped-collection-read-change.rst
9898

0 commit comments

Comments
 (0)