Skip to content

Commit 7459a54

Browse files
mongodb-php-botmongodb-php-bot
authored
Merge 4.8 into 5.0 (mongodb#3217)
2 parents c9b74e8 + 3c70241 commit 7459a54

File tree

6 files changed

+54
-55
lines changed

6 files changed

+54
-55
lines changed

‎docs/eloquent-models.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ Eloquent Models
1111
.. meta::
1212
:keywords: php framework, odm
1313

14+
.. toctree::
15+
16+
Eloquent Model Class </eloquent-models/model-class/>
17+
Relationships </eloquent-models/relationships>
18+
Schema Builder </eloquent-models/schema-builder>
19+
1420
Eloquent models are part of the Laravel Eloquent object-relational
1521
mapping (ORM) framework, which lets you to work with data in a relational
1622
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:
2632
between models
2733
- :ref:`laravel-schema-builder` shows how to manage indexes on your MongoDB
2834
collections by using Laravel migrations
29-
30-
.. toctree::
31-
32-
/eloquent-models/model-class/
33-
Relationships </eloquent-models/relationships>
34-
Schema Builder </eloquent-models/schema-builder>

‎docs/fundamentals.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Fundamentals
1515
:titlesonly:
1616
:maxdepth: 1
1717

18-
/fundamentals/connection
19-
/fundamentals/database-collection
20-
/fundamentals/read-operations
21-
/fundamentals/write-operations
22-
/fundamentals/aggregation-builder
18+
Connections </fundamentals/connection>
19+
Databases & Collections </fundamentals/database-collection>
20+
Read Operations </fundamentals/read-operations>
21+
Write Operations </fundamentals/write-operations>
22+
Aggregation Builder </fundamentals/aggregation-builder>
2323

2424
Learn more about the following concepts related to {+odm-long+}:
2525

‎docs/fundamentals/connection.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Connections
1313

1414
.. toctree::
1515

16-
/fundamentals/connection/connect-to-mongodb
17-
/fundamentals/connection/connection-options
18-
/fundamentals/connection/tls
16+
Connection Guide </fundamentals/connection/connect-to-mongodb>
17+
Connection Options </fundamentals/connection/connection-options>
18+
Configure TLS </fundamentals/connection/tls>
1919

2020
.. contents:: On this page
2121
:local:

‎docs/index.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
:titlesonly:
1414
:maxdepth: 1
1515

16-
/quick-start
16+
Quick Start </quick-start>
17+
Usage Examples </usage-examples>
1718
Release Notes <https://github.com/mongodb/laravel-mongodb/releases/>
18-
/upgrade
19-
/usage-examples
20-
/fundamentals
21-
/eloquent-models
22-
/query-builder
23-
/user-authentication
24-
/cache
25-
/queues
26-
/transactions
27-
/filesystems
28-
/issues-and-help
29-
/feature-compatibility
30-
/compatibility
19+
Fundamentals </fundamentals>
20+
Eloquent Models </eloquent-models>
21+
Query Builder </query-builder>
22+
User Authentication </user-authentication>
23+
Cache & Locks </cache>
24+
Queues </queues>
25+
Transactions </transactions>
26+
GridFS Filesystems </filesystems>
27+
Issues & Help </issues-and-help>
28+
Feature Compatibility </feature-compatibility>
29+
Compatibility </compatibility>
30+
Upgrade </upgrade>
3131

3232
Introduction
3333
------------

‎docs/quick-start.txt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ Quick Start
1717
:depth: 1
1818
:class: singlecol
1919

20+
.. toctree::
21+
22+
Download & Install </quick-start/download-and-install/>
23+
Create a Deployment </quick-start/create-a-deployment/>
24+
Create a Connection String </quick-start/create-a-connection-string/>
25+
Configure Your Connection </quick-start/configure-mongodb/>
26+
View Data </quick-start/view-data/>
27+
Write Data </quick-start/write-data/>
28+
Next Steps </quick-start/next-steps/>
29+
2030
Overview
2131
--------
2232

@@ -55,14 +65,3 @@ that connects to a MongoDB deployment.
5565
You can download the complete web application project by cloning the
5666
`laravel-quickstart <https://github.com/mongodb-university/laravel-quickstart/>`__
5767
GitHub repository.
58-
59-
.. toctree::
60-
61-
/quick-start/download-and-install/
62-
/quick-start/create-a-deployment/
63-
/quick-start/create-a-connection-string/
64-
/quick-start/configure-mongodb/
65-
/quick-start/view-data/
66-
/quick-start/write-data/
67-
/quick-start/next-steps/
68-

‎docs/usage-examples.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ Usage Examples
1717
:depth: 2
1818
:class: singlecol
1919

20+
.. toctree::
21+
:titlesonly:
22+
:maxdepth: 1
23+
24+
Find a Document </usage-examples/findOne>
25+
Find Multiple Documents </usage-examples/find>
26+
Insert a Document </usage-examples/insertOne>
27+
Insert Multiple Documents </usage-examples/insertMany>
28+
Update a Document </usage-examples/updateOne>
29+
Update Multiple Documents </usage-examples/updateMany>
30+
Delete a Document </usage-examples/deleteOne>
31+
Delete Multiple Documents </usage-examples/deleteMany>
32+
Count Documents </usage-examples/count>
33+
Distinct Field Values </usage-examples/distinct>
34+
Run a Command </usage-examples/runCommand>
35+
2036
Overview
2137
--------
2238

@@ -89,19 +105,3 @@ See code examples of the following operations in this section:
89105
- :ref:`laravel-count-usage`
90106
- :ref:`laravel-distinct-usage`
91107
- :ref:`laravel-run-command-usage`
92-
93-
.. toctree::
94-
:titlesonly:
95-
:maxdepth: 1
96-
97-
/usage-examples/findOne
98-
/usage-examples/find
99-
/usage-examples/insertOne
100-
/usage-examples/insertMany
101-
/usage-examples/updateOne
102-
/usage-examples/updateMany
103-
/usage-examples/deleteOne
104-
/usage-examples/deleteMany
105-
/usage-examples/count
106-
/usage-examples/distinct
107-
/usage-examples/runCommand

0 commit comments

Comments
 (0)