Merge branch 'feature-restapi' of git://github.com/yiisoft/yii2 into feature-restapi

docs/guide/rest.md

@@ -36,7 +36,7 @@ use yii\rest\ActiveController;
 
 class UserController extends ActiveController
 {
-	public $modelClass = 'app\models\City';
+	public $modelClass = 'app\models\User';
 }
 ```