Update content

Signed-off-by: Ian Maddaus <ian.maddaus@progress.com>

config/_default/menu.toml

@@ -64,8 +64,8 @@ weight = 20
   weight = 20
 
     [[overview]]
-    title = "Reference"
-    identifier = "overview/licensing/reference"
+    title = "Private Licensing Service"
+    identifier = "overview/licensing/private"
     parent = "overview/licensing"
     weight = 999
 

config/_default/params.toml

@@ -7,3 +7,6 @@ robots = ''
 
 [chef-web-docs]
   gh_path = "https://github.com/chef/chef-web-docs/blob/main/content/"
+
+[license-service]
+gh_path = "https://github.com/chef/license-service/tree/main/docs-chef-io/content/"

content/license/_index.md → content/licensing/_index.md

@@ -2,7 +2,7 @@
 title = "About Chef Licenses"
 draft = false
 gh_repo = "chef-web-docs"
-aliases = ["/chef_license.html"]
+aliases = ["/chef_license.html", "/chef_license/", "/license/"]
 
 [cascade]
   product = ["automate", "client", "server", "habitat", "inspec", "supermarket", "workstation"]
@@ -17,7 +17,7 @@ aliases = ["/chef_license.html"]
 
 With the release of Chef InSpec 6, we are 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 which adapts to their specific DevOps scenarios.
 
-For all products, including Chef InSpec 6 and higher, the existing Progress Chef [EULA][EULA] still applies and is unchanged. The Progress Chef EULA covers the usage of the product distribution. Licensing and reuse of open source code is described in the section below [LINK].
+For all products, including Chef InSpec 6 and higher, the existing [Progress Chef End-User License Agreement](https://www.chef.io/end-user-license-agreement) (EULA) still applies and is unchanged. The Progress Chef EULA covers the usage of the product distribution. Licensing and reuse of open source code is described in the section below [LINK].
 
 Source code reuse is unchanged and follows the Apache 2.0 model as described below for open source products and repositories from Progress Chef.
 
@@ -27,7 +27,7 @@ The commercial distributions of our products--such as Chef Infra Client, Chef Ha
 
 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](https://docs.chef.io/versions/) to understand which license applies.
 
-## Overview of new license types
+## Overview of license types
 
 For Chef InSpec 6 and higher, there are three new end-user licenses which govern usage and come with different entitlements: a free license, a trial license, and a commercial license. Upon installation of the Chef InSpec product distribution, the end-user accepts the basic Progress Chef [EULA][EULA] and then must activate the product with one of these new additional licenses. Chef InSpec 6 will not run without at least one of these licenses being applied. Each license type has different entitlements and permission grants based on the customer's intended usage.
 
@@ -37,7 +37,7 @@ For Chef InSpec 6 and higher, there are three new end-user licenses which govern
 | Trial | Initial 30-day license renewable up to 90 days | Free | Advanced functionality enabled | Non-production workloads | Community support in Slack and solution architect support | Some features and scale may be restricted | Individual within an organization | Evaluate products in a non-production environment organization or company |
 | Commercial | Duration of contract, renewable and upgradable | Paid | Advanced functionality enabled | Production and Non-production workloads | Support per contract | Full product(s) and content per contract | Professional DevOps Engineer within an organization | 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).
+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) are not affected by this license change.
 
@@ -47,9 +47,9 @@ The Progress Chef EULA requires basic license information to be transmitted to C
 
 The licensed customer may opt in to additional telemetry and usage data being sent back to Chef. This telemetry is used to tailor recommendations to customers, develop new features, and optimize the customer experience. Can the customer see this data? Can they opt-in / out regularly? Link to another article on what this is, maybe the telemetry service?
 
-## Reuse Progress Chef as open source
+## Open source licensing
 
-Reuse of source code from the Progress Chef projects--including Chef Infra Client ("chef"), Chef InSpec, and Chef Habitat--is governed by the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) (unless specified in the repository otherwise) and source code is released publicly through repositories in these organizations:
+Reuse of source code from the Progress Chef projects——including Chef Infra Client ("chef"), Chef InSpec, and Chef Habitat——is governed by the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) (unless specified in the repository otherwise) and source code is released publicly through repositories in these organizations:
 
 - [Progress Chef](https://github.com/chef)
 - [Progress Chef InSpec](https://github.com/inspec)

content/license/terms.md → content/licensing/terms.md

@@ -1,26 +1,27 @@
 +++
 title = "Chef Licensing Terms"
-draft = true
+draft = false
 gh_repo = "chef-web-docs"
 
 [menu]
   [menu.overview]
     title = "Terms"
-    identifier = "overview/licensing/reference/Terms"
-    parent = "overview/licensing/reference"
+    identifier = "overview/licensing/Terms"
+    parent = "overview/licensing"
+    weight = 30
 +++
 
 Node
-: Individual component of your system, physical or virtual (for example, a server, workstation, IP router, virtual machine, or another device or component) that is assessed, installed, configured, updated, scanned and/or managed using any Chef product.
+: An individual component of your system, physical or virtual (for example, a server, workstation, IP router, virtual machine, or another device or component) that is assessed, installed, configured, updated, scanned and/or managed using any Chef product.
 
 Scan
-: Rules based of Inspection of a target. There can be many number of scans applied on a target.
+: A rules-based inspection of a target. There can be many scans applied to a target.
 
 Target
 : Each instance of infrastructure, software, configuration, cloud accounts, container hosts, or other technical resource that is the compliance target of one or more Chef InSpec profiles used by you. Each target can access a resource with its credentials and locations.
 
 Subscription License
-: One of the license types that continue until the expiration of the subscription period identified in the order, unless earlier terminated in accordance with the terms of the EULA.
+: One of the license types that continue until the expiration of the subscription period identified in the order, unless earlier terminated in accordance with the terms of the [Progress Chef End User License Agreement](https://www.chef.io/end-user-license-agreement).
 
 Licensed Unit
 : "License Unit" types/metrics include node, entitled content, service instance, target and/or endpoint.
@@ -39,7 +40,7 @@ Commercial Users
 
 Community Users
 : [Open Source] CINC Users. [Free] Infra <= 12, Inspec <= 3
-: Users that use older versions of Chef open-source software or downstream OSS distributions of Chef (CINC).
+  Users that use older versions of Chef open-source software or downstream OSS distributions of Chef (CINC).
 
 Open Source
 : Chef Code available to all under Apache License, Version 2.0. This is not same as access to any licensed Chef products or free Chef products.

content/release_notes_private_licensing_service.md

@@ -0,0 +1,10 @@
++++
+title = "Chef Private Licensing Service"
+draft = false
+
+[menu]
+  [menu.release_notes]
+    title = "Private Licensing Service"
+    identifier = "release_notes/private licensing service"
+    parent = "release_notes"
++++