Skip to content

Commit 307f61a

Browse files
authored
Merge branch 'master' into DOCSP-41148
2 parents 8d2fb54 + fe5d9f8 commit 307f61a

17 files changed

+209
-212
lines changed

.github/workflows/backport.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Backport
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
8+
jobs:
9+
backport:
10+
name: Backport
11+
runs-on: ubuntu-latest
12+
# Only react to merged PRs for security reasons.
13+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
14+
if: >
15+
github.event.pull_request.merged
16+
&& (
17+
github.event.action == 'closed'
18+
|| (
19+
github.event.action == 'labeled'
20+
&& contains(github.event.label.name, 'backport')
21+
)
22+
)
23+
steps:
24+
- uses: tibdex/backport@v2
25+
with:
26+
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/copy-compat-to-docs-shared.yml

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

.github/workflows/vale-tdbx.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,26 @@ jobs:
1212
- name: checkout
1313
uses: actions/checkout@master
1414

15+
- name: Install docutils
16+
run: sudo apt-get install -y docutils
17+
1518
- id: files
1619
uses: masesgroup/retrieve-changed-files@v2
1720
with:
18-
format: 'csv'
21+
format: "csv"
1922

2023
- name: checkout-latest-rules
2124
uses: actions/checkout@master
2225
with:
2326
repository: mongodb/mongodb-vale-action
24-
path: './tdbx-vale-rules'
27+
path: "./tdbx-vale-rules"
2528
token: ${{secrets.GITHUB_TOKEN}}
2629

2730
- name: move-files-for-vale-action
2831
run: |
29-
cp tdbx-vale-rules/.vale.ini .vale.ini
30-
mkdir -p .github/styles/
31-
cp -rf tdbx-vale-rules/.github/styles/ .github/
32+
cp tdbx-vale-rules/.vale.ini .vale.ini
33+
mkdir -p .github/styles/
34+
cp -rf tdbx-vale-rules/.github/styles/ .github/
3235
3336
- name: run-vale
3437
uses: errata-ai/vale-action@reviewdog

source/connect.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ Connect to MongoDB
2222
:titlesonly:
2323
:maxdepth: 1
2424

25-
/connect/mongoclient
26-
/connect/connection-targets
27-
/connect/connection-options
28-
/connect/tls
29-
/connect/stable-api
25+
Create a MongoClient </connect/mongoclient>
26+
Choose a Connection Target </connect/connection-targets>
27+
Connection Options </connect/connection-options>
28+
Enable TLS </connect/tls>
29+
Stable API </connect/stable-api>
3030

3131
.. /connect/network-compression
3232
.. /connect/server-selection

source/data-formats.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Specialized Data Formats
2121
:titlesonly:
2222
:maxdepth: 1
2323

24-
/data-formats/serialization
25-
/data-formats/codecs
26-
/data-formats/bson
27-
/data-formats/time-series
24+
Kotlin Serialization </data-formats/serialization>
25+
Codecs </data-formats/codecs>
26+
BSON </data-formats/bson>
27+
Time Series </data-formats/time-series>
2828

2929
.. TODO: /data-formats/data-class
3030
.. TODO: /data-formats/extended-json

source/data-formats/codecs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ corresponding ``Codec`` to handle encoding and decoding:
339339
kelvins as an ``Int`` value. For this field, use the ``IntegerCodec``
340340
provided in the BSON library.
341341

342-
The following code shows how to can implement a ``Codec`` for the
342+
The following code shows how to implement a ``Codec`` for the
343343
``Monolight`` class. The constructor expects an instance of
344344
``CodecRegistry`` from which it retrieves the ``Codec`` instances needed
345345
to encode and decode the class fields:

source/get-started.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Get Started with the Kotlin Sync Driver
2020

2121
.. toctree::
2222

23-
/get-started/download-and-install/
24-
/get-started/create-a-deployment/
25-
/get-started/create-a-connection-string/
26-
/get-started/connect-to-mongodb/
27-
/get-started/next-steps/
23+
Download & Install </get-started/download-and-install/>
24+
Create a Deployment </get-started/create-a-deployment/>
25+
Create a Connection String </get-started/create-a-connection-string/>
26+
Connect </get-started/connect-to-mongodb/>
27+
Next Steps </get-started/next-steps/>
2828

2929
Overview
3030
--------

source/includes/mongodb-compatibility-table-kotlin-sync.rst

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

source/index.txt

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
.. toctree::
1515

