Fixed some typos in docblocks

cakephp · Jul 12, 2014 · eb03ec9 · eb03ec9
1 parent 111c833
commit eb03ec9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -85,7 +85,7 @@ protected function _buildPropertyMap($options) {
  * ### Options:
  *
  * * associated: Associations listed here will be marshalled as well.
- * * fiedlList: A whitelist of fields to be assigened to th entity, if not present
+ * * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
  *   the accessible fields list in the entity will be used.
  *
  * @param array $data The data to hydrate.
@@ -160,7 +160,7 @@ protected function _marshalAssociation($assoc, $value, $options) {
  * ### Options:
  *
  * * associated: Associations listed here will be marshalled as well.
- * * fiedlList: A whitelist of fields to be assigened to th entity, if not present
+ * * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
  *   the accessible fields list in the entity will be used.
  *
  * @param array $data The data to hydrate.
@@ -252,7 +252,7 @@ protected function _loadBelongsToMany($assoc, $ids) {
  * ### Options:
  *
  * * associated: Associations listed here will be marshalled as well.
- * * fiedlList: A whitelist of fields to be assigened to th entity, if not present
+ * * fiedlList: A whitelist of fields to be assigned to the entity. If not present
  *   the accessible fields list in the entity will be used.
  *
  * @param \Cake\Datasource\EntityInterface $entity the entity that will get the
@@ -321,7 +321,7 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
  * ### Options:
  *
  * * associated: Associations listed here will be marshalled as well.
- * * fiedlList: A whitelist of fields to be assigened to th entity, if not present
+ * * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
  *   the accessible fields list in the entity will be used.
  *
  * @param array|\Traversable $entities the entities that will get the