Improving some docs in Association class

cakephp · Jun 10, 2013 · f549a04 · f549a04
1 parent e5fa433
commit f549a04
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Cake/ORM/Association.php b/lib/Cake/ORM/Association.php
@@ -18,8 +18,7 @@
 
 /**
  * An Association is a relationship established between two tables and is used
- * as a configuration place for customizing the way interconnected records are
- * retrieved.
+ * to configure and customize the way interconnected records are retrieved.
  *
  */
 abstract class Association {
@@ -338,7 +337,8 @@ protected  function _options(array $options) {
  * - includeFields: Whether to include target model fields in the result or not
  * - foreignKey: The name of the field to use as foreign key, if false none
  *   will be used
- * - conditions: array with a list of conditions to filter the join with
+ * - conditions: array with a list of conditions to filter the join with, this
+ *   will be merged with any conditions originally configured for this association
  * - fields: a list of fields in the target table to include in the result
  * - type: The type of join to be used (e.g. INNER)
  *