Merge branch 'main' into im/search

chef · Nov 20, 2024 · 56dcafb · 56dcafb
2 parents 42f7519 + 9254b1c
commit 56dcafb
Show file tree

Hide file tree

Showing 24 changed files with 911 additions and 74 deletions.
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/...ub.com/chef/supermarket/docs-chef-io/content/supermarket/supermarket_upgrade.md b/...ub.com/chef/supermarket/docs-chef-io/content/supermarket/supermarket_upgrade.md
diff --git a/...tat-sh/habitat/components/docs-chef-io/content/habitat/environment_variables.md b/...tat-sh/habitat/components/docs-chef-io/content/habitat/environment_variables.md
diff --git a/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md b/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md
diff --git a/_vendor/modules.txt b/_vendor/modules.txt
@@ -1,17 +1,17 @@
 # github.com/chef/automate/components/docs-chef-io v0.0.0-20240926130942-4b98d9cf92f6
 # github.com/chef/desktop-config/docs-chef-io v0.0.0-20240814044820-5af667d41a43
-# github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20240410132404-ec6d25dc198b
+# github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20241119140456-8605fc35e9b2
 # github.com/chef/chef-server/docs-chef-io v0.0.0-20240920053744-03b58ff14f46
-# github.com/inspec/inspec/docs-chef-io v0.0.0-20240826082411-e34d735e7a5f
+# github.com/inspec/inspec/docs-chef-io v0.0.0-20241105131042-f05b389794c9
 # github.com/inspec/inspec-alicloud/docs-chef-io v0.0.0-20240122032124-a1d2a214e170
 # github.com/inspec/inspec-aws/docs-chef-io v0.0.0-20240122032232-049dcf822eef
 # 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/supermarket/docs-chef-io v0.0.0-20240813060856-d5395bd98710
+# 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-20241024083927-f5e6fa3425ae
+# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241106111500-6a8759e49b64
 # 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-20241119200251-e9924c9d1278

diff --git a/assets/release-notes/habitat/release-versions.json b/assets/release-notes/habitat/release-versions.json
@@ -37,5 +37,6 @@
   "1.6.607",
   "1.6.652",
   "1.6.826",
-  "1.6.1041"
+  "1.6.1041",
+  "1.6.1215"
 ]
