From 901d753c9a016702e050838ae3b1e5ac0b49cb12 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 11 Jun 2013 08:21:50 -0400
Subject: [PATCH] doc improvement.

---
 framework/yii/base/ActionFilter.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/framework/yii/base/ActionFilter.php b/framework/yii/base/ActionFilter.php
index 20ff142..1e957d5 100644
--- a/framework/yii/base/ActionFilter.php
+++ b/framework/yii/base/ActionFilter.php
@@ -16,10 +16,13 @@ class ActionFilter extends Behavior
 	/**
 	 * @var array list of action IDs that this filter should apply to. If this property is not set,
 	 * then the filter applies to all actions, unless they are listed in [[except]].
+	 * If an action ID appears in both [[only]] and [[except]], this filter will NOT apply to it.
+	 * @see except
 	 */
 	public $only;
 	/**
 	 * @var array list of action IDs that this filter should not apply to.
+	 * @see only
 	 */
 	public $except = array();