Merge branch 'main' into jfm/chef-removing-windows-2012-support

chef · Dec 13, 2024 · a7b97e7 · a7b97e7
2 parents 3f08280 + d9f1cd5
commit a7b97e7
Show file tree

Hide file tree

Showing 11 changed files with 181 additions and 168 deletions.
diff --git a/...m/chef/chef-workstation/docs-chef-io/content/workstation/install_workstation.md b/...m/chef/chef-workstation/docs-chef-io/content/workstation/install_workstation.md
diff --git a/.../github.com/chef/chef-workstation/docs-chef-io/content/workstation/knife_ssh.md b/.../github.com/chef/chef-workstation/docs-chef-io/content/workstation/knife_ssh.md
diff --git a/...f/compliance-profiles/docs-chef-io/content/release_notes_compliance_profiles.md b/...f/compliance-profiles/docs-chef-io/content/release_notes_compliance_profiles.md
diff --git a/_vendor/modules.txt b/_vendor/modules.txt
@@ -8,10 +8,10 @@
 # github.com/inspec/inspec-azure/docs-chef-io v0.0.0-20240122032234-c1394fc25525
 # github.com/inspec/inspec-habitat/docs-chef-io v0.0.0-20220218210405-bfd542da49fd
 # github.com/inspec/inspec-k8s/docs-chef-io v0.0.0-20240122032042-421355eaf502
-# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240809064339-878cb76b2b66
+# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20241212065721-f1621731d636
 # github.com/chef/supermarket/docs-chef-io v0.0.0-20241105172430-a362eded8f72
 # github.com/chef/effortless/docs-chef-io v0.0.0-20230711123605-c8beb79aba4f
-# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241106111500-6a8759e49b64
+# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241211025148-fb9cb1f3e2bc
 # github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20240313054833-ebbc45209efa
 # github.com/chef/license-service/docs-chef-io v0.0.0-20231117105514-d3f3d53ba2dd
 # github.com/chef/chef-docs-theme v0.0.0-20241206202643-d5ef90c514a1

diff --git a/content/azure_chef_cli.md b/content/azure_chef_cli.md
@@ -22,8 +22,8 @@ Windows PowerShell cmdlets and two Microsoft Azure CLI commands.
 
 If the Microsoft Azure [cross-platform command line tool
 (Xplat-CLI)](https://github.com/Azure/azure-xplat-cli) is installed on
-the workstation, along with the Azure Chef Extension, the `get-chef` and
-`set-chef` extensions may be used to manage Chef running on virtual
+the workstation along with the Azure Chef Extension, you can use the `get-chef` and
+`set-chef` extensions to manage Chef running on virtual
 machines in Microsoft Azure.
 
 ### get-chef
@@ -125,7 +125,7 @@ azure vm extension set-chef your-vm-name --validation-pem ~/chef-repo/.chef/test
 azure vm extension set-chef your-vm-name --validation-pem ~/chef-repo/.chef/testorg-validator.pem --client-config ~/chef-repo/.chef/client.rb --version "1201.12" -R 'recipe[your_cookbook_name::your_recipe_name]'
 ```
 
-##### Azure Resource Manager (ARM) Templates
+##### Azure Resource Manager (ARM) templates
 
 If you are using Azure Resource Manager templates to create your infrastructure you can use the Chef extension to have Azure handle the bootstrapping/configuration of your node to your Chef Infra Server.
 
@@ -222,7 +222,7 @@ The extension has the following options that can be provided in the
 
 : Verify the SSL certificate on the Chef Infra Server. When `true`, Chef Infra Client always verifies the SSL certificate. When `false`, Chef Infra Client uses the value of `ssl_verify_mode` to determine if the SSL certificate requires verification.
 
-#### Protected Settings
+#### Protected settings
 
 The following options can be provided to the extension through the `protectedSettings` hash:
 
@@ -240,9 +240,9 @@ The following options can be provided to the extension through the `protectedSet
 
 ### Examples
 
-The following examples show how Chef Infra Client can be installed and configured from an ARM template.
+The following examples show how you can install and configure Chef Infra Client from an ARM template.
 
-#### Installing the Azure Chef extension on a Linux system
+#### Install the Azure Chef extension on a Linux system
 
 ```json
 {
@@ -270,7 +270,7 @@ The following examples show how Chef Infra Client can be installed and configure
  }
 ```
 
-#### Installing the Azure Chef extension on a Windows system
+#### Install the Azure Chef extension on a Windows system
 
 ```json
 {
@@ -289,7 +289,7 @@ The following examples show how Chef Infra Client can be installed and configure
         "validation_client_name": "my-chef-organization-validator"
       },
       "runlist": "recipe[awesome_customers_windows],recipe[iis],role[windows_base]",
-      "chef_package_url" : "https://my.packages.chef.io/chef-client-15.11.8-1-x64.msi",
+      "chef_package_url" : "https://download.example.com/chef-client-15.11.8-1-x64.msi",
       "validation_key_format": "plaintext"
     },
     "protectedSettings": {
@@ -299,7 +299,7 @@ The following examples show how Chef Infra Client can be installed and configure
 }
 ```
 
-#### Installing the Azure Chef extension on a Linux system with SSL peer verification turned off and given a data bag secret
+#### Install the Azure Chef extension on a Linux system with SSL peer verification turned off and given a data bag secret
 
 ```json
 {
@@ -331,6 +331,6 @@ The following examples show how Chef Infra Client can be installed and configure
 
 {{< note >}}
 
-Here we're also base64 encoding our validator key which is a recommended approach when using the Azure Chef extension in an ARM template
+In this example the validator key is base64 encoded, which is a recommended approach when using the Azure Chef extension in an ARM template.
 
 {{< /note >}}
diff --git a/content/download/_index.md b/content/download/_index.md
@@ -3,6 +3,8 @@ title = "Download Chef Tools"
 draft = false
 gh_repo = "chef-web-docs"
 
+aliases = ["/downloads"]
+
 [cascade]
   product = []