From 5bcf201535d36a417c703555866c33aedf6eadb9 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 7 Jul 2020 12:20:20 +0300 Subject: [PATCH] [Docs] Tweak some markup --- docs/modules/ROOT/pages/configuration.adoc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/modules/ROOT/pages/configuration.adoc b/docs/modules/ROOT/pages/configuration.adoc index efa060ebff7..b79e94f548f 100644 --- a/docs/modules/ROOT/pages/configuration.adoc +++ b/docs/modules/ROOT/pages/configuration.adoc @@ -51,7 +51,7 @@ files: * `~/.config/rubocop/config.yml` * https://github.com/rubocop-hq/rubocop/blob/master/config/default.yml[RuboCop's default configuration] -All the previous logic does not apply if a specific configuration file is passed +NOTE: All the previous logic does not apply if a specific configuration file is passed on the command line through the `--config` flag. In that case, the resolved configuration file will be the one passed to the CLI. @@ -402,9 +402,11 @@ valid for the directory tree starting where they are defined. They are not shadowed by the setting of `Include` and `Exclude` in other `.rubocop.yml` files in subdirectories. This is different from all other parameters, who follow RuboCop's general principle that configuration for an inspected file -is taken from the nearest `.rubocop.yml`, searching upwards. _This behavior +is taken from the nearest `.rubocop.yml`, searching upwards. + +NOTE: This behavior will be overridden if you specify the `--ignore-parent-exclusion` command line -argument_. +argument. === Cop-specific `Include` and `Exclude`