diff --git a/config/_default/params.toml b/config/_default/params.toml
@@ -20,6 +20,16 @@ menuOrder = [
 
 robots = ''
 
+# sitemaps lists sitemaps that are indexed by the main sitemap layout.
+# see:
+# - layouts/_default/sitemap.xml
+# - layouts/_default/home.sitemap-main.xml
+
+sitemaps = [
+  "https://docs.chef.io/sitemap-main.xml",
+  "https://docs.chef.io/360/1.0/sitemap.xml"
+]
+
 [chef-web-docs]
   gh_path = "https://github.com/chef/chef-web-docs/blob/main/content/"
 

diff --git a/content/habitat/habitat_cli.md b/content/habitat/habitat_cli.md
@@ -18,7 +18,7 @@ The commands for the Chef Habitat CLI (`hab`) are listed below.
 
 | Applies to Version | Last Updated |
 | ------- | ------------ |
-| hab 1.6.1041/20240411141804 (linux) | 11 Apr 2024 |
+| hab 1.6.1215/20241115182310 (linux) | 15 Nov 2024 |
 
 ## hab
 
@@ -96,7 +96,7 @@ hab bldr <SUBCOMMAND>
 | Command | Description |
 | ------- | ----------- |
 | [hab bldr channel](#hab-bldr-channel) | Commands relating to Habitat Builder channels |
-| [hab bldr job](#hab-bldr-job) | Commands relating to Habitat Builder jobs |
+| [hab bldr job](#hab-bldr-job) | REMOVED: Commands relating to Habitat Builder jobs |
 ---
 
 ### hab bldr channel
@@ -306,7 +306,7 @@ hab bldr channel promote [OPTIONS] <SOURCE_CHANNEL> <TARGET_CHANNEL> --origin <O
 
 ### hab bldr job
 
-Commands relating to Habitat Builder jobs
+REMOVED: Commands relating to Habitat Builder jobs
 
 **USAGE**
 
@@ -328,16 +328,16 @@ hab bldr job <SUBCOMMAND>
 
 | Command | Description |
 | ------- | ----------- |
-| [hab bldr job cancel](#hab-bldr-job-cancel) | Cancel a build job group and any in-progress builds |
-| [hab bldr job demote](#hab-bldr-job-demote) | Demote packages from a completed build job from a specified channel |
-| [hab bldr job promote](#hab-bldr-job-promote) | Promote packages from a completed build job to a specified channel |
-| [hab bldr job start](#hab-bldr-job-start) | Schedule a build job or group of jobs |
-| [hab bldr job status](#hab-bldr-job-status) | Get the status of one or more job groups |
+| [hab bldr job cancel](#hab-bldr-job-cancel) | REMOVED: Cancel a build job group and any in-progress builds |
+| [hab bldr job demote](#hab-bldr-job-demote) | REMOVED: Demote packages from a completed build job from a specified channel |
+| [hab bldr job promote](#hab-bldr-job-promote) | REMOVED: Promote packages from a completed build job to a specified channel |
+| [hab bldr job start](#hab-bldr-job-start) | REMOVED: Schedule a build job or group of jobs |
+| [hab bldr job status](#hab-bldr-job-status) | REMOVED: Get the status of one or more job groups |
 ---
 
 ### hab bldr job cancel
 
-Cancel a build job group and any in-progress builds
+REMOVED: Cancel a build job group and any in-progress builds
 
 **USAGE**
 
@@ -372,7 +372,7 @@ hab bldr job cancel [FLAGS] [OPTIONS] <GROUP_ID>
 
 ### hab bldr job demote
 
-Demote packages from a completed build job from a specified channel
+REMOVED: Demote packages from a completed build job from a specified channel
 
 **USAGE**
 
@@ -409,7 +409,7 @@ hab bldr job demote [FLAGS] [OPTIONS] <GROUP_ID> <CHANNEL>
 
 ### hab bldr job promote
 
-Promote packages from a completed build job to a specified channel
+REMOVED: Promote packages from a completed build job to a specified channel
 
 **USAGE**
 
@@ -446,7 +446,7 @@ hab bldr job promote [FLAGS] [OPTIONS] <GROUP_ID> <CHANNEL>
 
 ### hab bldr job start
 
-Schedule a build job or group of jobs
+REMOVED: Schedule a build job or group of jobs
 
 **USAGE**
 
@@ -482,7 +482,7 @@ hab bldr job start [FLAGS] [OPTIONS] <PKG_IDENT> [PKG_TARGET]
 
 ### hab bldr job status
 
-Get the status of one or more job groups
+REMOVED: Get the status of one or more job groups
 
 **USAGE**
 
@@ -1825,10 +1825,11 @@ hab pkg build [FLAGS] [OPTIONS] <PLAN_CONTEXT>
 **OPTIONS**
 
 ```
---cache-key-path <CACHE_KEY_PATH>    Cache for creating and searching for encryption keys [env: HAB_CACHE_KEY_PATH=]  [default: /hab/cache/keys]
--k, --keys <HAB_ORIGIN_KEYS>             Installs secret origin keys (ex: "unicorn", "acme,other,acme-ops")
--r, --root <HAB_STUDIO_ROOT>             Sets the Studio root (default: /hab/studios/<DIR_NAME>)
--s, --src <SRC_PATH>                     Sets the source path (default: $PWD)
+--cache-key-path <CACHE_KEY_PATH>      Cache for creating and searching for encryption keys [env: HAB_CACHE_KEY_PATH=]  [default: /hab/cache/keys]
+-k, --keys <HAB_ORIGIN_KEYS>               Installs secret origin keys (ex: "unicorn", "acme,other,acme-ops")
+-r, --root <HAB_STUDIO_ROOT>               Sets the Studio root (default: /hab/studios/<DIR_NAME>)
+-f, --refresh-channel <REFRESH_CHANNEL>    Channel used to retrieve plan dependencies for Chef supported origins env: HAB_REFRESH_CHANNEL=]  [default: stable]
+-s, --src <SRC_PATH>                       Sets the source path (default: $PWD)
 ```
 
 **ARGS**
@@ -2245,6 +2246,7 @@ hab pkg install [FLAGS] [OPTIONS] <PKG_IDENT_OR_ARTIFACT>...
 -b, --binlink                Binlink all binaries from installed package(s) into BINLINK_DIR
 -f, --force                  Overwrite existing binlinks
     --ignore-install-hook    Do not run any install hooks
+    --ignore-local           Do not use locally-installed packages when a corresponding package cannot be installed from Builder
 -h, --help                   Prints help information
 -V, --version                Prints version information
 ```

diff --git a/content/habitat/service_templates.md b/content/habitat/service_templates.md
@@ -1,7 +1,7 @@
 +++
 title = "Service Template Data"
 
-date = 2024-04-11T15:19:34.317Z
+date = 2024-11-15T19:26:21.695Z
 draft = false
 
 [menu]

diff --git a/content/release_notes_client.md b/content/release_notes_client.md
@@ -12,5 +12,5 @@ toc_layout = "release_notes_toc"
     title = "Chef Infra Client"
     identifier = "release_notes/release_notes_client.md Chef Infra Client"
     parent = "release_notes"
-    weight = 50
+    weight = 60
 +++