Skip to content

Commit 6291f5b

Browse files
authored
Merge pull request #229483 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents ab6f059 + ee56323 commit 6291f5b

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

articles/chaos-studio/chaos-studio-private-networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ VNet is the fundamental building block for your private network in Azure. VNet e
1616

1717
VNet injection allows a Chaos resource provider to inject containerized workloads into your VNet so that resources without public endpoints can be accessed via a private IP address on the VNet. To configure VNet injection:
1818

19-
1. Register the `Microsoft.ContainerInstance` resource provider with your subscription (if applicable).
19+
1. Register the `Microsoft.ContainerInstance` and `Microsoft.Relay` resource providers with your subscription (if applicable).
2020

2121
```bash
2222
az provider register --namespace 'Microsoft.ContainerInstance' --wait

articles/cloud-shell/embed-cloud-shell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ To integrate Cloud Shell's launch button into markdown files by copying the foll
3737
Regular sized button
3838

3939
```markdown
40-
[![Launch Cloud Shell](https://learn.microsoft.com/azure/cloud-shell/media/embed-cloud-shell/launch-cloud-shell-1.png](https://shell.azure.com)
40+
[![Launch Cloud Shell](https://learn.microsoft.com/azure/cloud-shell/media/embed-cloud-shell/launch-cloud-shell-1.png)](https://shell.azure.com)
4141
```
4242

4343
Large sized button
4444

4545
```markdown
46-
[![Launch Cloud Shell](https://learn.microsoft.com/azure/cloud-shell/media/embed-cloud-shell/launch-cloud-shell-2.png](https://shell.azure.com)
46+
[![Launch Cloud Shell](https://learn.microsoft.com/azure/cloud-shell/media/embed-cloud-shell/launch-cloud-shell-2.png)](https://shell.azure.com)
4747
```
4848

4949
The location of these image files is subject to change. We recommend that you download the files for

articles/confidential-computing/confidential-vm-faq-amd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ sections:
4242
Collectively, AMD SEV technologies harden guest protections to deny hypervisor and other host management code access to VM memory and state.
4343
Confidential VMs combine AMD SEV-SNP with Azure technologies such as full-disk encryption and [Azure Key Vault Managed HSM](../key-vault/managed-hsm/overview.md).
4444
You can encrypt data in use, in transit, and at rest with keys that you control.
45-
With built-in [Azure Attestation](https://azure.microsoft.com/services/azure-attestation/) capabilities, you can independently establish trust in the security health and underlying infrastructure of your confidential VMs.
45+
With built-in [Azure Attestation](https://azure.microsoft.com/services/azure-attestation/) capabilities, you can independently establish trust in the security, health and underlying infrastructure of your confidential VMs.
4646
4747
- question: |
4848
How do Azure confidential VMs (DCasv5/ECasv5) offer better protection against threats originating from both within and outside Azure cloud infrastructure?
4949
answer: |
5050
Azure VMs already offer industry leading security and protection against other tenants and malicious intruders.
5151
Azure confidential VMs augment these protections by using hardware-based TEEs (Trusted Execution Environment) which leverage AMD’s SEV-SNP to cryptographically isolate and protect your data confidentiality and integrity even when they are in use.
52-
This means not host admins, or services (including the Azure hypervisor) can directly view or modify the memory or CPU state of your VM.
53-
Moreover, with full attestation capability, full OS disk encryption and hardeware-protected virtual Trusted Platform Modules, confidential VM persistent state is protected such that neither your private keys, nor are the contents of your memory are ever exposed to the hosting environment.
52+
This means neither host admins, nor services (including the Azure hypervisor) can directly view or modify the memory or CPU state of your VM.
53+
Moreover, with full attestation capability, full OS disk encryption and hardware-protected virtual Trusted Platform Modules, confidential VM persistent state is protected such that neither your private keys, nor the contents of your memory are ever exposed to the hosting environment.
5454
5555
- question: |
5656
Are the virtual disks attached to confidential VMs automatically protected?

articles/operator-nexus/howto-baremetal-functions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: template-how-to
1313

1414
This article describes how to perform lifecycle management operations on Bare Metal Machines (BMM). These steps should be used for troubleshooting purposes to recover from failures or when taking maintenance actions. The commands to manage the lifecycle of the BMM include:
1515

16-
- Power-off
16+
- Power off the BMM
1717
- Start the BMM
1818
- Make the BMM unschedulable or schedulable
1919
- Reinstall the BMM image
@@ -23,9 +23,9 @@ This article describes how to perform lifecycle management operations on Bare Me
2323
1. Install the latest version of the
2424
[appropriate CLI extensions](./howto-install-cli-extensions.md)
2525
1. Ensure that the target bare metal machine (server) must have its `poweredState` set to `On` and have its `readyState` set to `True`
26-
1. Get the Resource group name that you created for `network cloud cluster resource`
26+
1. Get the Resource group name that you created for `Cluster` resource
2727

28-
## Power-off bare metal machines
28+
## Power off the BMM
2929

3030
This command will `power-off` the specified `bareMetalMachineName`.
3131

@@ -34,7 +34,7 @@ This command will `power-off` the specified `bareMetalMachineName`.
3434
--resource-group "resourceGroupName"
3535
```
3636

37-
## Start bare metal machine
37+
## Start the BMM
3838

3939
This command will `start` the specified `bareMetalMachineName`.
4040

articles/postgresql/flexible-server/quickstart-create-server-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Create an Azure DB for PostgreSQL Flexible Server - Bicep'
2+
title: 'Quickstart: Create an Azure Database for PostgreSQL Flexible Server - Bicep'
33
description: In this Quickstart, learn how to create an Azure Database for PostgreSQL Flexible server using Bicep.
44
author: mumian
55
ms.service: postgresql

articles/storage/blobs/blob-inventory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following list describes features and capabilities that are available in the
2222

2323
- **Inventory reports for blobs and containers**
2424

25-
You can generate inventory reports for blobs and containers. A report for blobs can contain base blobs, snapshots, content length, blob versions and their associated properties such as creation time, last modified time. A report for containers describes containers and their associated properties such as immutability policy status, legal hold status.
25+
You can generate inventory reports for blobs and containers. A report for blobs can contain base blobs, snapshots, content length, blob versions and their associated properties such as creation time, last modified time. Empty containers aren’t listed in the Blob Inventory report. A report for containers describes containers and their associated properties such as immutability policy status, legal hold status.
2626

2727
- **Custom Schema**
2828

0 commit comments

Comments
 (0)