Merge pull request doctrine#1364 from shieldo/embeddedables

Bill Schaller · Bill Schaller · commit 052b8e802fc2 · 2015-04-03T12:08:37.000-04:00
[Documentation] correct naming of Embeddable Objects feature
diff --git a/docs/en/changelog/migration_2_5.rst b/docs/en/changelog/migration_2_5.rst
@@ -58,11 +58,11 @@ metadata generation:
         }
     }
 
-Embeddedable Objects
-~~~~~~~~~~~~~~~~~~~~
+Embeddable Objects
+~~~~~~~~~~~~~~~~~~
 
 Doctrine now supports creating multiple PHP objects from one database table
-implementing a feature called "Embeddedable Objects". Next to an ``@Entity``
+implementing a feature called "Embeddable Objects". Next to an ``@Entity``
 class you can now define a class that is embeddable into a database table of an
 entity using the ``@Embeddable`` annotation. Embeddable objects can never be
 saved, updated or deleted on their own, only as part of an entity (called

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ metadata generation:`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-Embeddedable Objects`
`62`		`-~~~~~~~~~~~~~~~~~~~~`
	`61`	`+Embeddable Objects`
	`62`	`+~~~~~~~~~~~~~~~~~~`
`63`	`63`
`64`	`64`	`Doctrine now supports creating multiple PHP objects from one database table`
`65`		-implementing a feature called "Embeddedable Objects". Next to an ``@Entity``
	`65`	+implementing a feature called "Embeddable Objects". Next to an ``@Entity``
`66`	`66`	`class you can now define a class that is embeddable into a database table of an`
`67`	`67`	entity using the ``@Embeddable`` annotation. Embeddable objects can never be
`68`	`68`	`saved, updated or deleted on their own, only as part of an entity (called`