diff --git a/CHANGELOG.md b/CHANGELOG.md index a1dbae028a..d42549ee9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ path/to/another-file.kt - `--ruleset-repository` and `--ruleset-update` CLI arguments in favour of `--repository` and `--repository-update` respectively (`--ruleset-*` will be removed in 1.0.0). - `ktlint-intellij-idea-integration` binary -([Intellij IDEA integration](https://github.com/shyiko/ktlint#option-1-recommended) task is now included in `ktlint` (as `ktlint --apply`)). +([Intellij IDEA integration](https://github.com/shyiko/ktlint#option-1-recommended) task is now included in `ktlint` (as `ktlint --apply-to-idea`)). ## [0.8.1] - 2017-05-30 diff --git a/README.md b/README.md index 69db603e86..5044897897 100644 --- a/README.md +++ b/README.md @@ -240,7 +240,7 @@ You might also want to take a look at [diffplug/spotless](https://github.com/dif ```sh # inside project's root directory -ktlint --apply +ktlint --apply-to-idea ``` ##### Option #2 diff --git a/ktlint/src/main/kotlin/com/github/shyiko/ktlint/Main.kt b/ktlint/src/main/kotlin/com/github/shyiko/ktlint/Main.kt index 4fa2f432df..b4f293094f 100644 --- a/ktlint/src/main/kotlin/com/github/shyiko/ktlint/Main.kt +++ b/ktlint/src/main/kotlin/com/github/shyiko/ktlint/Main.kt @@ -103,7 +103,7 @@ object Main { private var debug: Boolean = false // todo: make it a command in 1.0.0 (it's too late now as we might interfere with valid "lint" patterns) - @Option(name="--apply", usage = "Update Intellij IDEA project settings") + @Option(name="--apply-to-idea", usage = "Update Intellij IDEA project settings") private var apply: Boolean = false @Option(name="-y", hidden = true) private var forceApply: Boolean = false