fix merge conflicts

Author: trujillo-adam

CODEOWNERS

@@ -37,21 +37,26 @@
 /content/well-architected-framework/ @hashicorp/well-architected-education-approvers
 
 # HCP-docs documentation ownership
-/content/hcp-docs/* @hashicorp/education
+/content/hcp-docs/ @hashicorp/education
+/content/hcp-docs/img/docs/hcp-core/ @hashicorp/vault-education-approvers
 
 # HCP Consul Docs
-/content/hcp-docs/content/docs/consul/* @hashicorp/consul-docs
+/content/hcp-docs/content/docs/consul/ @hashicorp/consul-docs
+/content/hcp-docs/img/docs/consul/ @hashicorp/consul-docs
 
 # HCP Vault & HCP Vault Radar docs
 /content/hcp-docs/content/docs/vault* @hashicorp/vault-education-approvers
 /content/hcp-docs/content/partials/vault* @hashicorp/vault-education-approvers
+/content/hcp-docs/img/docs/vault* @hashicorp/vault-education-approvers
 
 # HCP Boundary docs
-/content/hcp-docs/content/docs/boundary/* @hashicorp/boundary-education-approvers
+/content/hcp-docs/content/docs/boundary/ @hashicorp/boundary-education-approvers
+/content/hcp-docs/img/docs/boundary/ @hashicorp/boundary-education-approvers
 
 #HCP IAM
-/content/hcp-docs/content/partials/hcp-administration/* @hashicorp/cloud-access-control @hashicorp/cloud-identity
-/content/hcp-docs/content/docs/hcp/iam/* @hashicorp/cloud-access-control @hashicorp/cloud-identity
+/content/hcp-docs/content/partials/hcp-administration/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
+/content/hcp-docs/content/docs/hcp/iam/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
+/content/hcp-docs/content/img/docs/hcp-core/ @hashicorp/cloud-access-control @hashicorp/cloud-identity
 
 # Boundary
-/content/boundary/* @hashicorp/boundary-education-approvers @hashicorp/boundary
+/content/boundary/ @hashicorp/boundary-education-approvers @hashicorp/boundary

content/boundary/v0.20.x/content/docs/client-agent/index.mdx

@@ -21,6 +21,14 @@ You must enable both IPv4 and IPv6 protocols for your environment to ensure the
 
 </Note>
 
+Currently HashiCorp tests the Client Agent on the following operating systems:
+
+- macOS 14
+- macOS 15
+- Windows 11
+
+Refer to the [Transparent sessions interoperability matrix](/boundary/docs/interoperability-matrix) for a list of third-party products that have been tested and confirmed to work with the Client Agent to provide transparent sessions.
+
 ## Security
 
 When you successfully authorize a session on a Boundary controller, the response includes a list of any brokered credentials, which include the decoded secrets.

content/boundary/v0.20.x/content/docs/deploy/self-managed/install-clients.mdx

@@ -27,7 +27,11 @@ The Boundary installer bundles together the following components:
 - Boundary Desktop Client app
 - Boundary Client Agent <sup>HCP/ENT</sup>
 
-Download the appropriate Boundary installer for your Windows, MacOS, or Linux environment from the [Install Boundary](/boundary/install#installer) downloads page or the [releases](https://releases.hashicorp.com/boundary-installer) page. You can also download the components individually, but compatibility is not guaranteed. Refer to the [Supported versions policy](/boundary/docs/enterprise/supported-versions#control-plane-and-client-cli-compatibility) to learn more.
+Download the appropriate Boundary installer for your Windows, MacOS, or Linux environment from the [Install Boundary](/boundary/install#installer) downloads page or the [releases](https://releases.hashicorp.com/boundary-installer) page.
+
+You can also download the components individually, but compatibility is not guaranteed. Refer to the [Supported versions policy](/boundary/docs/enterprise/supported-versions#control-plane-and-client-cli-compatibility) to learn more.
+
+Refer to the [Transparent sessions interoperability matrix](/boundary/docs/interoperability-matrix) for a list of third-party products that have been tested and confirmed to work with the Boundary Client Agent to provide transparent sessions.
 
 <Warning>
 
@@ -47,11 +51,9 @@ We recommend the following components for end users:
 
 Download these components for your Windows, MacOS, or Linux environment from the [Install Boundary](/boundary/install) downloads page or the [HashiCorp releases](https://releases.hashicorp.com/) page.
 
-<Warning>
-
 Client compatibility is not guaranteed. You should always ensure that your client is compatible with the version of the Boundary control plane you connect to. Refer to the [Supported versions policy](/boundary/docs/enterprise/supported-versions#control-plane-and-client-cli-compatibility) to learn more.
 
-</Warning>
+Refer to the [Transparent sessions interoperability matrix](/boundary/docs/interoperability-matrix) for a list of third-party products that have been tested and confirmed to work with the Boundary Client Agent to provide transparent sessions.
 
 To learn more about installing the Boundary CLI and Boundary Desktop Client app, refer to the [Get started with self-managed Boundary](/boundary/tutorials/get-started-community) tutorials.
 

content/boundary/v0.20.x/content/docs/interoperability-matrix/index.mdx

@@ -13,6 +13,12 @@ Transparent sessions require you to use the Boundary installer to install the Bo
 To support a variety of use cases, HashiCorp verifies implementation and integrations with partner products and applications.
 
 HashiCorp engineering has tested and confirmed that you can use the following third-party products with the specific versions of the Boundary installer, Boundary Client Agent, and any operating systems listed in the table.
+Currently HashiCorp tests the Client Agent on the following operating systems:
+
+- macOS 14
+- macOS 15
+- Windows 11
+
 Transparent sessions may operate with other versions of the products listed below or with other products, but they have not been tested.
 We will update the list of products as we test them.
 
@@ -54,7 +60,7 @@ Any patches or updates will be reflected in the minor number.
     <td style={{verticalAlign: 'middle'}}>
     <b>MacOS</b>: 14.6, 15.3
     <br />
-    <b>Windows</b>: 10 Pro, 11 Pro
+    <b>Windows</b>: 11 Pro
     </td>
     <td style={{verticalAlign: 'middle'}}>
     Refer to <a href="/boundary/docs/client-agent/conflicting-software#cloudflare-warp-client">Conflicting software</a>
@@ -78,7 +84,7 @@ Any patches or updates will be reflected in the minor number.
     <td style={{verticalAlign: 'middle'}}>
     <b>MacOS</b>: 14.6, 15.3
     <br />
-    <b>Windows</b>: 10 Pro, 11 Pro
+    <b>Windows</b>: 11 Pro
     </td>
     <td style={{verticalAlign: 'middle'}}>
     Refer to <a href="/boundary/docs/client-agent/conflicting-software#huntress-edr-client-windows">Conflicting software</a>
@@ -98,7 +104,7 @@ Any patches or updates will be reflected in the minor number.
     <td style={{verticalAlign: 'middle'}}>
     <b>MacOS</b>: 14, 15
     <br />
-    <b>Windows</b>: 10, 11 Pro
+    <b>Windows</b>: 11 Pro
     </td>
     <td style={{verticalAlign: 'middle'}}>
     &nbsp;
@@ -118,7 +124,7 @@ Any patches or updates will be reflected in the minor number.
     <td style={{verticalAlign: 'middle'}}>
     <b>MacOS</b>: 14, 15
     <br />
-    <b>Windows</b>: 10, 11
+    <b>Windows</b>: 11
     </td>
     <td style={{verticalAlign: 'middle'}}>
     &nbsp;
@@ -138,7 +144,7 @@ Any patches or updates will be reflected in the minor number.
     <td style={{verticalAlign: 'middle'}}>
     <b>MacOS</b>: 14, 15.2
     <br />
-    <b>Windows</b>: 10, 11
+    <b>Windows</b>: 11
     </td>
     <td style={{verticalAlign: 'middle'}}>
     &nbsp;

content/hcp-docs/content/docs/vault/logs-metrics/cloudwatch/logs.mdx

@@ -20,8 +20,8 @@ clusters.
 To configure audit logs streaming to Amazon CloudWatch, you will need
 to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - Access to AWS with permission to create IAM policies and users
 
    <Note>

content/hcp-docs/content/docs/vault/logs-metrics/cloudwatch/metrics.mdx

@@ -23,8 +23,8 @@ clusters.
 To configure metric streaming to Amazon CloudWatch, you will need
 to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - Access to AWS with permission to create IAM policies and users
 
    <Note>

content/hcp-docs/content/docs/vault/logs-metrics/datadog/logs.mdx

@@ -20,8 +20,8 @@ clusters.
 To configure audit logs streaming to DataDog, you will need
 to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - Your Datadog region and [API key](https://docs.datadoghq.com/account_management/api-app-keys/)
 
    <Note>

content/hcp-docs/content/docs/vault/logs-metrics/datadog/metrics.mdx

@@ -22,8 +22,8 @@ clusters.
 
 To configure metrics streaming to Datadog, you will need to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - Your Datadog region and [API key](https://docs.datadoghq.com/account_management/api-app-keys/)
 
    <Note>

content/hcp-docs/content/docs/vault/logs-metrics/elasticsearch/logs.mdx

@@ -20,8 +20,8 @@ clusters.
 To configure audit logs streaming to Elasticsearch, you will need
 to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - An Elasticsearch cluster created in Elastic Cloud with permission to create a role, and a user.
 
    <Note>

content/hcp-docs/content/docs/vault/logs-metrics/elasticsearch/metrics.mdx

@@ -22,8 +22,8 @@ clusters.
 
 To configure metrics streaming to Elasticsearch, you will need to have:
 
-- A HCP account with Admin or Contributor [role assigned in HCP](/hcp/docs/hcp/create-account)
-- A production grade HCP Vault Dedicated cluster
+- A HCP account with the Admin [role assigned](/hcp/docs/hcp/iam/access-management)
+- An essentials or standard tier HCP Vault Dedicated cluster
 - An Elasticsearch cluster created in Elastic Cloud with permission to create a role, and a user.
 
    <Note>