From 33168953f4559c4a7d703f52edc424e5d6c4904c Mon Sep 17 00:00:00 2001
From: Bryan Crowe <bryan@bryan-crowe.com>
Date: Tue, 4 Mar 2014 22:34:12 -0500
Subject: [PATCH] Fix doc blocks in RepositoryInterface and Marshaller

---
 src/Datasource/RepositoryInterface.php | 6 +++---
 src/ORM/Marshaller.php                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Datasource/RepositoryInterface.php b/src/Datasource/RepositoryInterface.php
index fe47892fd74..9a5d43fa5b1 100644
--- a/src/Datasource/RepositoryInterface.php
+++ b/src/Datasource/RepositoryInterface.php
@@ -75,7 +75,7 @@ public function query();
  *
  * @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 @@ public function updateAll($fields, $conditions);
  * 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);
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
index c8844d9ad08..b4840473359 100644
--- a/src/ORM/Marshaller.php
+++ b/src/ORM/Marshaller.php
@@ -157,12 +157,12 @@ public function many(array $data, $include = []) {
 	}
 
 /**
- * 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.