Skip to content

Commit 18fb67c

Browse files
authored
Merge pull request #171580 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 37be4b2 + 22339fa commit 18fb67c

File tree

10 files changed

+13
-12
lines changed

10 files changed

+13
-12
lines changed

articles/azure-arc/data/plan-azure-arc-data-services.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Once the infrastructure is prepared, deploy Azure Arc-enabled data services in t
3939
1. Create an Azure Arc-enabled data controller on one of the validated distributions of a Kubernetes cluster
4040
1. Create an Azure Arc-enabled SQL managed instance and/or an Azure Arc-enabled PostgreSQL Hyperscale server group.
4141

42+
> [!CAUTION]
43+
> Some of the data services tiers and modes are [generally available](release-notes.md) and some are in preview. We recommend that you don't mix GA and preview services on the same data controller. If you mix GA and preview services on the same data controller, you can't upgrade in place. In that scenario, when you want to upgrade, you must remove and re-create the data controller and data services.
44+
4245
## Overview: Create the Azure Arc-enabled data controller
4346

4447
You can create Azure Arc-enabled data services on multiple different types of Kubernetes clusters and managed Kubernetes services using multiple different approaches.

articles/azure-sql/database/long-term-retention-overview.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ To learn how to configure long-term retention or restore a database from backup
8383

8484
To learn how to configure long-term retention or restore a database from backup for SQL Managed Instance using the Azure portal or PowerShell, see [Manage Azure SQL Managed Instance long-term backup retention](../managed-instance/long-term-backup-retention-configure.md).
8585

86-
To restore a database from the LTR storage, you can select a specific backup based on its timestamp. The database can be restored to any existing server under the same subscription as the original database. To learn how to restore your database from an LTR backup, using the Azure portal, or PowerShell, see [Manage Azure SQL Database long-term backup retention](long-term-backup-retention-configure.md).
87-
8886
## Next steps
8987

9088
Because database backups protect data from accidental corruption or deletion, they're an essential part of any business continuity and disaster recovery strategy.

articles/azure-web-pubsub/quickstart-serverless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ Use the following commands to create these items.
369369
370370
1. Deploy the function project to Azure:
371371
372-
After you've successfully created your function app in Azure, you're now ready to deploy your local functions project by using the [func azure functionapp publish](/azure-functions/functions-run-local) command.
372+
After you've successfully created your function app in Azure, you're now ready to deploy your local functions project by using the [func azure functionapp publish](./../azure-functions/functions-run-local.md) command.
373373
374374
```bash
375375
func azure functionapp publish <FUNCIONAPP_NAME> --publish-local-settings

articles/cognitive-services/Speech-Service/text-to-speech.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For detailed information, see [Pricing](https://azure.microsoft.com/pricing/deta
8080
8181
## Migrate to Neural Voice
8282

83-
We are retiring the standard voices on **31st August 2024** and they will no longer be supported after that date.  The announcement has been sent out to all existing Speech subscriptions before **31st August 2021**. During the retiring period (**31st August 2021- 31st August 2024**), existing users can continue to use their standard voices, all new users/new speech resources should move to the neural voices.
83+
We are retiring the standard voices on **31st August 2024** and they will no longer be supported after that date.  The announcement has been sent out to all existing Speech subscriptions before **31st August 2021**. During the retiring period (**31st August 2021- 31st August 2024**), existing standard voice users can continue to use their standard voices, all new users/new speech resources should move to the neural voices.
8484

8585
**Action required**
8686

@@ -95,4 +95,4 @@ We are retiring the standard voices on **31st August 2024** and they will no lon
9595
## Next steps
9696

9797
* [Get a free Speech service subscription](overview.md#try-the-speech-service-for-free)
98-
* [Get the Speech SDK](speech-sdk.md)
98+
* [Get the Speech SDK](speech-sdk.md)

articles/cognitive-services/personalizer/includes/quickstart-sdk-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Build succeeded.
5656
Within the application directory, install the Personalizer client library for .NET with the following command:
5757

5858
```console
59-
dotnet add package Microsoft.Azure.CognitiveServices.Personalizer --version 0.8.0-preview
59+
dotnet add package Microsoft.Azure.CognitiveServices.Personalizer --version 1.0.0
6060
```
6161

6262
> [!TIP]

articles/data-factory/format-common-data-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ When selecting "Entity Reference" both in the Source and Sink transformations, y
5050

5151
* Local uses the entity defined in the manifest file already being used by ADF
5252
* Custom will ask you to point to an entity manifest file that is different from the manifest file ADF is using
53-
* Standard will use an entity reference from the standard library of CDM entities maintained in ```Github```.
53+
* Standard will use an entity reference from the standard library of CDM entities maintained in GitHub.
5454

5555
### Sink settings
5656

articles/expressroute/how-to-configure-connection-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $solution = @{
102102
ResourceGroupName = $resourceGroup
103103
}
104104
105-
New-AzureRmResource @solution -Force
105+
New-AzResource @solution -Force
106106
```
107107

