Permalink
Browse files

Fixing typos

  • Loading branch information...
1 parent 1c026ff commit c6f8e5c87e528cfb4ccec1236ce768f6ff98aa45 @lorenzo lorenzo committed Mar 3, 2014
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/ORM/Marshaller.php
View
6 src/ORM/Marshaller.php
@@ -224,7 +224,7 @@ protected function _loadBelongsToMany($assoc, $ids) {
*
* When merging HasMany or BelongsToMany associations, all the entities in the
* `$data` array will appear, those that can be matched by primary key will get
- * the data merged, but those that cannot, will be discarded.
+ * the data merged, but those that cannot, will be discarded.
*
* @param \Cake\Datasource\EntityInterface $entity the entity that will get the
* data merged in
@@ -266,11 +266,11 @@ public function merge(EntityInterface $entity, array $data, $include = []) {
* Records in `$data` are matched against the entities by using the primary key
* column. Those entries in `$entities` that cannot be matched to any record in
* `$data` will be discarded. Records in `$data` that could not be matched will
- * be marshaled as a new entity.
+ * be marshalled as a new entity.
*
* When merging HasMany or BelongsToMany associations, all the entities in the
* `$data` array will appear, those that can be matched by primary key will get
- * the data merged, but those that cannot, will be discarded.
+ * the data merged, but those that cannot, will be discarded.
*
* @param array|\Traversable $entities the entities that will get the
* data merged in

0 comments on commit c6f8e5c

Please sign in to comment.