From f8efd85ae6d3f455bc4b89aad4d37c0988030b06 Mon Sep 17 00:00:00 2001
From: HarmenM <h.mojet@syslogic.nl>
Date: Thu, 9 May 2013 14:49:38 +0300
Subject: [PATCH 1/2] Update annotations-reference.rst

Added missing @JoinColumns in the index
---
 docs/en/reference/annotations-reference.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/reference/annotations-reference.rst b/docs/en/reference/annotations-reference.rst
index f705cb034..d42fda4e4 100644
--- a/docs/en/reference/annotations-reference.rst
+++ b/docs/en/reference/annotations-reference.rst
@@ -21,6 +21,7 @@ Index
 -  :ref:`@Id <annref_id>`
 -  :ref:`@InheritanceType <annref_inheritancetype>`
 -  :ref:`@JoinColumn <annref_joincolumn>`
+-  :ref:`@JoinColumns <annref_joincolumns>`
 -  :ref:`@JoinTable <annref_jointable>`
 -  :ref:`@ManyToOne <annref_manytoone>`
 -  :ref:`@ManyToMany <annref_manytomany>`

From 97622b57bd9fadea77b50e2f5ced717efbac1357 Mon Sep 17 00:00:00 2001
From: Jakub Zalas <jakub@zalas.pl>
Date: Thu, 9 May 2013 15:19:58 +0100
Subject: [PATCH 2/2] Fixed a code block. Sphinx does not like the way code was
 indented. Building the documentation raises the following error:
 en/cookbook/resolve-target-entity-listener.rst:121: ERROR: Unexpected
 indentation.

---
 docs/en/cookbook/resolve-target-entity-listener.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/cookbook/resolve-target-entity-listener.rst b/docs/en/cookbook/resolve-target-entity-listener.rst
index 71b746602..4a1b3b941 100644
--- a/docs/en/cookbook/resolve-target-entity-listener.rst
+++ b/docs/en/cookbook/resolve-target-entity-listener.rst
@@ -119,8 +119,7 @@ the targetEntity resolution will occur reliably:
     $evm = new \Doctrine\Common\EventManager;
 
     $rtel = new \Doctrine\ORM\Tools\ResolveTargetEntityListener;
-    $rtel->addResolveTargetEntity('Acme\\InvoiceModule\\Model\\InvoiceSubjectInterface',
-        'Acme\\CustomerModule\\Entity\\Customer', array());
+    $rtel->addResolveTargetEntity('Acme\\InvoiceModule\\Model\\InvoiceSubjectInterface', 'Acme\\CustomerModule\\Entity\\Customer', array());
 
     // Add the ResolveTargetEntityListener
     $evm->addEventSubscriber($rtel);