Skip to content

Commit 3d18533

Browse files
authored
Merge pull request #177022 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 2315535 + 5c9dcfc commit 3d18533

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

articles/app-service/configure-common.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This article explains how to configure common settings for web apps, mobile back
1414

1515
## Configure app settings
1616

17-
In App Service, app settings are variables passed as environment variables to the application code. For Linux apps and custom containers, App Service passes app settings to the container using the `--env` flag to set the environment variable in the container. In either case, they're injected into your app environment at app startup. When you add, remove, or edit app settings, App Service triggers an app restart.
17+
In App Service, app settings are variables passed as environment variables to the application code. For Linux apps and custom containers, App Service passes app settings to the container using the `--env` flag to set the environment variable in the container. In either case, they're injected into your app environment at app startup. When you add, remove, or edit app settings, App Service triggers an app restart. App setting names can't contain periods (`.`). If an app setting contains a period, the period is replaced with an underscore in the container.
1818

1919
In the [Azure portal], search for and select **App Services**, and then select your app.
2020

articles/app-service/tutorial-auth-aad.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ az webapp create --resource-group myAuthResourceGroup --plan myAuthAppServicePla
128128
1. Since you're deploying the `main` branch, you need to set the default deployment branch for your two App Service apps to `main` (see [Change deployment branch](deploy-local-git.md#change-deployment-branch)). In the Cloud Shell, set the `DEPLOYMENT_BRANCH` app setting with the [`az webapp config appsettings set`](/cli/azure/webapp/config/appsettings#az_webapp_config_appsettings_set) command.
129129

130130
```azurecli-interactive
131-
az webapp config appsettings set --name <front-end-app-name> --resource-group myAuthResourceGroup --settings DEPLOYMENT_BRANCH='main'
132-
az webapp config appsettings set --name <back-end-app-name> --resource-group myAuthResourceGroup --settings DEPLOYMENT_BRANCH='main'
131+
az webapp config appsettings set --name <front-end-app-name> --resource-group myAuthResourceGroup --settings DEPLOYMENT_BRANCH=main
132+
az webapp config appsettings set --name <back-end-app-name> --resource-group myAuthResourceGroup --settings DEPLOYMENT_BRANCH=main
133133
```
134134