108108
Once you've configured the monitoring solution. Continue to the next step of installing and configuring the monitoring agents on your servers.
@@ -250,4 +250,4 @@ For a high-level overview of how to create a connection monitor, tests, and test
250250

251251
## Next steps
252252

253-
Learn more about [Monitoring Azure ExpressRoute](monitor-expressroute.md)
253+
Learn more about [Monitoring Azure ExpressRoute](monitor-expressroute.md)

articles/firewall/premium-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Azure Firewall Premium has the following known issues:
139139
|Client Certificates (TLS)|Client certificates are used to build a mutual identity trust between the client and the server. Client certificates are used during a TLS negotiation. Azure firewall renegotiates a connection with the server and has no access to the private key of the client certificates.|None|
140140
|QUIC/HTTP3|QUIC is the new major version of HTTP. It's a UDP-based protocol over 80 (PLAN) and 443 (SSL). FQDN/URL/TLS inspection won't be supported.|Configure passing UDP 80/443 as network rules.|
141141
Untrusted customer signed certificates|Customer signed certificates are not trusted by the firewall once received from an intranet-based web server.|A fix is being investigated.
142-
|Wrong source IP address in Alerts with IDPS for HTTP (without TLS inspection).|When plain text HTTP traffic is in use, and IDPS issues a new alert, and the destination is public an IP address, the displayed source IP address is wrong (the internal IP address is displayed instead of the original IP address).|A fix is being investigated.|
142+
|Wrong source IP address in Alerts with IDPS for HTTP (without TLS inspection).|When plain text HTTP traffic is in use, and IDPS issues a new alert, and the destination is a public IP address, the displayed source IP address is wrong (the internal IP address is displayed instead of the original IP address).|A fix is being investigated.|
143143
|Certificate Propagation|After a CA certificate is applied on the firewall, it may take between 5-10 minutes for the certificate to take effect.|A fix is being investigated.|
144144
|TLS 1.3 support|TLS 1.3 is partially supported. The TLS tunnel from client to the firewall is based on TLS 1.2, and from the firewall to the external Web server is based on TLS 1.3.|Updates are being investigated.|
145145
|KeyVault Private Endpoint|KeyVault supports Private Endpoint access to limit its network exposure. Trusted Azure Services can bypass this limitation if an exception is configured as described in the [KeyVault documentation](../key-vault/general/overview-vnet-service-endpoints.md#trusted-services). Azure Firewall is not currently listed as a trusted service and can't access the Key Vault.|A fix is being investigated.|

articles/machine-learning/how-to-consume-web-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The following table shows what these URIs look like:
9595
| Swagger URI | `http://104.214.29.152/api/v1/service/<service-name>/swagger.json` |
9696

9797
> [!TIP]
98-
> The IP address will be different for your deployment. Each AKS cluster will hve it's own IP address that is shared by deployments to that cluster.
98+
> The IP address will be different for your deployment. Each AKS cluster will have its own IP address that is shared by deployments to that cluster.
9999

100100
### Secured web service
101101

articles/virtual-machines/linux/quick-create-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ az group create --name myResourceGroup --location eastus
4141

4242
Create a VM with the [az vm create](/cli/azure/vm) command.
4343

44-
The following example creates a VM named *myVM* and adds a user account named *azureuser*. The `--generate-ssh-keys` parameter is used to automatically generate an SSH key, and put it in the default key location (*~/.ssh*). To use a specific set of keys instead, use the `--ssh-key-value` option.
44+
The following example creates a VM named *myVM* and adds a user account named *azureuser*. The `--generate-ssh-keys` parameter is used to automatically generate an SSH key, and put it in the default key location (*~/.ssh*). To use a specific set of keys instead, use the `--ssh-key-values` option.
4545

4646
```azurecli-interactive
4747
az vm create \

0 commit comments

Comments
 (0)