Merge 4.8 into 5.0

docs/eloquent-models.txt

@@ -11,6 +11,12 @@ Eloquent Models
 .. meta::
    :keywords: php framework, odm
 
+.. toctree::
+
+   Eloquent Model Class </eloquent-models/model-class/>
+   Relationships </eloquent-models/relationships>
+   Schema Builder </eloquent-models/schema-builder>
+
 Eloquent models are part of the Laravel Eloquent object-relational
 mapping (ORM) framework, which lets you to work with data in a relational
 database by using model classes and Eloquent syntax. The {+odm-short+} extends
@@ -26,9 +32,3 @@ the {+odm-short+} to work with MongoDB in the following ways:
   between models
 - :ref:`laravel-schema-builder` shows how to manage indexes on your MongoDB
   collections by using Laravel migrations
-
-.. toctree::
-
-   /eloquent-models/model-class/
-   Relationships </eloquent-models/relationships>
-   Schema Builder </eloquent-models/schema-builder>

docs/fundamentals.txt

@@ -15,11 +15,11 @@ Fundamentals
    :titlesonly:
    :maxdepth: 1
 
-   /fundamentals/connection
-   /fundamentals/database-collection
-   /fundamentals/read-operations
-   /fundamentals/write-operations
-   /fundamentals/aggregation-builder
+   Connections </fundamentals/connection>
+   Databases & Collections </fundamentals/database-collection>
+   Read Operations </fundamentals/read-operations>
+   Write Operations </fundamentals/write-operations>
+   Aggregation Builder </fundamentals/aggregation-builder>
 
 Learn more about the following concepts related to {+odm-long+}:
 

docs/fundamentals/connection.txt

@@ -13,9 +13,9 @@ Connections
 
 .. toctree::
 
-   /fundamentals/connection/connect-to-mongodb
-   /fundamentals/connection/connection-options
-   /fundamentals/connection/tls
+   Connection Guide </fundamentals/connection/connect-to-mongodb>
+   Connection Options </fundamentals/connection/connection-options>
+   Configure TLS </fundamentals/connection/tls>
 
 .. contents:: On this page
    :local:

docs/index.txt

@@ -13,21 +13,21 @@
    :titlesonly:
    :maxdepth: 1
 
-   /quick-start
+   Quick Start </quick-start>
+   Usage Examples </usage-examples>
    Release Notes <https://github.com/mongodb/laravel-mongodb/releases/>
-   /upgrade
-   /usage-examples
-   /fundamentals
-   /eloquent-models
-   /query-builder
-   /user-authentication
-   /cache
-   /queues
-   /transactions
-   /filesystems
-   /issues-and-help
-   /feature-compatibility
-   /compatibility
+   Fundamentals </fundamentals>
+   Eloquent Models </eloquent-models>
+   Query Builder </query-builder>
+   User Authentication </user-authentication>
+   Cache & Locks </cache>
+   Queues </queues>
+   Transactions </transactions>
+   GridFS Filesystems </filesystems>
+   Issues & Help </issues-and-help>
+   Feature Compatibility </feature-compatibility>
+   Compatibility </compatibility>
+   Upgrade </upgrade>
 
 Introduction
 ------------

docs/quick-start.txt

@@ -17,6 +17,16 @@ Quick Start
    :depth: 1
    :class: singlecol
 
+.. toctree::
+
+   Download & Install </quick-start/download-and-install/>
+   Create a Deployment </quick-start/create-a-deployment/>
+   Create a Connection String </quick-start/create-a-connection-string/>
+   Configure Your Connection </quick-start/configure-mongodb/>
+   View Data </quick-start/view-data/>
+   Write Data </quick-start/write-data/>
+   Next Steps </quick-start/next-steps/>
+
 Overview
 --------
 
@@ -55,14 +65,3 @@ that connects to a MongoDB deployment.
    You can download the complete web application project by cloning the
    `laravel-quickstart <https://github.com/mongodb-university/laravel-quickstart/>`__
    GitHub repository.
-
-.. toctree::
-
-   /quick-start/download-and-install/
-   /quick-start/create-a-deployment/
-   /quick-start/create-a-connection-string/
-   /quick-start/configure-mongodb/
-   /quick-start/view-data/
-   /quick-start/write-data/
-   /quick-start/next-steps/
-

docs/usage-examples.txt

@@ -17,6 +17,22 @@ Usage Examples
    :depth: 2
    :class: singlecol
 
+.. toctree::
+   :titlesonly:
+   :maxdepth: 1
+
+   Find a Document </usage-examples/findOne>
+   Find Multiple Documents </usage-examples/find>
+   Insert a Document </usage-examples/insertOne>
+   Insert Multiple Documents </usage-examples/insertMany>
+   Update a Document </usage-examples/updateOne>
+   Update Multiple Documents </usage-examples/updateMany>
+   Delete a Document </usage-examples/deleteOne>
+   Delete Multiple Documents </usage-examples/deleteMany>
+   Count Documents </usage-examples/count>
+   Distinct Field Values </usage-examples/distinct>
+   Run a Command </usage-examples/runCommand>
+
 Overview
 --------
 
@@ -89,19 +105,3 @@ See code examples of the following operations in this section:
 - :ref:`laravel-count-usage`
 - :ref:`laravel-distinct-usage`
 - :ref:`laravel-run-command-usage`
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 1
-
-   /usage-examples/findOne
-   /usage-examples/find
-   /usage-examples/insertOne
-   /usage-examples/insertMany
-   /usage-examples/updateOne
-   /usage-examples/updateMany
-   /usage-examples/deleteOne
-   /usage-examples/deleteMany
-   /usage-examples/count
-   /usage-examples/distinct
-   /usage-examples/runCommand