From 0252368af23c4adaac79d71418ad358443174923 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 26 Feb 2011 11:51:43 +0100 Subject: [PATCH] Fix some Sphinx/ReST warnings --- en/reference/dql-doctrine-query-language.rst | 2 +- en/reference/limitations-and-known-issues.rst | 8 ++++---- en/reference/query-builder.rst | 2 +- en/reference/working-with-objects.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/en/reference/dql-doctrine-query-language.rst b/en/reference/dql-doctrine-query-language.rst index d745d8a98..bcc4043b9 100644 --- a/en/reference/dql-doctrine-query-language.rst +++ b/en/reference/dql-doctrine-query-language.rst @@ -2,7 +2,7 @@ Doctrine Query Language =========================== DQL stands for Doctrine Query Language and is an Object -Query Language derivate that is very similar to the **H**ibernate +Query Language derivate that is very similar to the Hibernate Query Language (HQL) or the Java Persistence Query Language (JPQL). In essence, DQL provides powerful querying capabilities over your diff --git a/en/reference/limitations-and-known-issues.rst b/en/reference/limitations-and-known-issues.rst index 0dc4fb9cb..3a042cfa9 100644 --- a/en/reference/limitations-and-known-issues.rst +++ b/en/reference/limitations-and-known-issues.rst @@ -206,8 +206,8 @@ Cascade Merge with Bi-directional Associations There are two bugs now that concern the use of cascade merge in combination with bi-directional associations. Make sure to study the behavior of cascade merge if you are using it: -- `DDC-875 Merge can sometimes add the same entity twice into a collection`_ -- `DDC-763 Cascade merge on associated entities can insert too many rows through "Persistence by Reachability"`_ +- `DDC-875 `_ Merge can sometimes add the same entity twice into a collection +- `DDC-763 `_ Cascade merge on associated entities can insert too many rows through "Persistence by Reachability" Custom Persisters ~~~~~~~~~~~~~~~~~ @@ -267,8 +267,8 @@ blog posts we have written on this topics: - `Doctrine2 "Behaviors" in a Nutshell `_ - `A re-usable Versionable behavior for Doctrine2 `_ - `Write your own ORM on top of Doctrine2 `_ -- `Doctrine 2 Behavioral Extensions`_ -- `Doctrator_ +- `Doctrine 2 Behavioral Extensions `_ +- `Doctrator _ Doctrine 2 has enough hooks and extension points so that *you* can add whatever you want on top of it. None of this will ever become diff --git a/en/reference/query-builder.rst b/en/reference/query-builder.rst index da5bbf2cd..7c1d2d8cd 100644 --- a/en/reference/query-builder.rst +++ b/en/reference/query-builder.rst @@ -197,7 +197,7 @@ executing the Query. Additionally a set of parameters such as query hints cannot be set on the QueryBuilder itself. This is why you always have to convert a querybuilder instance into a Query object: -.. code-block:: +.. code-block:: php // $qb instanceof QueryBuilder $query = $qb->getQuery(); diff --git a/en/reference/working-with-objects.rst b/en/reference/working-with-objects.rst index ccb1fae08..f737807d3 100644 --- a/en/reference/working-with-objects.rst +++ b/en/reference/working-with-objects.rst @@ -476,7 +476,7 @@ Effects of Database and UnitOfWork being Out-Of-Sync As soon as you begin to change the state ofentities, call persist or remove the contents of the UnitOfWork and the database will drive out of sync. They can -only be sychronized by calling ``EntityManager#flush()`. This section +only be sychronized by calling ``EntityManager#flush()``. This section describes the effects of database and UnitOfWork being out of sync. - Entities that are scheduled for removal can still be queried from the database.