Skip to content

Commit 56dcafb

Browse files
authored
Merge branch 'main' into im/search
2 parents 42f7519 + 9254b1c commit 56dcafb

File tree

24 files changed

+911
-74
lines changed

24 files changed

+911
-74
lines changed

_vendor/github.com/chef/compliance-profiles/docs-chef-io/content/release_notes_compliance_profiles.md

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/chef/supermarket/docs-chef-io/content/supermarket/supermarket_upgrade.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/habitat-sh/habitat/components/docs-chef-io/content/habitat/environment_variables.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# github.com/chef/automate/components/docs-chef-io v0.0.0-20240926130942-4b98d9cf92f6
22
# github.com/chef/desktop-config/docs-chef-io v0.0.0-20240814044820-5af667d41a43
3-
# github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20240410132404-ec6d25dc198b
3+
# github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20241119140456-8605fc35e9b2
44
# github.com/chef/chef-server/docs-chef-io v0.0.0-20240920053744-03b58ff14f46
5-
# github.com/inspec/inspec/docs-chef-io v0.0.0-20240826082411-e34d735e7a5f
5+
# github.com/inspec/inspec/docs-chef-io v0.0.0-20241105131042-f05b389794c9
66
# github.com/inspec/inspec-alicloud/docs-chef-io v0.0.0-20240122032124-a1d2a214e170
77
# github.com/inspec/inspec-aws/docs-chef-io v0.0.0-20240122032232-049dcf822eef
88
# github.com/inspec/inspec-azure/docs-chef-io v0.0.0-20240122032234-c1394fc25525
99
# github.com/inspec/inspec-habitat/docs-chef-io v0.0.0-20220218210405-bfd542da49fd
1010
# github.com/inspec/inspec-k8s/docs-chef-io v0.0.0-20240122032042-421355eaf502
1111
# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240809064339-878cb76b2b66
12-
# github.com/chef/supermarket/docs-chef-io v0.0.0-20240813060856-d5395bd98710
12+
# github.com/chef/supermarket/docs-chef-io v0.0.0-20241105172430-a362eded8f72
1313
# github.com/chef/effortless/docs-chef-io v0.0.0-20230711123605-c8beb79aba4f
14-
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241024083927-f5e6fa3425ae
14+
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241106111500-6a8759e49b64
1515
# github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20240313054833-ebbc45209efa
1616
# github.com/chef/license-service/docs-chef-io v0.0.0-20231117105514-d3f3d53ba2dd
1717
# github.com/chef/chef-docs-theme v0.0.0-20241119200251-e9924c9d1278

assets/release-notes/habitat/release-versions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@
3737
"1.6.607",
3838
"1.6.652",
3939
"1.6.826",
40-
"1.6.1041"
40+
"1.6.1041",
41+
"1.6.1215"
4142
]

