Skip to content

Commit ef054b6

Browse files
authored
Merge pull request #270213 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 7000406 + ad75b21 commit ef054b6

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

articles/aks/best-practices-cost.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Cost optimization is about maximizing the value of resources while minimizing un
1212

1313
In this article, you learn about:
1414
> [!div class="checklist"]
15-
> * Strategic infrastucture selection
15+
> * Strategic infrastructure selection
1616
> * Dynamic rightsizing and autoscaling
1717
> * Leveraging Azure discounts for substantial savings
1818
> * Holistic monitoring and FinOps practices

articles/aks/use-network-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ To use Azure Network Policy Manager, you must use the Azure CNI plug-in. Calico
9696

9797
The following example script creates an AKS cluster with system-assigned identity and enables network policy by using Azure Network Policy Manager.
9898

99-
>[!Note}
99+
>[!NOTE]
100100
> Calico can be used with either the `--network-plugin azure` or `--network-plugin kubenet` parameters.
101101
102102
Instead of using a system-assigned identity, you can also use a user-assigned identity. For more information, see [Use managed identities](use-managed-identity.md).

articles/azure-vmware/vulnerability-management.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ms.date: 3/22/2024
77
ms.custom: engagement-fy24
88
---
99

10-
1110
# How Azure VMware Solution Addresses Vulnerabilities in the Infrastructure
1211

1312
At a high level, Azure VMware Solution is a Microsoft Azure service and therefore must follow all the same policies and requirements that Azure follows. Azure policies and procedures dictate that Azure VMware Solution must follow the [SDL](https://www.microsoft.com/securityengineering/sdl) and must meet several regulatory requirements as promised by Microsoft Azure.
@@ -22,16 +21,17 @@ Azure VMware Solution takes a defense in depth approach to vulnerability and ris
2221
- Details within the signal are adjudicated and assigned a CVSS score and risk rating according to compensating controls within the service.
2322
- The risk rating is used against internal bug bars, internal policies and regulations to establish a timeline for implementing a fix.
2423
- Internal engineering teams partner with appropriate parties to qualify and roll out any fixes, patches and other configuration updates necessary.
25-
- Communications are drafted when necassary and published according to the risk rating assigned.
26-
>[!tip]
27-
>Communications are surfaced through [Azure Service Health Portal](/azure/service-health/service-health-portal-update), [Known Issues](/azure/azure-vmware/azure-vmware-solution-known-issues) or Email.
24+
- Communications are drafted when necessary and published according to the risk rating assigned.
25+
26+
> [!TIP]
27+
> Communications are surfaced through [Azure Service Health Portal](/azure/service-health/service-health-portal-update), [Known Issues](/azure/azure-vmware/azure-vmware-solution-known-issues) or Email.
2828
2929
### Subset of regulations governing vulnerability and risk management
3030

3131
Azure VMware Solution is in scope for the following certifications and regulatory requirements. The regulations listed aren't a complete list of certifications Azure VMware Solution holds, rather it's a list with specific requirements around vulnerability management. These regulations don't rely on other regulations for the same purpose. IE, certain regional certifications may point to ISO requirements for vulnerability management.
3232

33-
>[!NOTE]
34-
>To access the following audit reports hosted in the Service Trust Portal, you must be an active Microsoft customer.
33+
> [!NOTE]
34+
> To access the following audit reports hosted in the Service Trust Portal, you must be an active Microsoft customer.
3535
3636
- [ISO](https://servicetrust.microsoft.com/DocumentPage/38a05a38-6181-432e-a5ec-aa86008c56c9)
3737
- [PCI](https://servicetrust.microsoft.com/viewpage/PCI) \- See the packages for DSS and 3DS for Audit Information.

articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following table describes the network topologies supported by each network f
1919

2020
|Topology |Supported |
2121
| :------------------- |:---------------:|
22-
|Connectivity to BareMetal Infrasturcture (BMI) in a local VNet| Yes |
22+
|Connectivity to BareMetal Infrastructure (BMI) in a local VNet| Yes |
2323
|Connectivity to BMI in a peered VNet (Same region)|Yes |
2424
|Connectivity to BMI in a peered VNet\* (Cross region or global peering) with VWAN\*|Yes |
2525
|Connectivity to BM in a peered VNet* (Cross region or global peering)* without VWAN| No|

articles/frontdoor/standard-premium/how-to-add-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ After you validate your custom domain, you can associate it to your Azure Front
100100

101101
> [!NOTE]
102102
> * If HTTPS is enabled, certificate provisioning and propagation may take a few minutes because propagation is being done to all edge locations.
103-
> * If your domain CNAME is indirectly pointed to a Front Door endpoint, for example, using Azure Traffic Manager for multi-CDN failover, the **DNS state** column shows as **CNAME/Alias record currently not detected**. Azure Front Door can't guarantee 100% detection of the CNAME record in this case. If you've configured an Azure Front Door endpoint to Azure Traffic Manager and still see this message, it doesn’t mean you didn't set up correctly, therefore further no action is neccessary from your side.
103+
> * If your domain CNAME is indirectly pointed to a Front Door endpoint, for example, using Azure Traffic Manager for multi-CDN failover, the **DNS state** column shows as **CNAME/Alias record currently not detected**. Azure Front Door can't guarantee 100% detection of the CNAME record in this case. If you've configured an Azure Front Door endpoint to Azure Traffic Manager and still see this message, it doesn’t mean you didn't set up correctly, therefore further no action is necessary from your side.
104104
105105
## Verify the custom domain
106106

articles/service-fabric/service-fabric-best-practices-capacity-scaling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Using automatic scaling through virtual machine scale sets will make your versio
3131
The minimum capacity for autoscaling rules must be equal to or greater than five virtual machine instances. It must also be equal to or greater than your Reliability Tier minimum for your primary node type.
3232

3333
> [!NOTE]
34-
> The Service Fabric stateful service fabric:/System/InfastructureService/<NODE_TYPE_NAME> runs on every node type that has Silver or higher durability. It's the only system service that is supported to run in Azure on any of your clusters node types.
34+
> The Service Fabric stateful service fabric:/System/InfrastructureService/<NODE_TYPE_NAME> runs on every node type that has Silver or higher durability. It's the only system service that is supported to run in Azure on any of your clusters node types.
3535
3636
> [!IMPORTANT]
3737
> Service Fabric autoscaling supports `Default` and `NewestVM` virtual machine scale set [scale-in configurations](../virtual-machine-scale-sets/virtual-machine-scale-sets-scale-in-policy.md).

articles/virtual-machines/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2108,7 +2108,7 @@
21082108
- name: Infrastructure automation
21092109
items:
21102110
- name: Overview
2111-
displayName: Infrastrucure automation overview
2111+
displayName: Infrastructure automation overview
21122112
href: infrastructure-automation.md
21132113
- name: User data
21142114
href: user-data.md

articles/virtual-machines/nva10v5-series.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Each virtual machine instance in NVadsA10v5-series comes with a GRID license. Th
4343

4444
<sup>1</sup> NVadsA10v5-series VMs feature AMD Simultaneous multithreading Technology
4545

46-
<sup>2</sup> The actual GPU VRAM reported in the operating system will be little less due to Error Correcting Code (ECC) support.
46+
<sup>2</sup> The actual GPU VRAM reported in the operating system will be a little less due to Error Correcting Code (ECC) support.
4747

4848

4949

0 commit comments

Comments
 (0)