Merge branch '4.1' into 4.2

javiereguiluz · javiereguiluz · commit 3e95f3637406 · 2018-12-20T08:33:11.000+01:00
* 4.1:
  Update associations.rst
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -136,7 +136,7 @@ not sure of the answer, don't worry! You can always change the settings later:
     >
     (press enter again to finish)
 
-This made changes to *two* changes. First, added a new ``category`` property to
+This made changes to *two* entities. First, it added a new ``category`` property to
 the ``Product`` entity (and getter & setter methods):
 
 .. configuration-block::

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ not sure of the answer, don't worry! You can always change the settings later:`
`136`	`136`	`>`
`137`	`137`	`(press enter again to finish)`
`138`	`138`
`139`		-This made changes to two changes. First, added a new ``category`` property to
	`139`	+This made changes to two entities. First, it added a new ``category`` property to
`140`	`140`	the ``Product`` entity (and getter & setter methods):
`141`	`141`
`142`	`142`	`.. configuration-block::`