Skip to content

Commit 15b598a

Browse files
authored
Merge pull request #291661 from MicrosoftDocs/main
12/9/2024 AM Publish
2 parents 210dff9 + eabc84d commit 15b598a

File tree

112 files changed

+305
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+305
-157
lines changed

articles/azure-resource-manager/management/azure-services-resource-providers.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The resource providers for compute services are:
6363

6464
| Resource provider namespace | Azure service |
6565
| --------------------------- | ------------- |
66-
| Microsoft.AppPlatform | [Azure Spring Apps](../../spring-apps/enterprise/overview.md) |
66+
| Microsoft.AppPlatform | [Azure Spring Apps](../../spring-apps/basic-standard/overview.md) |
6767
| Microsoft.AVS | [Azure VMware Solution](../../azure-vmware/index.yml) |
6868
| Microsoft.Batch | [Batch](../../batch/index.yml) |
6969
| Microsoft.ClassicCompute | Classic deployment model virtual machine |
@@ -73,7 +73,7 @@ The resource providers for compute services are:
7373
| Microsoft.HanaOnAzure | [SAP HANA on Azure Large Instances](/azure/virtual-machines/workloads/sap/hana-overview-architecture) |
7474
| Microsoft.LabServices | [Azure Lab Services](../../lab-services/index.yml) |
7575
| Microsoft.Maintenance | [Azure Maintenance](/azure/virtual-machines/maintenance-configurations) |
76-
| Microsoft.Microservices4Spring | [Azure Spring Apps](../../spring-apps/enterprise/overview.md) |
76+
| Microsoft.Microservices4Spring | [Azure Spring Apps](../../spring-apps/basic-standard/overview.md) |
7777
| Microsoft.Quantum | [Azure Quantum](https://azure.microsoft.com/services/quantum/) |
7878
| Microsoft.SerialConsole - [registered by default](#registration) | [Azure Serial Console for Windows](/troubleshoot/azure/virtual-machines/serial-console-windows) |
7979
| Microsoft.ServiceFabric | [Service Fabric](/azure/service-fabric/) |
@@ -135,6 +135,7 @@ The resource providers for developer tools services are:
135135
| Microsoft.AppConfiguration | [Azure App Configuration](../../azure-app-configuration/index.yml) |
136136
| Microsoft.DevCenter | [Microsoft Dev Box](../../dev-box/index.yml) |
137137
| Microsoft.DevSpaces | [Azure Dev Spaces](/previous-versions/azure/dev-spaces/) |
138+
| Microsoft.LoadTestService | [Azure Load Testing](/azure/load-testing/) |
138139
| Microsoft.MixedReality | [Azure Spatial Anchors](../../spatial-anchors/index.yml) |
139140
| Microsoft.Notebooks | [Azure Notebooks](https://notebooks.azure.com/help/introduction) |
140141

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ The following limits apply to [Azure role-based access control (Azure RBAC)](../
257257

258258
## Azure Spring Apps limits
259259

260-
To learn more about the limits for Azure Spring Apps, see [Quotas and service plans for Azure Spring Apps](../../spring-apps/enterprise/quotas.md).
260+
To learn more about the limits for Azure Spring Apps, see [Quotas and service plans for Azure Spring Apps](../../spring-apps/basic-standard/quotas.md).
261261

262262
## Azure Storage limits
263263

articles/azure-resource-manager/management/lock-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Applying locks can lead to unexpected results. Some operations, which don't seem
101101

102102
- A cannot-delete lock on a **Virtual Machine** that is protected by **Site Recovery** prevents certain resource links related to Site Recovery from being removed properly when you remove the protection or disable replication. If you plan to protect the VM again later, you need to remove the lock before disabling protection. If you don't remove the lock, you need to follow certain steps to clean up the stale links before you can protect the VM. For more information, see [Troubleshoot Azure VM replication](../../site-recovery/azure-to-azure-troubleshoot-errors.md#replication-not-enabled-on-vm-with-stale-resources-error-code-150226).
103103

104-
- For **Postgresql**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.
104+
- For **PostgreSQL**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.
105105

106106
## Who can create or delete locks
107107

articles/azure-vmware/deploy-arc-for-azure-vmware-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Use the following steps to guide you through the process to onboard Azure Arc fo
119119
}
120120
```
121121

122-
3. Run the installation scripts. You can optionionally setup this preview from a Windows or Linux-based jump box/VM.
122+
3. Run the installation scripts. You can optionally setup this preview from a Windows or Linux-based jump box/VM.
123123

124124
Run the following commands to execute the installation script.
125125

articles/container-apps/compare-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You can get started building your first container app [using the quickstarts](ge
5151
[Azure Functions](../azure-functions/functions-overview.md) is a serverless Functions-as-a-Service (FaaS) solution. It's optimized for running event-driven applications using the functions programming model. It shares many characteristics with Azure Container Apps around scale and integration with events, but optimized for ephemeral functions deployed as either code or containers. The Azure Functions programming model provides productivity benefits for teams looking to trigger the execution of your functions on events and bind to other data sources. When building FaaS-style functions, Azure Functions is the ideal option. The Azure Functions programming model is available as a base container image, making it portable to other container based compute platforms allowing teams to reuse code as environment requirements change.
5252

5353
### Azure Spring Apps
54-
[Azure Spring Apps](../spring-apps/enterprise/overview.md) is a fully managed service for Spring developers. If you want to run Spring Boot, Spring Cloud or any other Spring applications on Azure, Azure Spring Apps is an ideal option. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more.
54+
[Azure Spring Apps](../spring-apps/basic-standard/overview.md) is a fully managed service for Spring developers. If you want to run Spring Boot, Spring Cloud or any other Spring applications on Azure, Azure Spring Apps is an ideal option. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more.
5555

5656
### Azure Red Hat OpenShift
5757
[Azure Red Hat OpenShift](../openshift/intro-openshift.md) is an integrated product with Red Hat and Microsoft jointly engineered, operated, and supported. This collaboration provides an integrated product and support experience for running Kubernetes-powered OpenShift. With Azure Red Hat OpenShift, teams can choose their own registry, networking, storage, and CI/CD solutions. Alternatively, they can use the built-in solutions for automated source code management, container and application builds, deployments, scaling, health management, and more from OpenShift. If your team or organization is using OpenShift, Azure Red Hat OpenShift is an ideal option.

articles/event-grid/authenticate-with-entra-id-namespaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Besides managed identities, another identity option is to create a security prin
5252
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).
5353

5454
> [!NOTE]
55-
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
55+
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
5656
5757
## Assign permission to a security principal to publish events
5858

articles/event-grid/authenticate-with-microsoft-entra-id.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Besides managed identities, another identity option is to create a security prin
5454
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).
5555

5656
> [!NOTE]
57-
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
57+
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
5858
5959

6060
## Assign permission to a security principal to publish events
@@ -136,7 +136,7 @@ Microsoft Entra authentication provides a superior authentication support than t
136136
Once you decide to use Microsoft Entra authentication, you can disable authentication based on access keys or SAS tokens.
137137

138138
> [!NOTE]
139-
> Acess keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
139+
> Access keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
140140
141141
### Azure portal
142142

articles/event-grid/communication-services-advanced-messaging-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Details for the attributes specific to `Microsoft.Communication.AdvancedMessageA
266266

267267
| Attribute | Type | Nullable | Description |
268268
|:---------------|:--------:|:--------:|---------------------------------------------|
269-
| language | `string` | ✔️ | The languege detected. |
269+
| language | `string` | ✔️ | The language detected. |
270270
| confidenceScore | `float` | ✔️ | The confidence score of the language detected. |
271271
| translation | `string` | ✔️ | The message translation. |
272272

articles/event-grid/configure-private-endpoints.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/
129129

130130
```azurecli-interactive
131131
az network private-endpoint create \
132-
--resource-group <RESOURECE GROUP NAME> \
132+
--resource-group <RESOURCE GROUP NAME> \
133133
--name <PRIVATE ENDPOINT NAME> \
134134
--vnet-name <VIRTUAL NETWORK NAME> \
135135
--subnet <SUBNET NAME> \
@@ -147,7 +147,7 @@ For descriptions of the parameters used in the example, see documentation for [a
147147
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:
148148

149149
```azurecli-interactive
150-
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
150+
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
151151
```
152152

153153
> [!NOTE]
@@ -173,7 +173,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/
173173

174174
```azurecli-interactive
175175
az network private-endpoint create \
176-
--resource-group <RESOURECE GROUP NAME> \
176+
--resource-group <RESOURCE GROUP NAME> \
177177
--name <PRIVATE ENDPOINT NAME> \
178178
--vnet-name <VIRTUAL NETWORK NAME> \
179179
--subnet <SUBNET NAME> \
@@ -191,7 +191,7 @@ For descriptions of the parameters used in the example, see documentation for [a
191191
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:
192192

193193
```azurecli-interactive
194-
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
194+
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
195195
```
196196

197197
> [!NOTE]

articles/event-grid/cross-tenant-delivery-using-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For more information, see the following articles:
5757

5858
- In the URL, use the multitenant app object ID.
5959
- For **Name**, provide a unique name for the federated client credential.
60-
- For **Issuer**, use `https://login.microsoftonline.com/TENANTAID/v2.0` where `TENANTAID` is the ID of the tenant where the user-assigned identity is located.
60+
- For **Issuer**, use `https://login.microsoftonline.com/TENANTID/v2.0` where `TENANTID` is the ID of the tenant where the user-assigned identity is located.
6161
- For **Subject**, specify the client ID of the user-assigned identity.
6262

6363
Verify and wait for the API call to succeed.

0 commit comments

Comments
 (0)