1616
Get Started </get-started>
17-
/connect
18-
/write-operations
19-
/read
20-
/indexes
21-
/aggregation
22-
Use Aggregation Expression Operations </agg-exp-ops>
23-
/security
24-
/data-formats
25-
/builders
26-
/encrypt-fields
27-
/compatibility
28-
Validate Driver Artifact Signatures </validate-signatures>
29-
/whats-new
17+
Connect </connect>
18+
Write Data </write-operations>
19+
Read Data </read>
20+
Indexes </indexes>
21+
Data Aggregation </aggregation>
22+
Aggregation Operations </agg-exp-ops>
23+
Specialized Data Formats </data-formats>
24+
Builders </builders>
25+
In-Use Encryption </encrypt-fields>
26+
Compatibility </compatibility>
27+
Validate Driver Signatures </validate-signatures>
28+
What's New </whats-new>
29+
Issues & Help </issues-and-help>
3030
View the Source <https://github.com/mongodb/mongo-java-driver/tree/master/driver-kotlin-sync>
3131
API Documentation <{+api+}/com.mongodb.kotlin.client/index.html>
3232

@@ -60,12 +60,6 @@ Connect to MongoDB
6060
Learn how to create and configure a connection to a MongoDB deployment
6161
in the :ref:`kotlin-sync-connect` section.
6262

63-
What's New
64-
----------
65-
66-
For a list of new features and changes in each version, see the :ref:`What's New <kotlin-sync-whats-new>`
67-
section.
68-
6963
Write Data to MongoDB
7064
---------------------
7165

@@ -108,38 +102,32 @@ In-Use Encryption
108102
Learn how to use in-use encryption to encrypt your MongoDB data in the
109103
:ref:`In-Use Encryption <kotlin-sync-fle>` section.
110104

111-
.. TODO: Uncomment when pages are created
112-
.. FAQ
113-
.. ---
114-
115-
.. For answers to commonly asked questions about the {+driver-short+}, see the
116-
.. :ref:`FAQ <kotlin-sync-faq>` section.
117-
118-
.. Connection Troubleshooting
119-
.. --------------------------
120-
121-
.. For solutions to some issues you might experience when connecting to a MongoDB
122-
.. deployment while using the {+driver-short+}, see the
123-
.. :ref:`Connection Troubleshooting <kotlin-sync-connection-troubleshooting>` section.
124-
125-
.. Issues & Help
126-
.. -------------
127-
128-
.. Learn how to report bugs, contribute to the driver, and find more resources for
129-
.. asking questions and receiving help in the :ref:`Issues & Help <kotlin-sync-issues-and-help>` section.
130-
131105
Compatibility
132106
-------------
133107

134108
For the compatibility charts that show the recommended {+driver-short+} version for each
135-
MongoDB Server version, see the :ref:`Compatibility <kotlin-sync-compatibility>` section.
109+
MongoDB Server version, see the :ref:`Compatibility
110+
<kotlin-sync-compatibility>` section.
136111

137112
Validate Driver Artifact Signatures
138113
-----------------------------------
139114

140115
Learn about how to validate signatures of {+driver-short+} artifacts
141116
published on Maven in the :ref:`Validate Driver Artifact Signatures <kotlin-sync-validate-signatures>` section.
142117

118+
What's New
119+
----------
120+
121+
For a list of new features and changes in each version, see the
122+
:ref:`What's New <kotlin-sync-whats-new>` section.
123+
124+
Issues & Help
125+
-------------
126+
127+
Learn how to report bugs, contribute to the driver, and find more resources for
128+
asking questions and receiving help in the :ref:`Issues & Help
129+
<kotlin-sync-issues-and-help>` section.
130+
143131
Learn
144132
------
145133

@@ -155,4 +143,19 @@ To learn how to use MongoDB features with the {+driver-short+}, see the
155143
`How-Tos and Articles page <https://www.mongodb.com/developer/languages/kotlin/>`__.
156144

157145
To ask questions and engage in discussions with fellow developers who
158-
use the {+driver-short+}, see the `forums page <https://www.mongodb.com/community/forums/tag/kotlin>`__.
146+
use the {+driver-short+}, see the `forums page.
147+
<https://www.mongodb.com/community/forums/tag/kotlin>`__
148+
149+
.. TODO: Uncomment when pages are created
150+
.. FAQ
151+
.. ---
152+
153+
.. For answers to commonly asked questions about the {+driver-short+}, see the
154+
.. :ref:`FAQ <kotlin-sync-faq>` section.
155+
156+
.. Connection Troubleshooting
157+
.. --------------------------
158+
159+
.. For solutions to some issues you might experience when connecting to a MongoDB
160+
.. deployment while using the {+driver-short+}, see the
161+
.. :ref:`Connection Troubleshooting <kotlin-sync-connection-troubleshooting>` section.

source/indexes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Optimize Queries by Using Indexes
2222
:titlesonly:
2323
:maxdepth: 1
2424

25-
/work-with-indexes
25+
Work with Indexes </work-with-indexes>
2626

2727
Overview
2828
--------

0 commit comments

Comments
 (0)