Skip to content

Commit d25a0e4

Browse files
authored
Merge branch 'main' into WAF-351-Optimize-systems-Manage-costs
2 parents 0c02c1d + 8dca55d commit d25a0e4

File tree

6 files changed

+34
-8
lines changed

6 files changed

+34
-8
lines changed

CODEOWNERS

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,26 @@
3737
/content/well-architected-framework/ @hashicorp/well-architected-education-approvers
3838

3939
# HCP-docs documentation ownership
40-
/content/hcp-docs/* @hashicorp/education
40+
/content/hcp-docs/ @hashicorp/education
41+
/content/hcp-docs/img/docs/hcp-core/ @hashicorp/vault-education-approvers
4142

4243
# HCP Consul Docs
43-
/content/hcp-docs/content/docs/consul/* @hashicorp/consul-docs
44+
/content/hcp-docs/content/docs/consul/ @hashicorp/consul-docs
45+
/content/hcp-docs/img/docs/consul/ @hashicorp/consul-docs
4446

4547
# HCP Vault & HCP Vault Radar docs
4648
/content/hcp-docs/content/docs/vault* @hashicorp/vault-education-approvers
4749
/content/hcp-docs/content/partials/vault* @hashicorp/vault-education-approvers
50+
/content/hcp-docs/img/docs/vault* @hashicorp/vault-education-approvers
4851

4952
# HCP Boundary docs
50-
/content/hcp-docs/content/docs/boundary/* @hashicorp/boundary-education-approvers
53+
/content/hcp-docs/content/docs/boundary/ @hashicorp/boundary-education-approvers
54+
/content/hcp-docs/img/docs/boundary/ @hashicorp/boundary-education-approvers
5155

5256
#HCP IAM
53-
/content/hcp-docs/content/partials/hcp-administration/* @hashicorp/cloud-access-control @hashicorp/cloud-identity
54-
/content/hcp-docs/content/docs/hcp/iam/* @hashicorp/cloud-access-control @hashicorp/cloud-identity
57+
/content/hcp-docs/content/partials/hcp-administration/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
58+
/content/hcp-docs/content/docs/hcp/iam/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
59+
/content/hcp-docs/content/img/docs/hcp-core/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
5560

5661
# Boundary
57-
/content/boundary/* @hashicorp/boundary-education-approvers @hashicorp/boundary
62+
/content/boundary/ @hashicorp/boundary-education-approvers @hashicorp/boundary

content/terraform-docs-common/redirects.jsonc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,28 @@
543543
"destination": "/terraform/language/v:version/validate",
544544
"permanent": true
545545
},
546+
// Custom conditions → validate
547+
{
548+
"source": "/terraform/language/expressions/custom-conditions",
549+
"destination": "/terraform/language/validate",
550+
"permanent": true
551+
},
552+
{
553+
"source": "/terraform/language/v:version(1\\.(?:[1-9]|1[01])\\.x)/validate",
554+
"destination": "/terraform/language/v:version/expressions/custom-conditions",
555+
"permanent": true
556+
},
557+
{
558+
"source": "/terraform/language/v:version((?:1\\.(?:1[2-9]|[2-9]\\d)|[2-9]\\d*\\.\\d+)\\.x)/expressions/custom-conditions",
559+
"destination": "/terraform/language/v:version/validate",
560+
"permanent": true
561+
},
562+
// Catch reference page going backwards
563+
{
564+
"source": "/terraform/language/v:version(1\\.(?:[1-9]|1[01])\\.x)/block/check",
565+
"destination": "/terraform/language/v:version/checks",
566+
"permanent": true
567+
},
546568
// values → parameterize
547569
{
548570
"source": "/terraform/language/values",

content/vault/v1.21.x/content/docs/enterprise/namespaces/namespace-structure.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,5 +386,4 @@ repeatable processes, and reduce human error.
386386
To learn more, review the following tutorials:
387387

388388
- [Secure multi-tenancy with namespaces](/vault/tutorials/enterprise/namespaces)
389-
- [Vault recommended patterns](/vault/tutorials/recommended-patterns)
390-
- [Vault standard operating procedures](/vault/tutorials/standard-procedures)
389+
- [Manage secrets across namespaces](/vault/tutorials/enterprise/namespaces-secrets-sharing)
-75.1 KB
Binary file not shown.
-55.1 KB
Binary file not shown.
-62.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)