config/_default/params.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ menuOrder = [
2020

2121
robots = ''
2222

23+
# sitemaps lists sitemaps that are indexed by the main sitemap layout.
24+
# see:
25+
# - layouts/_default/sitemap.xml
26+
# - layouts/_default/home.sitemap-main.xml
27+
28+
sitemaps = [
29+
"https://docs.chef.io/sitemap-main.xml",
30+
"https://docs.chef.io/360/1.0/sitemap.xml"
31+
]
32+
2333
[chef-web-docs]
2434
gh_path = "https://github.com/chef/chef-web-docs/blob/main/content/"
2535

content/habitat/habitat_cli.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The commands for the Chef Habitat CLI (`hab`) are listed below.
1818

1919
| Applies to Version | Last Updated |
2020
| ------- | ------------ |
21-
| hab 1.6.1041/20240411141804 (linux) | 11 Apr 2024 |
21+
| hab 1.6.1215/20241115182310 (linux) | 15 Nov 2024 |
2222

2323
## hab
2424

@@ -96,7 +96,7 @@ hab bldr <SUBCOMMAND>
9696
| Command | Description |
9797
| ------- | ----------- |
9898
| [hab bldr channel](#hab-bldr-channel) | Commands relating to Habitat Builder channels |
99-
| [hab bldr job](#hab-bldr-job) | Commands relating to Habitat Builder jobs |
99+
| [hab bldr job](#hab-bldr-job) | REMOVED: Commands relating to Habitat Builder jobs |
100100
---
101101

102102
### hab bldr channel
@@ -306,7 +306,7 @@ hab bldr channel promote [OPTIONS] <SOURCE_CHANNEL> <TARGET_CHANNEL> --origin <O
306306

307307
### hab bldr job
308308

309-
Commands relating to Habitat Builder jobs
309+
REMOVED: Commands relating to Habitat Builder jobs
310310

311311
**USAGE**
312312

@@ -328,16 +328,16 @@ hab bldr job <SUBCOMMAND>
328328

329329
| Command | Description |
330330
| ------- | ----------- |
331-
| [hab bldr job cancel](#hab-bldr-job-cancel) | Cancel a build job group and any in-progress builds |
332-
| [hab bldr job demote](#hab-bldr-job-demote) | Demote packages from a completed build job from a specified channel |
333-
| [hab bldr job promote](#hab-bldr-job-promote) | Promote packages from a completed build job to a specified channel |
334-
| [hab bldr job start](#hab-bldr-job-start) | Schedule a build job or group of jobs |
335-
| [hab bldr job status](#hab-bldr-job-status) | Get the status of one or more job groups |
331+
| [hab bldr job cancel](#hab-bldr-job-cancel) | REMOVED: Cancel a build job group and any in-progress builds |
332+
| [hab bldr job demote](#hab-bldr-job-demote) | REMOVED: Demote packages from a completed build job from a specified channel |
333+
| [hab bldr job promote](#hab-bldr-job-promote) | REMOVED: Promote packages from a completed build job to a specified channel |
334+
| [hab bldr job start](#hab-bldr-job-start) | REMOVED: Schedule a build job or group of jobs |
335+
| [hab bldr job status](#hab-bldr-job-status) | REMOVED: Get the status of one or more job groups |
336336
---
337337

338338
### hab bldr job cancel
339339

340-
Cancel a build job group and any in-progress builds
340+
REMOVED: Cancel a build job group and any in-progress builds
341341

342342
**USAGE**
343343

@@ -372,7 +372,7 @@ hab bldr job cancel [FLAGS] [OPTIONS] <GROUP_ID>
372372

373373
### hab bldr job demote
374374

375-
Demote packages from a completed build job from a specified channel
375+
REMOVED: Demote packages from a completed build job from a specified channel
376376

377377
**USAGE**
378378

@@ -409,7 +409,7 @@ hab bldr job demote [FLAGS] [OPTIONS] <GROUP_ID> <CHANNEL>
409409

410410
### hab bldr job promote
411411

412-
Promote packages from a completed build job to a specified channel
412+
REMOVED: Promote packages from a completed build job to a specified channel
413413

414414
**USAGE**
415415

@@ -446,7 +446,7 @@ hab bldr job promote [FLAGS] [OPTIONS] <GROUP_ID> <CHANNEL>
446446

447447
### hab bldr job start
448448

449-
Schedule a build job or group of jobs
449+
REMOVED: Schedule a build job or group of jobs
450450

451451
**USAGE**
452452

@@ -482,7 +482,7 @@ hab bldr job start [FLAGS] [OPTIONS] <PKG_IDENT> [PKG_TARGET]
482482

483483
### hab bldr job status
484484

485-
Get the status of one or more job groups
485+
REMOVED: Get the status of one or more job groups
486486

487487
**USAGE**
488488

@@ -1825,10 +1825,11 @@ hab pkg build [FLAGS] [OPTIONS] <PLAN_CONTEXT>
18251825
**OPTIONS**
18261826

18271827
```
1828-
--cache-key-path <CACHE_KEY_PATH> Cache for creating and searching for encryption keys [env: HAB_CACHE_KEY_PATH=] [default: /hab/cache/keys]
1829-
-k, --keys <HAB_ORIGIN_KEYS> Installs secret origin keys (ex: "unicorn", "acme,other,acme-ops")
1830-
-r, --root <HAB_STUDIO_ROOT> Sets the Studio root (default: /hab/studios/<DIR_NAME>)
1831-
-s, --src <SRC_PATH> Sets the source path (default: $PWD)
1828+
--cache-key-path <CACHE_KEY_PATH> Cache for creating and searching for encryption keys [env: HAB_CACHE_KEY_PATH=] [default: /hab/cache/keys]
1829+
-k, --keys <HAB_ORIGIN_KEYS> Installs secret origin keys (ex: "unicorn", "acme,other,acme-ops")
1830+
-r, --root <HAB_STUDIO_ROOT> Sets the Studio root (default: /hab/studios/<DIR_NAME>)
1831+
-f, --refresh-channel <REFRESH_CHANNEL> Channel used to retrieve plan dependencies for Chef supported origins env: HAB_REFRESH_CHANNEL=] [default: stable]
1832+
-s, --src <SRC_PATH> Sets the source path (default: $PWD)
18321833
```
18331834

18341835
**ARGS**
@@ -2245,6 +2246,7 @@ hab pkg install [FLAGS] [OPTIONS] <PKG_IDENT_OR_ARTIFACT>...
22452246
-b, --binlink Binlink all binaries from installed package(s) into BINLINK_DIR
22462247
-f, --force Overwrite existing binlinks
22472248
--ignore-install-hook Do not run any install hooks
2249+
--ignore-local Do not use locally-installed packages when a corresponding package cannot be installed from Builder
22482250
-h, --help Prints help information
22492251
-V, --version Prints version information
22502252
```

content/habitat/service_templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
+++
22
title = "Service Template Data"
33

4-
date = 2024-04-11T15:19:34.317Z
4+
date = 2024-11-15T19:26:21.695Z
55
draft = false
66

77
[menu]

content/release_notes_client.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ toc_layout = "release_notes_toc"
1212
title = "Chef Infra Client"
1313
identifier = "release_notes/release_notes_client.md Chef Infra Client"
1414
parent = "release_notes"
15-
weight = 50
15+
weight = 60
1616
+++

0 commit comments

Comments
 (0)