Skip to content

Commit cb09305

Browse files
authored
Merge pull request #159993 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 6278b10 + d523ea1 commit cb09305

17 files changed

+80
-35
lines changed

articles/app-service/deploy-continuous-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: seodec18
1313
[Azure App Service](overview.md) enables continuous deployment from [GitHub](https://help.github.com/articles/create-a-repo), [BitBucket](https://confluence.atlassian.com/get-started-with-bitbucket/create-a-repository-861178559.html), and [Azure Repos](/azure/devops/repos/git/creatingrepo) repositories by pulling in the latest updates.
1414

1515
> [!NOTE]
16-
> The **Development Center (Classic)** page in the Azure portal, which is the old deployment experience, will be deprecated in March, 2021. This change will not affect any existing deployment settings in your app, and you can continue to manage app deployment in the **Deployment Center** page.
16+
> The **Development Center (Classic)** page in the Azure portal, an earlier version of the deployment experience, was deprecated in March 2021. This change doesn't affect existing deployment settings in your app, and you can continue to manage app deployment in the **Deployment Center** page in the portal.
1717
1818
[!INCLUDE [Prepare repository](../../includes/app-service-deploy-prepare-repo.md)]
1919

articles/azure-sql/virtual-machines/windows/frequently-asked-questions-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ This article provides answers to some of the most common questions about running
224224

225225
1. **Are SQL Server failover cluster instances (FCI) supported on Azure VMs?**
226226

227-
Yes. You can install a failover cluster instance using either [premium file shares (PFS)](failover-cluster-instance-premium-file-share-manually-configure.md) or [storage spaces direct (S2D)](failover-cluster-instance-storage-spaces-direct-manually-configure.md) for the storage subsystem. Premium file shares provide IOPS and throughput capacities that will meet the needs of many workloads. For IO-intensive workloads, consider using storage spaces direct based on manged premium or ultra-disks. Alternatively, you can use third-party clustering or storage solutions as described in [High availability and disaster recovery for SQL Server on Azure Virtual Machines](business-continuity-high-availability-disaster-recovery-hadr-overview.md#azure-only-high-availability-solutions).
227+
Yes. You can configure a [failover cluster instance](failover-cluster-instance-overview.md) using [Azure shared disks](failover-cluster-instance-azure-shared-disks-manually-configure.md), [premium file shares (PFS)](failover-cluster-instance-premium-file-share-manually-configure.md), or [storage spaces direct (S2D)](failover-cluster-instance-storage-spaces-direct-manually-configure.md) for the storage subsystem. Premium file shares provide IOPS and throughput capacities that meet the needs of many workloads. For IO-intensive workloads, consider using storage spaces direct based on managed premium or ultra-disks. Alternatively, you can use third-party clustering or storage solutions as described in [High availability and disaster recovery for SQL Server on Azure Virtual Machines](business-continuity-high-availability-disaster-recovery-hadr-overview.md#azure-only-high-availability-solutions).
228228

229229
> [!IMPORTANT]
230230
> At this time, the _full_ [SQL Server IaaS Agent Extension](sql-server-iaas-agent-extension-automate-management.md) is not supported for SQL Server FCI on Azure. We recommend that you uninstall the _full_ extension from VMs that participate in the FCI, and install the extension in _lightweight_ mode instead. This extension supports features, such as Automated Backup and Patching and some portal features for SQL Server. These features will not work for SQL Server VMs after the _full_ agent is uninstalled.
@@ -354,4 +354,4 @@ This article provides answers to some of the most common questions about running
354354
* [Overview of SQL Server on a Linux VM](../linux/sql-server-on-linux-vm-what-is-iaas-overview.md)
355355
* [Provision SQL Server on a Linux VM](../linux/sql-vm-create-portal-quickstart.md)
356356
* [FAQ (Linux)](../linux/frequently-asked-questions-faq.md)
357-
* [SQL Server on Linux documentation](/sql/linux/sql-server-linux-overview)
357+
* [SQL Server on Linux documentation](/sql/linux/sql-server-linux-overview)

articles/cdn/cdn-pop-abbreviations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BDC | Ashburn, Virginia, USA | North America: East US
4646
BKK | Thailand (TIG) | Asia
4747
BLR | Bengaluru (Bangalore), India | Asia
4848
BNJ | Newark, New Jersey, USA | North America: East US
49-
BOG | Bogota, Columbia | Latin America
49+
BOG | Bogota, Colombia | Latin America
5050
BSA | Boston, Massachusetts, USA | North America: East US
5151
BSM | Boston, Massachusetts, USA | North America: East US
5252
BSN | Boston, Massachusetts, USA | North America: East US
@@ -106,7 +106,7 @@ LIS | Lisbon, Portugal | Europe
106106
LPL | Manchester, UK | Europe
107107
LSV | Las Vegas, Nevada, USA | North America: West US
108108
MBW | Melbourne, Australia | Asia
109-
MDE | Medellin, Columbia | Latin America
109+
MDE | Medellin, Colombia | Latin America
110110
MDR | Madrid, Spain | Europe
111111
MDW | Chicago, Illinois, USA | North America: Central US
112112
MEX | Mexico City, Mexico | North America

articles/cognitive-services/Speech-Service/language-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ Neural voices can be used to make interactions with chatbots and voice assistant
281281
| Slovenian (Slovenia) | `sl-SI` | Male | `sl-SI-RokNeural` | General |
282282
| Spanish (Argentina) | `es-AR` | Female | `es-AR-ElenaNeural` <sup>New</sup> | General |
283283
| Spanish (Argentina) | `es-AR` | Male | `es-AR-TomasNeural` <sup>New</sup> | General |
284-
| Spanish (Columbia) | `es-CO` | Female | `es-CO-SalomeNeural` <sup>New</sup> | General |
285-
| Spanish (Columbia) | `es-CO` | Male | `es-CO-GonzaloNeural` <sup>New</sup> | General |
284+
| Spanish (Colombia) | `es-CO` | Female | `es-CO-SalomeNeural` <sup>New</sup> | General |
285+
| Spanish (Colombia) | `es-CO` | Male | `es-CO-GonzaloNeural` <sup>New</sup> | General |
286286
| Spanish (Mexico) | `es-MX` | Female | `es-MX-DaliaNeural` | General |
287287
| Spanish (Mexico) | `es-MX` | Male | `es-MX-JorgeNeural` | General |
288288
| Spanish (Spain) | `es-ES` | Female | `es-ES-ElviraNeural` | General |

articles/cognitive-services/Speech-Service/releasenotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.custom: seodec18
1919

2020
**New languages and voices added for neural TTS**
2121

22-
- **Ten new languages introduced** - 20 new voices in 10 new locales are added into the neural TTS language list: Yan in `en-HK` English (Hongkong), Sam in `en-HK` English (Hongkong), Molly in `en-NZ` English (New Zealand), Mitchell in `en-NZ` English (New Zealand), Luna in `en-SG` English (Singapore), Wayne in `en-SG` English (Singapore), Leah in `en-ZA` English (South Africa), Luke in `en-ZA` English (South Africa), Dhwani in `gu-IN` Gujarati (India), Niranjan in `gu-IN` Gujarati (India), Aarohi in `mr-IN` Marathi (India), Manohar in `mr-IN` Marathi (India), Elena in `es-AR` Spanish (Argentina), Tomas in `es-AR` Spanish (Argentina), Salome in `es-CO` Spanish (Columbia), Gonzalo in `es-CO` Spanish (Columbia), Paloma in `es-US` Spanish (US), Alonso in `es-US` Spanish (US), Zuri in `sw-KE` Swahili (Kenya), Rafiki in `sw-KE` Swahili (Kenya).
22+
- **Ten new languages introduced** - 20 new voices in 10 new locales are added into the neural TTS language list: Yan in `en-HK` English (Hongkong), Sam in `en-HK` English (Hongkong), Molly in `en-NZ` English (New Zealand), Mitchell in `en-NZ` English (New Zealand), Luna in `en-SG` English (Singapore), Wayne in `en-SG` English (Singapore), Leah in `en-ZA` English (South Africa), Luke in `en-ZA` English (South Africa), Dhwani in `gu-IN` Gujarati (India), Niranjan in `gu-IN` Gujarati (India), Aarohi in `mr-IN` Marathi (India), Manohar in `mr-IN` Marathi (India), Elena in `es-AR` Spanish (Argentina), Tomas in `es-AR` Spanish (Argentina), Salome in `es-CO` Spanish (Colombia), Gonzalo in `es-CO` Spanish (Colombia), Paloma in `es-US` Spanish (US), Alonso in `es-US` Spanish (US), Zuri in `sw-KE` Swahili (Kenya), Rafiki in `sw-KE` Swahili (Kenya).
2323

2424
- **Eleven new en-US voices in preview** - 11 new en-US voices in preview are added to American English, they are Ashley, Amber, Ana, Brandon, Christopher, Cora, Elizabeth, Eric, Michelle, Monica, Jacob.
2525

articles/cosmos-db/create-sql-api-dotnet-v4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ The creation of the Azure Cosmos account takes a while, once the operation is su
8787

8888
### <a id="create-dotnet-core-app"></a>Create a new .NET app
8989

90-
Create a new .NET application in your preferred editor or IDE. Open the Windows command prompt or a Terminal window from your local computer. You will run all the commands in the next sections from the command prompt or terminal. Run the following dotnet new command to create a new app with the name `todo`. The --langVersion parameter sets the LangVersion property in the created project file.
90+
Create a new .NET application in your preferred editor or IDE. Open the Windows command prompt or a Terminal window from your local computer. You will run all the commands in the next sections from the command prompt or terminal. Run the following dotnet new command to create a new app with the name `todo`. The `--langVersion` parameter sets the LangVersion property in the created project file.
9191

9292
```bash
93-
dotnet new console –langVersion:8 -n todo
93+
dotnet new console --langVersion:8 -n todo
9494
```
9595

9696
Change your directory to the newly created app folder. You can build the application with:

articles/cosmos-db/free-tier.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ To create an account with free tier using Azure PowerShell, set the `-EnableFree
7676

7777
```powershell-interactive
7878
# Create a free tier account for SQL API.
79-
New-AzCosmosDBAccount -ResourceGroupName MyResourcegroup" `
79+
New-AzCosmosDBAccount -ResourceGroupName "MyResourcegroup" `
8080
-Name "Myaccount" `
8181
-ApiKind "sql" `
8282
-EnableFreeTier true `

articles/cosmos-db/how-to-setup-rbac.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ Assign a role to an identity:
305305
```powershell
306306
$resourceGroupName = "<myResourceGroup>"
307307
$accountName = "<myCosmosAccount>"
308-
$readOnlyRoleDefinitionId = "<roleDefinitionId>" // as fetched above
308+
$readOnlyRoleDefinitionId = "<roleDefinitionId>" # as fetched above
309309
$principalId = "<aadPrincipalId>"
310310
New-AzCosmosDBSqlRoleAssignment -AccountName $accountName `
311311
-ResourceGroupName $resourceGroupName `
@@ -321,7 +321,7 @@ Assign a role to an identity:
321321
```azurecli
322322
resourceGroupName='<myResourceGroup>'
323323
accountName='<myCosmosAccount>'
324-
readOnlyRoleDefinitionId = '<roleDefinitionId>' // as fetched above
324+
readOnlyRoleDefinitionId = '<roleDefinitionId>' # as fetched above
325325
principalId = '<aadPrincipalId>'
326326
az cosmosdb sql role assignment create --account-name $accountName --resource-group $resourceGroupName --scope "/" --principal-id $principalId --role-definition-id $readOnlyRoleDefinitionId
327327
```
@@ -440,4 +440,4 @@ Disabling the account primary/secondary keys is not currently possible.
440440
## Next steps
441441

442442
- Get an overview of [secure access to data in Cosmos DB](secure-access-to-data.md).
443-
- Learn more about [RBAC for Azure Cosmos DB management](role-based-access-control.md).
443+
- Learn more about [RBAC for Azure Cosmos DB management](role-based-access-control.md).

articles/cosmos-db/sql-api-sdk-java-v4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The Azure Cosmos DB Java SDK v4 for Core (SQL) combines an Async API and a Sync
5151
| Content | Link |
5252
|---|---|
5353
|**SDK download**| [Maven](https://mvnrepository.com/artifact/com.azure/azure-cosmos) |
54-
|**API documentation** | [Java API reference documentation](/java/api/overview/azure/cosmosdb/client) |
54+
|**API documentation** | [Java API reference documentation](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-cosmos/latest/index.html) |
5555
|**Contribute to SDK** | [Azure SDK for Java Central Repo on GitHub](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-cosmos) |
5656
|**Get started** | [Quickstart: Build a Java app to manage Azure Cosmos DB SQL API data](./create-sql-api-java.md) <br> [GitHub repo with quickstart code](https://github.com/Azure-Samples/azure-cosmos-java-getting-started) |
5757
|**Basic code samples** | [Azure Cosmos DB: Java examples for the SQL API](sql-api-java-sdk-samples.md) <br> [GitHub repo with sample code](https://github.com/Azure-Samples/azure-cosmos-java-sql-api-samples)|
@@ -73,4 +73,4 @@ The Azure Cosmos DB Java SDK v4 for Core (SQL) combines an Async API and a Sync
7373
[!INCLUDE [cosmos-db-sdk-faq](../../includes/cosmos-db-sdk-faq.md)]
7474

7575
## Next steps
76-
To learn more about Cosmos DB, see [Microsoft Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/) service page.
76+
To learn more about Cosmos DB, see [Microsoft Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/) service page.

articles/data-factory/connector-snowflake.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ This Snowflake connector is supported for the following activities:
2626
For the Copy activity, this Snowflake connector supports the following functions:
2727

2828
- Copy data from Snowflake that utilizes Snowflake's [COPY into [location]](https://docs.snowflake.com/en/sql-reference/sql/copy-into-location.html) command to achieve the best performance.
29-
- Copy data to Snowflake that takes advantage of Snowflake's [COPY into [table]](https://docs.snowflake.com/en/sql-reference/sql/copy-into-table.html) command to achieve the best performance. It supports Snowflake on Azure.
29+
- Copy data to Snowflake that takes advantage of Snowflake's [COPY into [table]](https://docs.snowflake.com/en/sql-reference/sql/copy-into-table.html) command to achieve the best performance. It supports Snowflake on Azure.
30+
- If a proxy is required to connect to Snowflake from a self-hosted Integration Runtime, you must configure the environment variables for HTTP_PROXY and HTTPS_PROXY on the Integration Runtime host.
3031

3132
## Get started
3233

0 commit comments

Comments
 (0)