Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/configuration/app-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,8 @@ objects are run sequentially during socket creation.
TLS context hooks are global and affect all ``Mongo::Client``
instances in an application.

To learn more about TLS context hooks, see :ruby:`Modifying SSLContext
</reference/create-client/#modifying-sslcontext>` in the {+ruby-driver+}
To learn more about TLS context hooks, see :ruby:`Modify the TLS Context
</connect/tls/#modify-the-tls-context>` in the {+ruby-driver+}
documentation.

Network Compression
Expand Down
8 changes: 4 additions & 4 deletions source/configuration/collection-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ your {+ruby-driver+} and {+mdb-server+} versions support.
options. Create your collection by running the collection management Rake task, as
shown in :ref:`mongoid-create-collection-rake` section of this guide.

To learn more about collection options available in the {+ruby-driver+}, see the
:ruby:`Collections </reference/collection-tasks/>` guide in the {+ruby-driver+}
documentation.
To learn more about collection options available in the {+ruby-driver+},
see the :ruby:`Databases and Collections </databases-collection/>` guide
in the {+ruby-driver+} documentation.

The following sections show examples of how to configure collection options when
using {+odm+}.
Expand Down Expand Up @@ -104,7 +104,7 @@ must explicitly create the corresponding collection. To do so, use the
your shell:

.. code-block:: bash

rake db:mongoid:create_collections

You can also run the ``create_collection`` command on a single model in the
Expand Down
5 changes: 1 addition & 4 deletions source/configuration/forking-server-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ When using {+odm+} with a forking web server, adhere to the following
guidelines:

- If possible, do not perform any MongoDB operations in the parent
process before forking. To learn more about how the {+ruby-driver+}
handles forking, see :ruby:`Usage with Forking Servers
</reference/create-client/#usage-with-forking-servers>` in the driver
documentation.
process before forking.

- You can avoid connection errors such as ``Mongo::Error::SocketError``
and ``Mongo::Error::NoServerAvailable`` by performing the following actions:
Expand Down
2 changes: 1 addition & 1 deletion source/includes/configuration/sample-config-options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ development:
options:
# All options in this section are Ruby driver client options.
# To learn more, visit
# https://www.mongodb.com/docs/ruby-driver/current/reference/create-client/
# https://www.mongodb.com/docs/ruby-driver/current/connect/connection-options/

# Sets the write concern. (default = { w: 1 })
write:
Expand Down
3 changes: 0 additions & 3 deletions source/interact-data/query-cache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ and reuses them in the future. This prevents {+odm+} from performing
the queries again, increasing application performance and reducing
the database load.

To learn more about this feature, see :ruby:`Query Cache
</reference/query-cache/>` in the {+ruby-driver+} documentation.

Enable Query Caching
--------------------

Expand Down
4 changes: 2 additions & 2 deletions source/quick-start-rails.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ To learn how to integrate {+odm+} into an existing application, see the
.. tip::

If you prefer to connect to MongoDB by using the {+ruby-driver+} without
{+odm+}, see the {+ruby-driver+} :ruby:`Quick Start guide
</tutorials/quick-start/>`.
{+odm+}, follow the :ruby:`Get Started with the Ruby Driver
</get-started/>` tutorial.

{+odm+} is an Object-Document Mapper (ODM) framework for MongoDB in
{+language+}. By using {+odm+}, you can easily interact with your data and
Expand Down
4 changes: 2 additions & 2 deletions source/quick-start-sinatra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ To learn how to integrate {+odm+} into an existing application, see the
.. tip::

If you prefer to connect to MongoDB by using the {+ruby-driver+} without
{+odm+}, see the {+ruby-driver+} :ruby:`Quick Start guide
</tutorials/quick-start/>`.
{+odm+}, follow the :ruby:`Get Started with the Ruby Driver
</get-started/>` tutorial.

{+odm+} is an Object-Document Mapper (ODM) framework for MongoDB in
{+language+}. By using {+odm+}, you can easily interact with your data and
Expand Down
2 changes: 1 addition & 1 deletion source/reference/compatibility.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ of {+odm+} that you can use with a specific version of MongoDB. To use
features of a particular {+mdb-server+} version, both the
{+ruby-driver+} and {+odm+} must be compatible with that MongoDB
version. To learn about the driver's MongoDB compatibility details,
see :ruby:`Compatibility </reference/driver-compatibility/>`
see :ruby:`Compatibility </reference/compatibility/>`
in the {+ruby-driver+} documentation.

The first column lists the version of {+odm+}.
Expand Down
15 changes: 1 addition & 14 deletions source/security/encryption.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ You can set up CSFLE by using one of the following mechanisms:
- Explicit encryption: Allows you to perform encrypted read and write operations
with specified encryption logic throughout your application.

This guide describes how to set up CSFLE with automatic encryption. To learn more
about using explicit encryption, see the :ruby:`Explicit Encryption
</reference/in-use-encryption/client-side-encryption/#explicit-encryption>` guide
in the {+ruby-driver+} documentation.
This guide describes how to set up CSFLE with automatic encryption.

Install Dependencies
--------------------
Expand Down Expand Up @@ -71,11 +68,6 @@ which your application is located and run the following command in your shell:
which indicates a pre-release version in {+language+}, the ``--pre`` flag is
required.

To learn how to download and install the library manually, see the
:ruby:`libmongocrypt installation guide
</reference/in-use-encryption/client-side-encryption/#libmongocrypt>`
in the {+ruby-driver+} documentation.

Shared Library (Driver v2.19 or later)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -325,10 +317,5 @@ Additional Information
To learn more about CSFLE, see the :manual:`Client-Side Field Level Encryption
</core/csfle>` guide in the MongoDB {+server-manual+}.

To learn more about using CSFLE with the {+ruby-driver+}, see the
:ruby:`Client-Side Encryption
</reference/in-use-encryption/client-side-encryption/>` guide in the
{+ruby-driver+} documentation.

To learn more about configuring {+odm+} in your application, see the
:ref:`mongoid-app-config` guide.
Loading