diff --git a/source/crud.txt b/source/crud.txt index d8c9e468..7c4143dc 100644 --- a/source/crud.txt +++ b/source/crud.txt @@ -25,7 +25,7 @@ CRUD Operations Insert Documents Query Documents Update Documents - Replace Documents + Replace Documents Delete Documents Bulk Write Operations Transactions diff --git a/source/crud/query.txt b/source/crud/query.txt index 434edf97..bd358a4e 100644 --- a/source/crud/query.txt +++ b/source/crud/query.txt @@ -205,8 +205,6 @@ Retrieve Distinct Values To learn more about the ``distinct()`` method, see the :ref:`pymongo-distinct` guide. -<<<<<<< HEAD:source/crud/query.txt -======= Monitor Data Changes -------------------- @@ -228,4 +226,3 @@ Monitor Data Changes To learn more about the ``watch()`` method, see the :ref:`pymongo-change-streams` guide. ->>>>>>> 5387503 (DOCSP-48163: Add async examples for Read pages):source/read.txt diff --git a/source/integrations.txt b/source/integrations.txt index 82551c12..41eb6a35 100644 --- a/source/integrations.txt +++ b/source/integrations.txt @@ -80,31 +80,20 @@ various Python frameworks and libraries. Django ~~~~~~ -Even without a Django backend, you can use MongoDB and {+driver-short+} with most of -what Django provides. Certain features of Django that require -``django.db``, such as admin, authentication, and sessions, will not work -when using only MongoDB. - -- `Django MongoDB Engine `__ - is a MongoDB database backend for Django that - supports Django aggregations, atomic updates, embedded objects, Map/Reduce, and GridFS. - It allows you to use most of Django's built-in features, including the ORM, admin, - authentication, site and session frameworks, and caching. For more information, see the - `Django MongoDB Engine tutorial `__. - -- `Django MongoEngine `__ is a - MongoDB backend for - Django. The repository also includes an `example application `__. - For more information, see the `Django MongoEngine documentation `__. - -- `Djongo `__ is a connector for using - Django with MongoDB as the database backend. With Djongo, you can use the Django Admin - GUI to add and modify documents in MongoDB. - The `Djongo source code `__ is hosted on GitHub, - and the `Djongo package `__ is on PyPI. - -- `mango `__ provides MongoDB backends for - Django sessions and authentication (bypassing ``django.db`` entirely). +You can use the official `{+django-odm+} <{+django-docs+}>`__ +to use MongoDB as your database in Django applications. {+django-odm+} +is a Django database backend that uses PyMongo to connect to +MongoDB. By using the backend, you can use Django models to represent +MongoDB documents, with support for Django forms, validations, and +authentication. {+django-odm+} also enables you to use +MongoDB-specific querying optimizations in your applications, such as +aggregation operations and indexes. + +.. important:: Public Preview + + {+django-odm+} is in Public Preview and intended for evaluation purposes only. + Public Preview is not recommended for production deployments, as breaking changes + may be introduced. Flask ~~~~~ @@ -304,4 +293,5 @@ This section lists alternatives to {+driver-short+}. `PythonAnywhere `__ does not support. For more information, see - the relevant `Jira ticket. `__ \ No newline at end of file + the relevant `Jira ticket. + `__