additional editing

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

content/licensing/_index.md

@@ -15,23 +15,28 @@ aliases = ["/chef_license.html", "/chef_license/", "/license/"]
     weight = 10
 +++
 
-With the release of Chef InSpec 6, Chef is introducing a new licensing model which will expand to cover to all Chef products at a future date. The new licensing model is more flexible and lets customers and end-users choose a license that adapts to their specific DevOps scenarios.
+Either the [Chef End User License Agreement (Chef EULA)](#chef-eula) or your commercial agreement with Progress Software Corporation governs commercial distributions of Chef products. The [Apache License, Version 2.0](#apache-20) governs the reuse of source code of open-source Progress Chef projects.
 
-<!--- What are these options? Is this just the license tiers? --->
+Chef licenses come in [three different license tiers](#license-tiers) depending on your use case.
 
-For all products, including Chef InSpec 6 and higher, the existing [Chef End User License Agreement (Chef EULA)](#chef-eula) still applies and is unchanged.
+Before you can use distributions of Chef products, you must [accept the Chef license](accept). You must also [add a license key](add_license) if you use the following products:
 
-Source code reuse is unchanged and follows the [Apache 2.0](#apache-20) model for open source products and repositories from Progress Chef.
+- Chef InSpec 6 or greater
+
+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 EULA
 
-The commercial distributions of our products--such as Chef Infra Client, Chef Habitat, or Chef InSpec--are governed by either the [Chef End User License Agreement (Chef EULA)](https://www.chef.io/end-user-license-agreement) or your commercial agreement with Progress Software Corporation. 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.
+The [Chef End User License Agreement (Chef EULA)](https://www.chef.io/end-user-license-agreement) or your commercial agreement with Progress Software Corporation
+goverens 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
 
-If you have a license from before April 2019 (referred to as the Chef Master License and Services Agreement, or MLSA), please consult the [Chef versions documentation](/versions/) to understand which license applies.
+The [Chef Master License and Services Agreement (Chef MLSA)](https://www.chef.io/online-master-agreement) governs distributions of older proprietary Chef products--such as Chef Automate 1.x and the Chef Management Console. You must accept this license as part of any install or upgrade process.
 
-## Apache 2.0
+### Apache 2.0
 
 The [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) governs the reuse of source code of open-source Progress Chef projects--including Chef Infra Client ("chef"), Chef InSpec, and Chef Habitat--unless specified otherwise in the project's repository.
 Source code is released publicly through repositories in these organizations:
@@ -48,25 +53,20 @@ For further questions, please contact [Chef Developer Relations](https://communi
 
 ## License tiers
 
-Starting with Chef InSpec 6, there are three license tiers that have different entitlements: free, trial, and commercial.
-Upon installation of Chef InSpec, you must accept the basic [Progress Chef EULA](https://www.chef.io/end-user-license-agreement) and then activate the product with a license key ID. Chef InSpec 6 doesn't run without a license. You can find your existing license key on the [customer support portal](https://community.progress.com/s/products-list).
+Progress Chef offers three license tiers that have different entitlements: free, trial, and commercial.
 
 | License    | Duration                           | Features                       | Intended environment                    | Support Model                                             | Intended uses                                      |
 |------------|------------------------------------|--------------------------------|-----------------------------------------|-----------------------------------------------------------|----------------------------------------------------|
 | Free       | Perpetual requiring annual renewal | Basic                          | Non-production workloads                | Community support in Slack                                | Personal and non-commercial use                    |
 | Trial      | 30-days, renewable up to 90 days   | Advanced functionality enabled | Non-production workloads                | Community support in Slack and solution architect support | Evaluate products in a non-production environment. |
 | Commercial | Renewable and upgradable           | Advanced functionality enabled | 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).
-
-Official downstream distributions made from original Chef distributions (for example, CINC) aren't affected by this license change.
-
-## Usage Data
+## Usage data
 
-The Progress Chef EULA requires basic license information to be transmitted to Chef for all products, including Chef InSpec 6.
-The basic license information collected includes which applications are in use, Chef product versions, and the license(s) that govern those products.
+The Progress Chef EULA requires that basic license information be transmitted to Chef for all products.
+The basic license information collected includes which Chef applications are in use, their versions, and the license(s) that govern those products.
 
-Licensed customer may opt to send additional telemetry and usage data to Progress Chef.
+Licensed customers may opt to send additional telemetry and usage data to Progress Chef.
 This telemetry is used to tailor recommendations to customers, develop new features, and optimize the customer experience.
 
 <!--

content/licensing/accept.md

@@ -131,11 +131,15 @@ These products install or manage Chef on a remote instance. If a user has accept
 
 Test Kitchen isn't owned by or covered by the Chef license, but installing Chef Infra Client on a test instance is covered by the EULA. Without accepting the license, the converge will fail on the test instance.
 
-The Chef provisioner in Test Kitchen \>= 2.3 has been updated to simplify accepting this license on behalf of the test instance. Users can set the `CHEF_LICENSE` environment variable or add `chef_license: accept` to their provisioner config in their **kitchen.yml**. Specifying **accept** will attempt to persist the license acceptance locally. If a local license marker file is detected, no configuration is required; acceptance is automatically transferred to the test instance.
+The Chef provisioner in Test Kitchen \>= 2.3 has been updated to simplify accepting this license on behalf of the test instance.
+Users can set the `CHEF_LICENSE` environment variable or add `chef_license: accept` to their provisioner config in the `kitchen.yml` file.
+If you specify `accept`, Test Kitchen will attempt to persist the license acceptance locally.
+If Test Kitchen detects a local license marker file, no configuration is required; acceptance is automatically transferred to the test instance.
 
 To disable this persistence, specify `accept-no-persist` on every test instance converge.
 
-`kitchen-inspec` uses Chef InSpec as a library, and isn't covered by the EULA when installed as a gem, but is covered by the EULA when packaged as part of the Chef Workstation installation. Accept the license in a similar way to the Chef Infra Client license - specify the `CHEF_LICENSE` environment variable, specify the `chef_license` config under the verifier section in `kitchen.yml` or persist the acceptance locally.
+`kitchen-inspec` uses Chef InSpec as a library and isn't covered by the EULA when installed as a gem, but is covered by the EULA when packaged as part of the Chef Workstation installation.
+Accept the license in a similar way to the Chef Infra Client license - specify the `CHEF_LICENSE` environment variable, specify the `chef_license` config under the verifier section in `kitchen.yml` or persist the acceptance locally.
 
 ##### Test Kitchen: Pin to Chef 14
 

content/licensing/add_license.md

@@ -0,0 +1,20 @@
++++
+title = "Add a Chef License ID"
+draft = false
+gh_repo = "chef-web-docs"
+
+[menu]
+  [menu.overview]
+    title = "Add License"
+    identifier = "overview/licensing/Add License"
+    parent = "overview/licensing"
+    weight = 30
++++
+
+The following products require a Chef License key to run.
+
+## Chef InSpec
+
+Upon installation of Chef InSpec 6, you must [accept Progress Chef EULA](/licensing/accept/) and then activate the product with a license key.
+Chef InSpec 6 doesn't run without accepting the EULA and a license.
+You can find your existing license key on the [customer support portal](https://community.progress.com/s/products-list).

go.mod

@@ -1,6 +1,6 @@
 module github.com/chef/chef-web-docs
 
-go 1.16
+go 1.18
 
 require (
 	github.com/chef/automate/components/docs-chef-io v0.0.0-20230906170447-b3729eb32ec0 // indirect