Permalink
Browse files

minor #4356 Remove incoherence between Doctrine and Propel introducti…

…on paragraphs (arnaugm)

This PR was merged into the 2.3 branch.

Discussion
----------

Remove incoherence between Doctrine and Propel introduction paragraphs

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #4349

The introductory paragraph of Doctrine and Propel sections, although both are true in some way, look contradictory, so a rephrase of at least one of the two paragraphs would be convenient.

Commits
-------

7992fdf Remove incoherence between Doctrine and Propel introduction paragraphs
  • Loading branch information...
weaverryan committed Oct 29, 2014
2 parents 1d71332 + 7992fdf commit 4dfd607ecdeb4867507c30bc59caecdb90a16966
Showing with 7 additions and 5 deletions.
  1. +7 −5 book/doctrine.rst
@@ -5,11 +5,13 @@ Databases and Doctrine
======================
One of the most common and challenging tasks for any application
involves persisting and reading information to and from a database. Fortunately,
Symfony comes integrated with `Doctrine`_, a library whose sole goal is to
give you powerful tools to make this easy. In this chapter, you'll learn the
basic philosophy behind Doctrine and see how easy working with a database can
be.
involves persisting and reading information to and from a database. Although
the Symfony full-stack framework doesn't integrate any ORM by default,
the Symfony Standard Edition, which is the most widely used distribution,
comes integrated with `Doctrine`_, a library whose sole goal is to give
you powerful tools to make this easy. In this chapter, you'll learn the
basic philosophy behind Doctrine and see how easy working with a database
can be.
.. note::

0 comments on commit 4dfd607

Please sign in to comment.