Skip to content

Commit 03dadd3

Browse files
committed
minor symfony#12314 [Doctrine] Reword the intro of the main article (javiereguiluz)
This PR was squashed before being merged into the 4.3 branch (closes symfony#12314). Discussion ---------- [Doctrine] Reword the intro of the main article "Doctrine" is the next topic in my "let's-revamp-everything" list. Instead of creating a single PR with thousands of changes, I'm trying something different here. Let's create several smaller PRs for simpler review. Thanks! Commits ------- 6307d2e [Doctrine] Reword the intro of the main article
2 parents 7fe5d72 + 6307d2e commit 03dadd3

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

doctrine.rst

+12-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ Databases and the Doctrine ORM
99

1010
Do you prefer video tutorials? Check out the `Doctrine screencast series`_.
1111

12-
Symfony doesn't provide a component to work with the database, but it *does* provide
13-
tight integration with a third-party library called `Doctrine`_.
12+
Symfony provides all the tools you need to use databases in your applications
13+
thanks to `Doctrine`_, the best set of PHP libraries to work with databases.
14+
These tools support relational databases like MySQL and PostgreSQL and also
15+
NoSQL databases like MongoDB.
1416

15-
.. note::
16-
17-
This article is all about using the Doctrine ORM. If you prefer to use raw
18-
database queries, see the ":doc:`/doctrine/dbal`" article instead.
17+
Databases are a broad topic, so the documentation is divided in three articles:
1918

20-
You can also persist data to `MongoDB`_ using Doctrine ODM library. See the
21-
"`DoctrineMongoDBBundle`_" documentation.
19+
* This article explains the recommended way to work with **relational databases**
20+
in Symfony applications;
21+
* Read :doc:`this other article </doctrine/dbal>` if you need **low-level access**
22+
to perform raw SQL queries to relational databases (similar to PHP's `PDO`_);
23+
* Read `DoctrineMongoDBBundle docs`_ if you are working with **MongoDB databases**.
2224

2325
Installing Doctrine
2426
-------------------
@@ -873,12 +875,11 @@ Learn more
873875

874876
.. _`Doctrine`: http://www.doctrine-project.org/
875877
.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt
876-
.. _`MongoDB`: https://www.mongodb.org/
877878
.. _`Doctrine's Mapping Types documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
878879
.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
879880
.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
880881
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
881-
.. _`DoctrineMongoDBBundle`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
882+
.. _`DoctrineMongoDBBundle docs`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
882883
.. _`DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
883884
.. _`Transactions and Concurrency`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/transactions-and-concurrency.html
884885
.. _`DoctrineMigrationsBundle`: https://github.com/doctrine/DoctrineMigrationsBundle
@@ -888,3 +889,4 @@ Learn more
888889
.. _`limit of 767 bytes for the index key prefix`: https://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
889890
.. _`Doctrine screencast series`: https://symfonycasts.com/screencast/symfony-doctrine
890891
.. _`API Platform`: https://api-platform.com/docs/core/validation/
892+
.. _`PDO`: https://php.net/pdo

0 commit comments

Comments
 (0)