Skip to content

Commit a055038

Browse files
authored
Merge pull request #264805 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 af9ef66 + 01ee684 commit a055038

18 files changed

+31
-12
lines changed

articles/ai-services/speech-service/how-to-speech-synthesis-viseme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ synthesizer.visemeReceived = function (s, e) {
195195
window.console.log("(Viseme), Audio offset: " + e.audioOffset / 10000 + "ms. Viseme ID: " + e.visemeId);
196196

197197
// `Animation` is an xml string for SVG or a json string for blend shapes
198-
var animation = e.Animation;
198+
var animation = e.animation;
199199
}
200200

201201
// If VisemeID is the only thing you want, you can also use `speakTextAsync()`

articles/api-management/api-management-capacity.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ To follow the steps in this article, you must have:
4242
+ API Management management plane services, such as management actions applied via the Azure portal or Azure Resource Manager, or load coming from the [developer portal](api-management-howto-developer-portal.md).
4343
+ Selected operating system processes, including processes that involve cost of TLS handshakes on new connections.
4444
+ Platform updates, such as OS updates on the underlying compute resources for the instance.
45+
+ Number of APIs deployed, regardless of activity, which can consume additional capacity.
4546

4647
Total **capacity** is an average of its own values from every [unit](upgrade-and-scale.md) of an API Management instance.
4748

@@ -102,4 +103,4 @@ Low **capacity metric** doesn't necessarily mean that your API Management instan
102103

103104
- [Upgrade and scale an Azure API Management service instance](upgrade-and-scale.md)
104105
- [Automatically scale an Azure API Management instance](api-management-howto-autoscale.md)
105-
- [Plan and manage costs for API Management](plan-manage-costs.md)
106+
- [Plan and manage costs for API Management](plan-manage-costs.md)

articles/app-service/configure-language-java.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ ms.author: cephalin
1414

1515
# Configure a Java app for Azure App Service
1616

17+
> [!NOTE]
18+
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination.
19+
1720
Azure App Service lets Java developers to quickly build, deploy, and scale their Java SE, Tomcat, and JBoss EAP web applications on a fully managed service. Deploy applications with Maven plugins, from the command line, or in editors like IntelliJ, Eclipse, or Visual Studio Code.
1821

1922
This guide provides key concepts and instructions for Java developers using App Service. If you've never used Azure App Service, you should read through the [Java quickstart](quickstart-java.md) first. General questions about using App Service that aren't specific to Java development are answered in the [App Service FAQ](faq-configuration-and-management.yml).

articles/app-service/environment/how-to-custom-domain-suffix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Unlike earlier versions, the FTPS endpoints for your App Services on your App Se
3030
## Prerequisites
3131

3232
- ILB variation of App Service Environment v3.
33+
- The Azure Key Vault that has the certificate must be publicly accessible to fetch the certificate.
3334
- Valid SSL/TLS certificate must be stored in an Azure Key Vault in .PFX format. For more information on using certificates with App Service, see [Add a TLS/SSL certificate in Azure App Service](../configure-ssl-certificate.md).
3435

3536
### Managed identity

articles/app-service/environment/how-to-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Under **Get new IP addresses**, confirm you understand the implications and star
226226

227227
## 3. Update dependent resources with new IPs
228228

