Skip to content

Commit 8f4c06e

Browse files
committed
(DOCSP-30689): Update Kotlin version source constant (#102)
[PR Reviewing Guidelines](https://github.com/mongodb/docs-java/blob/master/REVIEWING.md) After Java v4.10 is released, Java and Kotlin will be versioned together, so the extra source constant is unneeded. This PR updates the following: - Remove `api-kotlin` source constant - Update all links to use `api` constant that points to version 4.10 - Remove `version-next` constant - Increment `version` to `4.10` To be merged and deployed after Java v4.10 is released and API docs are updated (i.e. Java API ref links point to v4.10 URL) JIRA - https://jira.mongodb.org/browse/DOCSP-30689 Staging - https://docs-mongodbcom-staging.corp.mongodb.com/kotlin/docsworker-xlarge/docsp-30689-constant/ - [ ] Is this free of any warnings or errors in the RST? - [ ] Did you run a spell-check? - [ ] Did you run a grammar-check? - [ ] Are all the links working? (cherry picked from commit 298b164)
1 parent 54ddc48 commit 8f4c06e

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

source/fundamentals/databases-collections.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ With the MongoDB Kotlin driver, data can be modeled using Kotlin data classes or
2828
`Document <{+api+}/apidocs/bson/org/bson/Document.html>`__ class
2929
to store and retrieve data from MongoDB.
3030

31-
.. TODO:(DOCSP-29224): add back in when document data format data classes are documented
32-
.. To learn more about using data classes to store and retrieve data, refer to
33-
.. :ref:`Document Data Format: Data Classes <fundamentals-data-classes>`.
31+
To learn more about using data classes to store and retrieve data, refer to
32+
:ref:`Document Data Format: Data Classes <fundamentals-data-classes>`.
3433

3534
Access a Database
3635
-----------------
@@ -69,8 +68,6 @@ The following example accesses a collection named "testCollection" from a
6968
MongoDB implicitly creates the collection when you first insert data
7069
into that collection.
7170

72-
<<<<<<< HEAD
73-
=======
7471
.. _db-coll-specify-return-type:
7572

7673
Specify Return Type
@@ -113,7 +110,6 @@ document with a ``name`` value of ``"strawberry"``:
113110

114111
NewFruit(id=1, name=strawberry, quantity=205, seasons=[summer, fall])
115112

116-
>>>>>>> 298b164 ((DOCSP-30689): Update Kotlin version source constant (#102))
117113
Create a Collection
118114
-------------------
119115

0 commit comments

Comments
 (0)