Merge branch 'patch-4' of github.com:kartik-v/yii2 into kartik-v-patch-4

framework/UPGRADE.md

@@ -34,7 +34,7 @@ Upgrade from Yii 2.0 Beta
   the `keyPrefix` property of the cache component to use some unique string.
   Previously, this property was automatically assigned with a unique string.
 
-* If you are using `yii\helpers\Html::dropDownList` or `yii\helpers\Html::listBox`, a new parameter
-   `encodeSpaces` is now available within the `options` array. This defaults to `false`. If 
-  set to `true` all spaces in the rendered option value and prompt will be replaced with ` `
-  the HTML non breaking space character.
+* If you are using `dropDownList`, `listBox`, `activeDropDownList`, or `activeListBox`, in the 
+  yii\helpers\Html class, a new parameter `encodeSpaces` is now available within the `options` array. 
+  This defaults to `false`. If this is set to `true`, all spaces in the rendered option value and
+  prompt will be replaced with ` `, the HTML non breaking space character.