Skip to content

Commit f61984d

Browse files
authored
Merge pull request #69099 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents a19e6ad + e7f8a03 commit f61984d

File tree

48 files changed

+59
-59
lines changed

Some content is hidden

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

48 files changed

+59
-59
lines changed

articles/api-management/api-management-template-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ Azure API Management provides the following types of resources for use in the de
454454
|WebAuthenticationUserIsNotConfirm|Please confirm your registration before attempting to sign in.|
455455
|WebAuthenticationInvalidEmailFormated|Email is invalid: {0}|
456456
|WebAuthenticationUserNotFound|User not found|
457-
|WebAuthenticationTenantNotRegistered|Your account belongs to a Azure Active Directory tenant which is not authorized to access this portal.|
457+
|WebAuthenticationTenantNotRegistered|Your account belongs to an Azure Active Directory tenant which is not authorized to access this portal.|
458458
|WebAuthenticationAuthenticationFailed|Authentication has failed.|
459459
|WebAuthenticationGooglePlusNotEnabled|Authentication has failed. If you authorized the application then please contact the admin to make sure that Google authentication is configured correctly.|
460460
|ValidationErrorAllowedTenantIsRequired|Allowed Tenant is required|

articles/application-gateway/configuration-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ A listener is a logical entity which checks for the incoming connection requests
7979

