From 77d87129381149ffd91cb087a1bebd75ee204426 Mon Sep 17 00:00:00 2001 From: Liam <101684827+SkiingIsFun123@users.noreply.github.com> Date: Mon, 13 Jun 2022 23:44:16 -0700 Subject: [PATCH 1/3] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cae34df07f..9b9b2fc898 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ in your Script Build Phases. This is the recommended way to install a specific version of SwiftLint since it supports installing a pinned version rather than simply the latest (which is the case with Homebrew). -Note that this will add the SwiftLint binaries, its dependencies' binaries and the Swift binary +Note that this will add the SwiftLint binaries, its dependencies' binaries, and the Swift binary library distribution to the `Pods/` directory, so checking in this directory to SCM such as git is discouraged. @@ -113,7 +113,7 @@ results. If you wish to fix violations as well, your script could run `swiftlint --fix && swiftlint` instead of just `swiftlint`. This will mean -that all correctable violations are fixed, while ensuring warnings show up in +that all correctable violations are fixed while ensuring warnings show up in your project for remaining violations. If you've installed SwiftLint via CocoaPods the script should look like this: @@ -374,7 +374,7 @@ run SwiftLint from. The following parameters can be configured: Rule inclusion: * `disabled_rules`: Disable rules from the default enabled set. -* `opt_in_rules`: Enable rules not from the default set. +* `opt_in_rules`: Enable rules, not from the default setting. * `only_rules`: Only the rules specified in this list will be enabled. Cannot be specified alongside `disabled_rules` or `opt_in_rules`. * `analyzer_rules`: This is an entirely separate list of rules that are only @@ -634,7 +634,7 @@ specifications of nested configurations are getting ignored because there's no s If one (or more) SwiftLint file(s) are explicitly specified via the `--config` parameter, that configuration will be treated as an override, no matter whether there exist other `.swiftlint.yml` files somewhere within the directory. **So if you want to use -use nested configurations, you can't use the `-- config` parameter.** + nested configurations, you can't use the `-- config` parameter.** ## License From 9b9da6788e2a43c7dadeb28d32d9c1864280833d Mon Sep 17 00:00:00 2001 From: Liam <101684827+SkiingIsFun123@users.noreply.github.com> Date: Tue, 14 Jun 2022 11:47:07 -0700 Subject: [PATCH 2/3] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Danny Mösch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b9b2fc898..b4827c65b9 100644 --- a/README.md +++ b/README.md @@ -634,7 +634,7 @@ specifications of nested configurations are getting ignored because there's no s If one (or more) SwiftLint file(s) are explicitly specified via the `--config` parameter, that configuration will be treated as an override, no matter whether there exist other `.swiftlint.yml` files somewhere within the directory. **So if you want to use - nested configurations, you can't use the `-- config` parameter.** + nested configurations, you can't use the `--config` parameter.** ## License From 2b38fa6d86f30333ba09a47fe0339b9af52e89b6 Mon Sep 17 00:00:00 2001 From: Liam <101684827+SkiingIsFun123@users.noreply.github.com> Date: Tue, 14 Jun 2022 11:47:22 -0700 Subject: [PATCH 3/3] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Danny Mösch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4827c65b9..b9af2d1332 100644 --- a/README.md +++ b/README.md @@ -374,7 +374,7 @@ run SwiftLint from. The following parameters can be configured: Rule inclusion: * `disabled_rules`: Disable rules from the default enabled set. -* `opt_in_rules`: Enable rules, not from the default setting. +* `opt_in_rules`: Enable rules that are not part of the default set. * `only_rules`: Only the rules specified in this list will be enabled. Cannot be specified alongside `disabled_rules` or `opt_in_rules`. * `analyzer_rules`: This is an entirely separate list of rules that are only