NR PR fixes 1

Author: rustagir

docs/fundamentals/write-operations.txt

@@ -32,8 +32,8 @@ methods that you can use to write data to MongoDB by using
 
 .. tip::
 
-   To learn more about any of the methods shown on this page, see the
-   links provided in each section.
+   To learn more about any of the methods included in this guide,
+   see the links provided in each section.
 
 Insert One
 ----------
@@ -160,7 +160,7 @@ collection:
 To view a runnable example that deletes one document, see the
 :ref:`laravel-delete-one-usage` usage example.
 
-To learn more about inserting documents, see the
+To learn more about deleting documents, see the
 :ref:`laravel-fundamentals-write-delete` guide.
 
 Delete Multiple
@@ -177,5 +177,5 @@ collection:
 To view a runnable example that deletes multiple documents, see the
 :ref:`laravel-delete-many-usage` usage example.
 
-To learn more about inserting documents, see the
+To learn more about deleting documents, see the
 :ref:`laravel-fundamentals-write-delete` guide.

docs/fundamentals/write-operations/delete.txt

@@ -42,8 +42,8 @@ You can delete one document in the following ways:
 - Call the ``$model->delete()`` method on an instance of the model.
 - Chain methods to retrieve and delete an instance of a model by calling the
   ``delete()`` method.
-- Call the ``Model::destroy($id)`` method on the model, passing it the id of
-  the document to be deleted.
+- Call the ``Model::destroy($id)`` method on the model, passing it the
+  ``_id`` value of the document to be deleted.
 
 delete() Method
 ~~~~~~~~~~~~~~~
@@ -56,7 +56,6 @@ on an instance of the model:
    :dedent:
    :start-after: begin delete one model
    :end-before: end delete one model
-   :caption: Delete the document by calling the delete() method on an instance.
 
 When the ``delete()`` method succeeds, the operation returns the number of
 documents deleted.
@@ -72,34 +71,32 @@ matching document and delete it:
    :dedent:
    :start-after: begin model delete one fluent
    :end-before: end model delete one fluent
-   :caption: Delete the matching document by chaining the delete() method.
 
 .. include:: /includes/fact-orderby-id.rst
 
 When the ``delete()`` method succeeds, it returns the number of documents
 deleted.
 
 If the ``where()`` method does not match any documents, the ``delete()`` method
-returns returns ``0``.
+returns ``0``.
 
 destroy() Method
 ~~~~~~~~~~~~~~~~
 
 The following example shows how to delete a document by passing the value of
-its id to the ``Model::destroy($id)`` method:
+its ``_id`` value to the ``Model::destroy($id)`` method:
 
 .. literalinclude:: /includes/fundamentals/write-operations/WriteOperationsTest.php
    :language: php
    :dedent:
    :start-after: begin model delete by id
    :end-before: end model delete by id
-   :caption: Delete the document by its id value.
 
 When the ``destroy()`` method succeeds, it returns the number of documents
 deleted.
 
-If the id value does not match any documents, the ``destroy()`` method
-returns returns ``0``.
+If the ``_id`` value does not match any documents, the ``destroy()`` method
+returns ``0``.
 
 .. _laravel-fundamentals-delete-many:
 
@@ -118,14 +115,13 @@ destroy() Method
 ~~~~~~~~~~~~~~~~
 
 The following example shows how to delete a document by passing an array of
-id values, represented by ``$ids``, to the ``destroy()`` method:
+``_id`` values, represented by ``$ids``, to the ``destroy()`` method:
 
 .. literalinclude:: /includes/fundamentals/write-operations/WriteOperationsTest.php
    :language: php
    :dedent:
    :start-after: begin model delete multiple by id
    :end-before: end model delete multiple by id
-   :caption: Delete documents by their ids.
 
 .. tip::
 
@@ -135,8 +131,8 @@ id values, represented by ``$ids``, to the ``destroy()`` method:
 When the ``destroy()`` method succeeds, it returns the number of documents
 deleted.
 
-If the id values do not match any documents, the ``destroy()`` method
-returns returns ``0``.
+If the ``_id`` values do not match any documents, the ``destroy()`` method
+returns ``0``.
 
 delete() Method
 ~~~~~~~~~~~~~~~
@@ -149,7 +145,6 @@ and delete them:
    :dedent:
    :start-after: begin model delete multiple fluent
    :end-before: end model delete multiple fluent
-   :caption: Chain calls to retrieve matching documents and delete them.
 
 When the ``delete()`` method succeeds, it returns the number of documents
 deleted.