229-
When the previous step finishes, you're shown the IP addresses for your new App Service Environment v3. Using the new IPs, update any resources and networking components to ensure your new environment functions as intended once migration is complete. It's your responsibility to make any necessary updates. This step is also a good time to review the [inbound and outbound network](networking.md#ports-and-network-restrictions) dependency changes when moving to App Service Environment v3 including the port change for the Azure Load Balancer, which now uses port 80. Don't move on to the next step until you confirmed that you made these updates.
229+
When the previous step finishes, you're shown the IP addresses for your new App Service Environment v3. Using the new IPs, update any resources and networking components to ensure your new environment functions as intended once migration is complete. It's your responsibility to make any necessary updates. This step is also a good time to review the [inbound and outbound network](networking.md#ports-and-network-restrictions) dependency changes when moving to App Service Environment v3 including the port change for the Azure Load Balancer, which now uses port 80. Don't move on to the next step until you confirm that you made these updates.
230230

231231
:::image type="content" source="./media/migration/ip-sample.png" alt-text="Screenshot that shows sample IPs generated during premigration.":::
232232

articles/app-service/tutorial-java-spring-cosmosdb.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ ms.custom: mvc, seodec18, seo-java-july2019, seo-java-august2019, seo-java-septe
1111

1212
# Tutorial: Build a Java Spring Boot web app with Azure App Service on Linux and Azure Cosmos DB
1313

14+
> [!NOTE]
15+
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination.
16+
1417
This tutorial walks you through the process of building, configuring, deploying, and scaling Java web apps on Azure.
1518
When you are finished, you will have a [Spring Boot](https://spring.io/projects/spring-boot) application storing data in [Azure Cosmos DB](../cosmos-db/index.yml) running on [Azure App Service on Linux](overview.md).
1619

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@ Before starting your move operation, review the [checklist](./move-resource-grou
17711771
> [!div class="mx-tableFixed"]
17721772
> | Resource type | Resource group | Subscription | Region move |
17731773
> | ------------- | ----------- | ---------- | ----------- |
1774-
> | storageaccounts | **Yes** | **Yes** | **Yes**<br/><br/> [Move an Azure Storage account to another region](../../storage/common/storage-account-move.md) |
1774+
> | storageaccounts | **Yes** | **Yes** | [Move an Azure Storage account to another region](../../storage/common/storage-account-move.md) |
17751775
17761776
## Microsoft.StorageCache
17771777

articles/chaos-studio/chaos-studio-quickstart-azure-portal.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ Create an Azure resource and ensure that it's one of the supported [fault provid
9292
1. Search for **Virtual Machine Contributor** and select the role. Select **Next**.
9393

9494
![Screenshot that shows choosing the role for the VM.](images/quickstart-virtual-machine-contributor.png)
95+
96+
1. Select **Managed identity** option
97+
9598
1. Choose **Select members** and search for your experiment name. Select your experiment and choose **Select**.
9699

97100
![Screenshot that shows selecting the experiment.](images/quickstart-select-experiment-role-assignment.png)

articles/cosmos-db/nosql/tutorial-springboot-azure-kubernetes-service.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ ms.custom: mode-api, devx-track-azurecli, build-2023, build-2023-dataai
1515
# Tutorial - Spring Boot Application with Azure Cosmos DB for NoSQL and Azure Kubernetes Service
1616
[!INCLUDE[NoSQL](../includes/appliesto-nosql.md)]
1717

18+
> [!NOTE]
19+
> For Spring Boot applications, we recommend using Azure Spring Apps. However, you can still use Azure Kubernetes Service as a destination.
20+
1821
In this tutorial, you will set up and deploy a Spring Boot application that exposes REST APIs to perform CRUD operations on data in Azure Cosmos DB (API for NoSQL account). You will package the application as Docker image, push it to Azure Container Registry, deploy to Azure Kubernetes Service and test the application.
1922

2023
## Pre-requisites

articles/defender-for-cloud/defender-for-containers-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ When you enable the agentless discovery for Kubernetes extension, the following
7777
Learn more about [AKS Trusted Access](/azure/aks/trusted-access-feature).
7878

7979
- **Discover**: Using the system assigned identity, Defender for Cloud performs a discovery of the AKS clusters in your environment using API calls to the API server of AKS.
80-
- **Bind**: Upon discovery of an AKS cluster, Defender for Cloud performs an AKS bind operation between the created identity and the Kubernetes role *Microsoft.Security/pricings/microsoft-defender-operator*. The role is visible via API and gives Defender for Cloud data plane read permission inside the cluster.
80+
- **Bind**: Upon discovery of an AKS cluster, Defender for Cloud performs an AKS bind operation by creating a `ClusterRoleBinding` between the created identity and the Kubernetes `ClusterRole` *aks:trustedaccessrole:defender-containers:microsoft-defender-operator*. The `ClusterRole` is visible via API and gives Defender for Cloud data plane read permission inside the cluster.
8181

8282
## [**On-premises / IaaS (Arc)**](#tab/defender-for-container-arch-arc)
8383

0 commit comments

Comments
 (0)