diff --git a/docs/guide/rest-resources.md b/docs/guide/rest-resources.md index d5fd9a5..164cbf5 100644 --- a/docs/guide/rest-resources.md +++ b/docs/guide/rest-resources.md @@ -82,7 +82,7 @@ public function fields() } // filter out some fields, best used when you want to inherit the parent implementation -// and blacklist some sensitive fields. +// and exclude some sensitive fields. public function fields() { $fields = parent::fields(); diff --git a/docs/guide/runtime-logging.md b/docs/guide/runtime-logging.md index 815af1d..041150a 100644 --- a/docs/guide/runtime-logging.md +++ b/docs/guide/runtime-logging.md @@ -142,8 +142,8 @@ the pattern `yii\db\*`. If you do not specify the [[yii\log\Target::categories|categories]] property, it means the target will process messages of *any* category. -Besides whitelisting the categories by the [[yii\log\Target::categories|categories]] property, you may also -blacklist certain categories by the [[yii\log\Target::except|except]] property. If the category of a message +In addition to specifying allowed categories using the [[yii\log\Target::categories|categories]] property, you may also +exclude certain categories by the [[yii\log\Target::except|except]] property. If the category of a message is found or matches one of the patterns in this property, it will NOT be processed by the target. The following target configuration specifies that the target should only process error and warning messages diff --git a/docs/guide/structure-filters.md b/docs/guide/structure-filters.md index 8590c74..0789814 100644 --- a/docs/guide/structure-filters.md +++ b/docs/guide/structure-filters.md @@ -34,7 +34,7 @@ public function behaviors() By default, filters declared in a controller class will be applied to *all* actions in that controller. You can, however, explicitly specify which actions the filter should be applied to by configuring the [[yii\base\ActionFilter::only|only]] property. In the above example, the `HttpCache` filter only applies to the -`index` and `view` actions. You can also configure the [[yii\base\ActionFilter::except|except]] property to blacklist +`index` and `view` actions. You can also configure the [[yii\base\ActionFilter::except|except]] property to prevent some actions from being filtered. Besides controllers, you can also declare filters in a [module](structure-modules.md) or [application](structure-applications.md). diff --git a/docs/guide/structure-models.md b/docs/guide/structure-models.md index dc2d24b..1cfc9bb 100644 --- a/docs/guide/structure-models.md +++ b/docs/guide/structure-models.md @@ -478,7 +478,7 @@ public function fields() } // filter out some fields, best used when you want to inherit the parent implementation -// and blacklist some sensitive fields. +// and exclude some sensitive fields. public function fields() { $fields = parent::fields();