docs/fundamentals/write-operations/insert.txt

@@ -68,7 +68,6 @@ This example code performs the following actions:
    :dedent:
    :start-after: begin model insert one
    :end-before: end model insert one
-   :caption: Insert a document by calling the save() method on an instance.
 
 You can retrieve the inserted document's ``_id`` value by accessing the model's
 ``id`` member, as shown in the following code example:
@@ -106,21 +105,22 @@ to save the documents.
 When the ``insert()`` method succeeds, it returns the value ``1``. If it
 fails, it throws an exception.
 
-The example code saves multiple models in a single call by passing them as
-an array to the ``insert()`` method:
-
-.. note::
-
-   This example wraps the dates in the `MongoDB\\BSON\\UTCDateTime <{+phplib-api+}/class.mongodb-bson-utcdatetime.php>`__
-   class to convert it to a type MongoDB can serialize because Laravel
-   skips attribute casting on bulk insert operations.
+The following example saves multiple models in a single call by passing
+them as an array to the ``insert()`` method:
 
 .. literalinclude:: /includes/fundamentals/write-operations/WriteOperationsTest.php
    :language: php
    :dedent:
    :start-after: begin model insert many
    :end-before: end model insert many
 
+.. note::
+
+   This example wraps the dates in the `MongoDB\\BSON\\UTCDateTime
+   <{+phplib-api+}/class.mongodb-bson-utcdatetime.php>`__
+   class to convert it to a type MongoDB can serialize because Laravel
+   skips attribute casting on bulk insert operations.
+
 Additional Information
 ----------------------
 

docs/fundamentals/write-operations/modify.txt

@@ -59,7 +59,6 @@ of the model and calling its ``save()`` method:
    :dedent:
    :start-after: begin model update one save
    :end-before: end model update one save
-   :caption: Update a document by calling the save() method on an instance.
 
 When the ``save()`` method succeeds, the model instance on which you called the
 method contains the updated values.
@@ -74,7 +73,6 @@ retrieve and update the first matching document:
    :dedent:
    :start-after: begin model update one fluent
    :end-before: end model update one fluent
-   :caption: Update the matching document by chaining the update() method.
 
 .. include:: /includes/fact-orderby-id.rst
 
@@ -141,17 +139,16 @@ the following methods:
 Upsert Method
 ~~~~~~~~~~~~~
 
-The ``upsert(array $values, array|string $uniqueBy, array|null
-$update)`` method accepts the following parameters:
+The ``upsert()`` method accepts the following parameters:
 
 - ``$values``: Array of fields and values that specify documents to update or insert.
-- ``$uniqueBy``: List of fields that uniquely identify documents in your
+- ``$uniqueBy``: One or more fields that uniquely identify documents in your
   first array parameter.
-- ``$update``: Optional list of fields to update if a matching document
+- ``$update``: Optional array of fields to update if a matching document
   exists. If you omit this parameter, the {+odm-short+} updates all fields.
 
-To specify an upsert in the ``upsert()`` method, set parameters
-as shown in the following code example:
+To specify an upsert in the ``upsert()`` method, pass the required
+parameters as shown in the following code example:
 
 .. code-block:: php
    :copyable: false
@@ -293,7 +290,7 @@ optional parameter ``unique`` to ``true`` to skip adding any duplicate values
 in the array. The following code example shows the structure of a ``push()``
 method call:
 
-.. code-block:: none
+.. code-block:: php
    :copyable: false
 
    YourModel::where(<match criteria>)
@@ -340,7 +337,7 @@ an array in a MongoDB document. You can pass one or more values to remove
 from the array. The following code example shows the structure of a
 ``pull()`` method call:
 
-.. code-block:: none
+.. code-block:: php
    :copyable: false
 
    YourModel::where(<match criteria>)
@@ -387,7 +384,7 @@ structure of a positional operator update call on a single matching document:
    Currently, the {+odm-short+} offers this operation only on the ``DB`` facade
    and not on the Eloquent ORM.
 
-.. code-block:: none
+.. code-block:: php
    :copyable: false
 
    DB::connection('mongodb')
@@ -396,7 +393,6 @@ structure of a positional operator update call on a single matching document:
           <match criteria>,
           ['$set' => ['<array field>.$' => <replacement value>]]);
 
-
 The following example shows how to replace the array value ``"dance-pop"``
 with ``"contemporary"`` in the ``genres`` array field. Click the
 :guilabel:`{+code-output-label+}` button to see the updated document: