Update Chef license pages (#4487)

* Update Chef license pages

Signed-off-by: Ian Maddaus <[email protected]>

* Apply suggestion from @IanMadd

Signed-off-by: Ian Maddaus <[email protected]>

Signed-off-by: Ian Maddaus <[email protected]>

* Apply suggestion from @IanMadd

Signed-off-by: Ian Maddaus <[email protected]>

Signed-off-by: Ian Maddaus <[email protected]>

* More updates

Signed-off-by: Ian Maddaus <[email protected]>

* Doc update to not use official or unofficial keyword

Signed-off-by: Nik08 <[email protected]>

* Removed usage of official/unofficial keyword from licensing doc

Signed-off-by: Nik08 <[email protected]>

* Update licensing text

Signed-off-by: Ian Maddaus <[email protected]>

---------

Signed-off-by: Ian Maddaus <[email protected]>
Signed-off-by: Ian Maddaus <[email protected]>
Signed-off-by: Nik08 <[email protected]>
Co-authored-by: Nik08 <[email protected]>

Author: IanMadd

content/licensing/_index.md

@@ -17,15 +17,38 @@ aliases = ["/chef_license.html", "/chef_license/", "/license/"]
 
 This document gives an overview of Chef product licenses and license tiers.
 
-Before you can use distributions of Chef products, you must [accept the Chef End User License Agreement (Chef EULA)](accept).
+Before you can use distributions of Chef products, you must [accept the Chef End User License Agreement (Chef EULA)](accept) and you may be required to add a [Chef license key](#chef-license-key).
 
-The following products also require a [license key](license_key):
+## Chef license key
 
-- Chef InSpec 6 or greater
+The following products require a [Chef license key](license_key) to run:
+
+- Chef InSpec 6
+
+The following products require a [Chef license key](license_key) to run, depending on the distribution that you install:
+
+- Chef InSpec 7
+
+For these products, you need a license depending on how you install it:
+
+- The Chef Habitat package for Chef InSpec 7 doesn't require a license key to run.
+- The `inspec` gem requires a license key to run.
+
+You can't manually enable or disable licensing. The licensing requirements are determined by the distribution.
+
+### Chef license tiers
+
+Progress Chef offers three license tiers that have different entitlements: Free, Trial, and Commercial.
+
+| License | Duration | Environment | Support | Uses |
+|---|---|---|---|---|
+| Free | Unlimited | Non-production workloads | Community support in Slack | Personal and non-commercial use |
+| Trial | 30 days | Non-production workloads | Community support in Slack and solution architect support | Product evaluation in a non-production environment |
+| Commercial | Renewable | Production and non-production workloads | Support by contract | Enterprise workloads |
 
 Licensing is available for non-profit, research, and academic organizations through a special, free, or highly discounted commercial license in [Progress Chef's Non-Profit Entitlement Program](https://www.chef.io/nonprofit-entitlement-program).
 
-## Licenses
+## Chef license agreements
 
 All Chef products are governed by the [Chef End User License Agreement (Chef EULA)](#chef-eula) or the [Chef Master License and Services Agreement (Chef MLSA)](#chef-mlsa). The source code of open-source Chef projects is governed by the [Apache 2.0 license](#apache-20).
 
@@ -34,7 +57,7 @@ Third-party software included in our distributions may have individual licenses
 ### Chef EULA
 
 The [Chef End User License Agreement (Chef EULA)](https://www.chef.io/end-user-license-agreement) or your commercial agreement with Progress Software Corporation
-governs the commercial distributions of Progress Chef products--such as Chef Infra Client, Chef Habitat, or Chef InSpec. You must accept these terms when using the distributions for the first time. For additional information on how to accept the license, see [Accepting the Chef License](accept) documentation.
+governs the commercial distributions of Progress Chef products---such as Chef Infra Client, Chef Habitat, or Chef InSpec. You must accept these terms when using the distributions for the first time. For additional information on how to accept the license, see [Accepting the Chef License](accept) documentation.
 
 ### Chef MLSA
 
@@ -51,16 +74,6 @@ Source code is released publicly through repositories in these organizations:
 
 Progress Chef identifies third-party software included in our distributions in the `/opt/<PRODUCT-NAME>/LICENSE` file of our distribution. Full copies of all third-party referenced licenses are in the `/opt/<PRODUCT-NAME>/LICENSES` directory.
 
-Intermediate products--such as binaries, modules, containers, and executables (including scripts or interpreted language files such as Ruby)--that Progress Chef releases on sites other than GitHub are governed by the [Chef EULA](#chef-eula). These products require a license and aren't considered open source.
+Intermediate products---such as binaries, modules, containers, and executables (including scripts or interpreted language files such as Ruby)---that Progress Chef releases on sites other than GitHub are governed by the [Chef EULA](#chef-eula). These products require a license and aren't considered open source.
 
 For further questions, please contact [Chef Developer Relations](https://community.chef.io/).
-
-## License tiers
-
-Progress Chef offers three license tiers that have different entitlements: Free, Trial, and Commercial.
-
-| License | Duration | Environment | Support | Uses |
-|---|---|---|---|---|
-| Free | Unlimited | Non-production workloads | Community support in Slack | Personal and non-commercial use |
-| Trial | 30 days | Non-production workloads | Community support in Slack and solution architect support | Product evaluation in a non-production environment |
-| Commercial | Renewable | Production and non-production workloads | Support by contract | Enterprise workloads |

content/licensing/license_key.md

@@ -1,43 +1,52 @@
 +++
-title = "Add a Chef License Key"
+title = "Add a Chef license key"
 draft = false
 gh_repo = "chef-web-docs"
 
 [menu]
   [menu.overview]
-    title = "Add License Key"
+    title = "Add license key"
     identifier = "overview/licensing/Add License"
     parent = "overview/licensing"
     weight = 30
 +++
 
-This page describes how to add a license key to a Chef product.
+To use Chef products that require a license, you need to add your license key.
+You can find your license key in the [customer support portal](https://community.progress.com/s/products-list).
 
-You can find your license key on the [customer support portal](https://community.progress.com/s/products-list).
+## Products that require a Chef license key
 
-## Products
+You need a Chef license key to run the following products:
 
-The following products require a Chef License key to run:
+- Chef InSpec 6
 
-- [Chef InSpec 6 or greater](/inspec/license/)
+You might need a Chef license key to run the following products, depending on the distribution:
 
-## Add license key
+- Chef InSpec 7
 
-Chef products accept a license key with either an environment variable or as a command line argument.
+For these products, you need a license depending on how you install it:
 
-License data is stored locally in a configuration file at `$HOME/.chef/licenses.yaml`.
+- The Chef Habitat package for InSpec 7 doesn't require a license key to run.
+- The `inspec` gem requires a license key to run.
 
-### Command line option
+You can't manually enable or disable licensing. The licensing requirements are determined by the distribution.
 
-Use the `--chef-license-key` command line option to add a license key.
+## Add a license key
+
+Chef products accept a license key through an environment variable or a command line argument.
+Chef stores license data locally in a configuration file at `$HOME/.chef/licenses.yaml`.
+
+### Use a command line option
+
+To add a license key, use the `--chef-license-key` command line option:
 
 ```sh
 <CHEF_PRODUCT_COMMAND> --chef-license-key <LICENSE_KEY>
 ```
 
-### Environment variable
+### Use an environment variable
 
-Use the `CHEF_LICENSE_KEY` environment variable to add a license.
+To add a license key, set the `CHEF_LICENSE_KEY` environment variable:
 
 ```sh
 export CHEF_LICENSE_KEY=<LICENSE_KEY>