Merge pull request #2954 from bcrowe/3.0-docblocks

3.0 - Fix doc blocks in RepositoryInterface and Marshaller

src/Datasource/RepositoryInterface.php

@@ -75,7 +75,7 @@ interface RepositoryInterface {
  *
  * @param array $fields A hash of field => new value.
  * @param array $conditions An array of conditions, similar to those used with find()
- * @return boolean Success Returns true if one or more rows are effected.
+ * @return boolean Success Returns true if one or more rows are affected.
  */
 	public function updateAll($fields, $conditions);
 
@@ -87,12 +87,12 @@ interface RepositoryInterface {
  * This method will *not* trigger beforeDelete/afterDelete events. If you
  * need those first load a collection of records and delete them.
  *
- * This method will *not* execute on associations `cascade` attribute. You should
+ * This method will *not* execute on associations' `cascade` attribute. You should
  * use database foreign keys + ON CASCADE rules if you need cascading deletes combined
  * with this method.
  *
  * @param array $conditions An array of conditions, similar to those used with find()
- * @return boolean Success Returns true if one or more rows are effected.
+ * @return boolean Success Returns true if one or more rows are affected.
  * @see RepositoryInterface::delete()
  */
 	public function deleteAll($conditions);

src/ORM/Marshaller.php

@@ -157,12 +157,12 @@ class Marshaller {
 	}
 
 /**
- * Marshalls data for belongsToMany associations.
+ * Marshals data for belongsToMany associations.
  *
  * Builds the related entities and handles the special casing
  * for junction table entities.
  *
- * @param Association $assoc The association to marshall.
+ * @param Association $assoc The association to marshal.
  * @param array $data The data to convert into entities.
  * @param array $include The nested associations to convert.
  * @return array An array of built entities.