135135
1. Back in the _local terminal window_, run the following Git commands to deploy to the back-end app. Replace _\<deploymentLocalGitUrl-of-back-end-app>_ with the URL of the Git remote that you saved from [Create Azure resources](#create-azure-resources). When prompted for credentials by Git Credential Manager, make sure that you enter [your deployment credentials](deploy-configure-credentials.md), not the credentials you use to sign in to the Azure portal.

articles/cognitive-services/Anomaly-Detector/How-to/deploy-anomaly-detection-on-iot-edge.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ To troubleshoot the runtime status of your IoT Edge device, consult the [trouble
6969

7070
You'll make an HTTP call to the Azure IoT Edge device that has the Azure Cognitive Services container running. The container provides REST-based endpoint APIs. Use the host, `http://<your-edge-device-ipaddress>:5000`, for module APIs.
7171

72+
Alternatively, you can [create a module client by using the Anomaly Detector client library](../quickstarts/client-libraries.md?tabs=linux&pivots=programming-language-python) on the Azure IoT Edge device, and then call the running Azure Cognitive Services container on the edge. Use the host endpoint `http://<your-edge-device-ipaddress>:5000` and leave the host key empty.
73+
7274
If your edge device does not already allow inbound communication on port 5000, you will need to create a new **inbound port rule**.
7375

7476
For an Azure VM, this can set under **Virtual Machine** > **Settings** > **Networking** > **Inbound port rule** > **Add inbound port rule**.

articles/container-registry/container-registry-transfer-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Parameter |Value |
205205
|---------|---------|
206206
|registryName | Name of your target container registry |
207207
|importPipelineName | Name you choose for the import pipeline |
208-
|sourceUri | URI of the storage container in your target environment (the source for the import pipeline).<br/>Example: `https://targetstorage.blob.core.windows.net/transfer/`|
208+
|sourceUri | URI of the storage container in your target environment (the source for the import pipeline).<br/>Example: `https://targetstorage.blob.core.windows.net/transfer`|
209209
|keyVaultName | Name of the target key vault |
210210
|sasTokenSecretName | Name of the SAS token secret in the target key vault<br/>Example: acr importsas |
211211

articles/key-vault/certificates/quick-create-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ using Azure.Security.KeyVault.Certificates;
130130

131131
### Authenticate and create a client
132132

133-
In this quickstart, logged in user is used to authenticate to key vault, which is preferred method for local development. For applications deployed to Azure, managed identity should be assigned to App Service or Virtual Machine, for more information, see [Managed Identity Overview](../../active-directory/managed-identities-azure-resources/overview.md
133+
In this quickstart, logged in user is used to authenticate to key vault, which is preferred method for local development. For applications deployed to Azure, managed identity should be assigned to App Service or Virtual Machine, for more information, see [Managed Identity Overview](../../active-directory/managed-identities-azure-resources/overview.md).
134134

135135
In below example, the name of your key vault is expanded to the key vault URI, in the format "https://\<your-key-vault-name\>.vault.azure.net". This example is using ['DefaultAzureCredential()'](/dotnet/api/azure.identity.defaultazurecredential) class from [Azure Identity Library](/dotnet/api/overview/azure/identity-readme), which allows to use the same code across different environments with different options to provide identity. For more information about authenticating to key vault, see [Developer's Guide](../general/developers-guide.md#authenticate-to-key-vault-in-code).
136136

articles/purview/purview-connector-overview.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ details.
2828
||[Azure SQL Database](register-scan-azure-sql-database.md)|Yes| Yes| Yes| Yes| Yes| Yes|
2929
||[Azure SQL Database Managed Instance](register-scan-azure-sql-database-managed-instance.md)|Yes| Yes| Yes| Yes| Yes| Yes|
3030
||[Azure Synapse Analytics (Workspace)](register-scan-synapse-workspace.md)|Yes| Yes| Yes| Yes| Yes| Yes|
31+
||[Azure Database for MySQL](register-scan-azure-mysql-database.md)|Yes| Yes| Yes*| Yes| Yes| Yes|
32+
||[Azure Database for PostgreSQL](register-scan-azure-postgresql.md)|Yes| Yes| No| Yes| Yes| Yes|
3133
|Database|[Cassandra](register-scan-cassandra-source.md)|Yes| Yes| No| No| No| Yes|
3234
||[Google BigQuery](register-scan-google-bigquery-source.md)|Yes| Yes| No| No| No| Yes|
3335
||[Hive Metastore DB](register-scan-oracle-source.md)|Yes| Yes| No| No| No| Yes|
@@ -41,6 +43,11 @@ details.
4143
||[SAP ECC](register-scan-sapecc-source.md)|Yes| Yes| No| No| No| Yes|
4244
||[SAP S4HANA](register-scan-saps4hana-source.md)|Yes| Yes| No| No| No| Yes|
4345

46+
\* Purview relies on UPDATE_TIME metadata from Azure Database for MySQL for incremental scans. In some cases, this field might not persist in the database and a full scan is performed. For more information, see [The INFORMATION_SCHEMA TABLES Table](https://dev.mysql.com/doc/refman/5.7/en/information-schema-tables-table.html) for MySQL.
47+
48+
> [!NOTE]
49+
> Currently, Purview can't scan an asset that has `/`, `\`, or `#` in its name. To scope your scan and avoid scanning assets that have those characters in the asset name, use the example in [Register and scan an Azure SQL Database](register-scan-azure-sql-database.md#creating-and-running-a-scan).
50+
4451
## Scan regions
4552
The following is a list of all the Azure data source (data center) regions where the Purview scanner runs. If your Azure data source is in a region outside of this list, the scanner will run in the region of your Purview instance.
4653

articles/virtual-machines/linux/login-using-aad.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to create and configure a Linux VM to sign in using Azure
55
ms.service: virtual-machines
66
ms.topic: how-to
77
ms.workload: infrastructure
8-
ms.date: 05/11/2021
8+
ms.date: 10/21/2021
99
ms.author: joflore
1010
author: MicrosoftGuyJFlo
1111
manager: daveba
@@ -17,7 +17,7 @@ ROBOTS: NOINDEX
1717
# Deprecated: Login to a Linux virtual machine in Azure with Azure Active Directory using device code flow authentication
1818

1919
> [!CAUTION]
20-
> **The public preview feature described in this article is being deprecated August 15th, 2021.**
20+
> **The public preview feature described in this article was deprecated August 15, 2021.**
2121
>
2222
> This feature is being replaced with the ability to use Azure AD and SSH via certificate-based authentication. For more information see the article, [Preview: Login to a Linux virtual machine in Azure with Azure Active Directory using SSH certificate-based authentication](../../active-directory/devices/howto-vm-sign-in-azure-ad-linux.md). To migrate from the old version to this version, see [Migration from previous preview](../../active-directory/devices/howto-vm-sign-in-azure-ad-linux.md#migration-from-previous-preview)
2323

articles/virtual-network/concepts-and-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ As you build your network in Azure, it is important to keep in mind the followin
3131
- Ensure non-overlapping address spaces. Make sure your VNet address space (CIDR block) does not overlap with your organization's other network ranges.
3232
- Your subnets should not cover the entire address space of the VNet. Plan ahead and reserve some address space for the future.
3333
- It is recommended you have fewer large VNets rather than multiple small VNets. This will prevent management overhead.
34-
- Secure your VNet's by assigning Network Security Groups (NSGs) to the subnets beneath them. For more information about network security concepts, see [Azure network security overview](../security/fundamentals/network-overview.md).
34+
- Secure your VNets by assigning Network Security Groups (NSGs) to the subnets beneath them. For more information about network security concepts, see [Azure network security overview](../security/fundamentals/network-overview.md).
3535

3636
## Next steps
3737

38-
To get started using a virtual network, create one, deploy a few VMs to it, and communicate between the VMs. To learn how, see the [Create a virtual network](quick-create-portal.md) quickstart.
38+
To get started using a virtual network, create one, deploy a few VMs to it, and communicate between the VMs. To learn how, see the [Create a virtual network](quick-create-portal.md) quickstart.

0 commit comments

Comments
 (0)