snyk · Jul 25, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ If you are mostly testing functions calling other functions, consider writing an
 
 ### Acceptance tests
 
-Acceptance tests enforce the correctness of our distribution and are written from the perspective of a customer.
+Acceptance tests enforce the correctness of our distribution and are written from the perspective of an user.
 
 Snyk CLI's acceptance tests execute a specific command line as a standalone process, then assert on `stdout`, `stdin` and the exit code. As an example, see: [`oauth-token.spec.ts`](test/jest/acceptance/oauth-token.spec.ts).
 
@@ -162,7 +162,7 @@ You will need to fix any remaining issues manually.
 
 When making changes, ensure documentation is updated accordingly.
 
-Customer-facing documentation is [available on GitBook](https://docs.snyk.io/features/snyk-cli).
+User-facing documentation is [available on GitBook](https://docs.snyk.io/features/snyk-cli).
 
 `snyk help` output must also be [edited on GitBook](https://docs.snyk.io/features/snyk-cli/commands). Changes will automatically be pulled into Snyk CLI as pull requests.
 
@@ -199,9 +199,7 @@ Each commit must provide some benefit on its own without breaking the release pi
 
 For larger changes, break down each step into multiple commits so that it's easy to review in pull requests and git history.
 
-Your changes must be backwards compatible and cannot break existing customer pipelines.
-
-Commits must follow this structure:
+Commits must follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) structure:
 
 ```
 type: summary of your changes
@@ -217,13 +215,19 @@ docs: update contributing guide
 We often get questions on how to contribute to this repo. What versions to use, what the workflow is, and so on. This change updates our CONTRIBUTING guide to answer those types of questions.
 ```
 
+### No breaking changes
+
+Your changes must be backwards compatible and cannot break existing user pipelines.
+
+Don't use `BREAKING CHANGE` or exclamation mark `!` from the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
+
 ### Commit types
 
 The commit type is used to summarize intent and to automate various steps.
 
 | Type       | Description                                     |
 | ---------- | ----------------------------------------------- |
-| `feat`     | A new customer-facing feature.                  |
+| `feat`     | A new user-facing feature.                      |
 | `fix`      | A bug fix for an existing feature.              |
 | `refactor` | Changes which do not affect existing features.  |
 | `test`     | Changes to tests for existing features.         |

diff --git a/help/cli-commands/monitor.md b/help/cli-commands/monitor.md
@@ -168,7 +168,7 @@ Set the project tags to one or more values (comma-separated key value pairs with
 
 This is an alias for `--project-tags`
 
-## Options for Maven projects
+## Option for Maven projects
 
 For more information about Maven CLI options see [Snyk for Java and Kotlin](https://docs.snyk.io/products/snyk-open-source/language-and-package-manager-support/snyk-for-java-gradle-maven)
 
@@ -178,20 +178,6 @@ Auto-detect maven jars, aars, and wars in given directory. To monitor individual
 
 **Note**: Custom-built jar files, even with open source dependencies, are out of scope.
 
-### `--reachable`
-
-WARNING: Will be removed on 15 August 2022
-
-Analyze your source code to find which vulnerable functions and packages are called. Cannot be used with `--all-projects`
-
-### `--reachable-timeout=<TIMEOUT>`
-
-WARNING: Will be removed on 15 August 2022
-
-Specify the amount of time (in seconds) to wait for Snyk to gather reachability data. If it takes longer than `<TIMEOUT>`, reachable vulnerabilities are not reported. This does not affect regular test or monitor output.
-
-Default: 300 (5 minutes).
-
 ## Options for Gradle projects
 
 For more information about Gradle CLI options see [Snyk for Java and Kotlin](https://docs.snyk.io/products/snyk-open-source/language-and-package-manager-support/snyk-for-java-gradle-maven)
@@ -216,16 +202,6 @@ Select certain values of configuration attributes to install dependencies and pe
 
 Example: `buildtype:release,usage:java-runtime`
 
-### `--reachable`
-
-Analyze your source code to find which vulnerable functions and packages are called.
-
-### `--reachable-timeout=<TIMEOUT>`
-
-Specify the amount of time (in seconds) to wait for Snyk to gather reachability data. If it takes longer than `<TIMEOUT>`, reachable vulnerabilities are not reported. This does not affect regular test or monitor output.
-
-Default: 300 (5 minutes).
-
 ### `--init-script=<FILE`
 
 Use for projects that contain a Gradle initialization script.

diff --git a/help/cli-commands/test.md b/help/cli-commands/test.md
@@ -173,7 +173,7 @@ Fail only when there are vulnerabilities that can be fixed.
 
 To fail on any vulnerability (the default behavior), do not use the `--fail-on` option. If vulnerabilities do not have a fix and this option is being used, tests pass.
 
-## Options for Maven projects
+## Option for Maven projects
 
 For more information about Maven CLI options see [Snyk for Java and Kotlin](https://docs.snyk.io/products/snyk-open-source/language-and-package-manager-support/snyk-for-java-gradle-maven)
 
@@ -183,20 +183,6 @@ Auto-detect maven jars, aars, and wars in given directory. To test individually
 
 **Note**: Custom-built jar files, even with open source dependencies, are out of scope.
 
-### `--reachable`
-
-WARNING: Will be removed on 15 August 2022
-
-Analyze your source code to find which vulnerable functions and packages are called. Cannot be used with `--all-projects`
-
-### `--reachable-timeout=<TIMEOUT>`
-
-WARNING: Will be removed on 15 August 2022
-
-Specify the amount of time (in seconds) to wait for Snyk to gather reachability data. If it takes longer than `<TIMEOUT>`, reachable vulnerabilities are not reported. This does not affect regular test or monitor output.
-
-Default: 300 (5 minutes).
-
 ## Options for Gradle projects
 
 For more information about Gradle CLI options see [Snyk for Java and Kotlin](https://docs.snyk.io/products/snyk-open-source/language-and-package-manager-support/snyk-for-java-gradle-maven)
@@ -221,16 +207,6 @@ Select certain values of configuration attributes to install dependencies and pe
 
 Example: `buildtype:release,usage:java-runtime`
 
-### `--reachable`
-
-Analyze your source code to find which vulnerable functions and packages are called.
-
-### `--reachable-timeout=<TIMEOUT>`
-
-Specify the amount of time (in seconds) to wait for Snyk to gather reachability data. If it takes longer than `<TIMEOUT>`, reachable vulnerabilities are not reported. This does not affect regular test or monitor output.
-
-Default: 300 (5 minutes).
-
 ### `--init-script=<FILE`
 
 Use for projects that contain a Gradle initialization script.