8080
You can choose between [basic or multi-site listener](https://docs.microsoft.com/azure/application-gateway/application-gateway-components#types-of-listeners) while creating a new listener.
8181

82-
- If you are hosting a single site behind an Application gateway, choose basic listener. Learn [how to create an application gateway with with basic listener](https://docs.microsoft.com/azure/application-gateway/quick-create-portal).
82+
- If you are hosting a single site behind an Application gateway, choose basic listener. Learn [how to create an application gateway with basic listener](https://docs.microsoft.com/azure/application-gateway/quick-create-portal).
8383

8484
- If you are configuring more than one web application or multiple subdomains of the same parent domain on the same application gateway instance, then choose multi-site listener. For multi-site listener, you will additionally need to enter a host name. This is because Application Gateway relies on HTTP 1.1 host headers to host more than one website on the same public IP address and port.![1551057450710](C:\Users\absha\AppData\Roaming\Typora\typora-user-images\1551057450710.png)
8585

articles/azure-databricks/databricks-extract-load-sql-data-warehouse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Complete these tasks before you begin this tutorial:
4444

4545
* Create an Azure Blob storage account, and a container within it. Also, retrieve the access key to access the storage account. See [Quickstart: Create an Azure Blob storage account](../storage/blobs/storage-quickstart-blobs-portal.md).
4646

47-
* Create an Azure Data Lake Storage Gen2 storage account. See [Create a Azure Data Lake Storage Gen2 account](../storage/blobs/data-lake-storage-quickstart-create-account.md).
47+
* Create an Azure Data Lake Storage Gen2 storage account. See [Create an Azure Data Lake Storage Gen2 account](../storage/blobs/data-lake-storage-quickstart-create-account.md).
4848

4949
* Create a service principal. See [How to: Use the portal to create an Azure AD application and service principal that can access resources](https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
5050

articles/azure-functions/functions-cli-samples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following table includes links to bash scripts for Azure Functions that use
3030
| | |
3131
|**Continuous deployment**||
3232
| [Deploy from GitHub](scripts/functions-cli-create-function-app-github-continuous.md) | Create a function app that deploys from a GitHub repository. |
33-
| [Deploy from Azure DevOps](scripts/functions-cli-create-function-app-vsts-continuous.md) | Create a function app that deploys from a Azure DevOps repository. |
33+
| [Deploy from Azure DevOps](scripts/functions-cli-create-function-app-vsts-continuous.md) | Create a function app that deploys from an Azure DevOps repository. |
3434
| | |
3535
|**Configure app**||
3636
| [Map a custom domain to a function app](scripts/functions-cli-configure-custom-domain.md) | Define a custom domain for your functions. |

articles/azure-functions/scripts/functions-cli-create-function-app-vsts-continuous.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: mvc
1212
---
1313
# Create a function app and deploy function code from Azure DevOps
1414

15-
This topic shows you how to use Azure Functions to create a [serverless](https://azure.microsoft.com/solutions/serverless/) function app using the [consumption plan](../functions-scale.md#consumption-plan). The function app, which is a container for your functions, is continuously deployed from a Azure DevOps repository.
15+
This topic shows you how to use Azure Functions to create a [serverless](https://azure.microsoft.com/solutions/serverless/) function app using the [consumption plan](../functions-scale.md#consumption-plan). The function app, which is a container for your functions, is continuously deployed from an Azure DevOps repository.
1616

1717
[!INCLUDE [upgrade runtime](../../../includes/functions-cli-version-note.md)]
1818

articles/batch-ai/how-to-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Learn more about the Azure Machine Learning Workspace class in the [SDK referenc
8282

8383

8484
## Create compute clusters
85-
Azure Machine Learning supports multiple compute targets, some of which are managed by the service and others that can be attached to your workspace (eg. An HDInsight cluster or a remote VM. Read more about various [compute targets](../machine-learning/service/how-to-set-up-training-targets.md). The concept of creating a Azure Batch AI compute cluster maps to creating an AmlCompute cluster in Azure Machine Learning service. The Amlcompute creation takes in a compute configuration similar to how you pass parameters in Azure Batch AI. One thing to note is that autoscaling is on by default on your AmlCompute cluster whereas it is turned off by default in Azure Batch AI.
85+
Azure Machine Learning supports multiple compute targets, some of which are managed by the service and others that can be attached to your workspace (eg. An HDInsight cluster or a remote VM. Read more about various [compute targets](../machine-learning/service/how-to-set-up-training-targets.md). The concept of creating an Azure Batch AI compute cluster maps to creating an AmlCompute cluster in Azure Machine Learning service. The Amlcompute creation takes in a compute configuration similar to how you pass parameters in Azure Batch AI. One thing to note is that autoscaling is on by default on your AmlCompute cluster whereas it is turned off by default in Azure Batch AI.
8686

8787
For **Batch AI**, you did it this way:
8888

articles/blockchain/workbench/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Blockchain Workbench troubleshooting
3-
description: How to troubleshoot a Azure Blockchain Workbench application.
3+
description: How to troubleshoot an Azure Blockchain Workbench application.
44
services: azure-blockchain
55
keywords:
66
author: PatAltimore

articles/cdn/cdn-azure-diagnostic-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ You can display the data in a variety of ways by using Management Solutions. You
226226
227227
You can install monitoring solutions from Azure marketplace by selecting the **Get it now** link at the bottom of each solution.
228228
229-
### Add a Azure Monitor CDN monitoring solution
229+
### Add an Azure Monitor CDN monitoring solution
230230
231-
Follow these steps to add a Azure Monitor monitoring solution:
231+
Follow these steps to add an Azure Monitor monitoring solution:
232232
233233
1. Sign in to the Azure portal using your Azure subscription and go to your dashboard.
234234
![Azure dashboard](./media/cdn-diagnostics-log/13_Azure-dashboard.png)

articles/container-service/kubernetes/container-service-draft-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can use Draft with any Docker image registry and any Kubernetes cluster, inc
2626
## Create an Azure Container Registry
2727
You can easily [create a new Azure Container Registry](../../container-registry/container-registry-get-started-azure-cli.md), but the steps are as follows:
2828

29-
1. Create a Azure resource group to manage your ACR registry and the Kubernetes cluster in ACS.
29+
1. Create an Azure resource group to manage your ACR registry and the Kubernetes cluster in ACS.
3030
```azurecli
3131
az group create --name draft --location eastus
3232
```

articles/cosmos-db/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ The following conditions apply to Try Azure Cosmos DB subscriptions:
9797

9898
### How do I sign up for Azure Cosmos DB?
9999

100-
Azure Cosmos DB is available in the Azure portal. First, sign up for an Azure subscription. After you've signed up, you can add a Azure Cosmos DB account to your Azure subscription.
100+
Azure Cosmos DB is available in the Azure portal. First, sign up for an Azure subscription. After you've signed up, you can add an Azure Cosmos DB account to your Azure subscription.
101101

102102
### What is a master key?
103103

0 commit comments

Comments
 (0)