Merge pull request #134395 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.json

@@ -58172,6 +58172,11 @@
       "source_path": "articles/cognitive-services/QnAMaker/Quickstarts/batch-testing.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/index",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/private-link/create-private-endpoint-webapp-portal.md",
+      "redirect_url": "/azure/private-link/tutorial-private-endpoint-webapp-portal",
+      "redirect_document_id": false
     }
 
 

articles/azure-signalr/signalr-howto-event-grid-integration.md

@@ -76,7 +76,7 @@ To deploy the sample app, set `SITE_NAME` to a unique name for your web app, and
 ```azurecli-interactive
 SITE_NAME=<your-site-name>
 
-az group deployment create \
+az deployment group create \
     --resource-group $RESOURCE_GROUP_NAME \
     --template-uri "https://raw.githubusercontent.com/Azure-Samples/azure-event-grid-viewer/master/azuredeploy.json" \
     --parameters siteName=$SITE_NAME hostingPlanName=$SITE_NAME-plan

articles/backup/backup-azure-troubleshoot-vm-backup-fails-snapshot-timeout.md

@@ -99,7 +99,6 @@ After you register and schedule a VM for the Azure Backup service, Backup starts
 
 This error occurs when one of the extension failures puts the VM into provisioning failed state.<br>**Open  Azure portal > VM > Settings > Extensions > Extensions status** and check if all extensions are in **provisioning succeeded** state. To learn more, see [Provisioning states](../virtual-machines/states-lifecycle.md#provisioning-states).
 
-- If VMSnapshot extension is in a failed state, then right-click on the failed extension and remove it. Trigger an on-demand backup. This action will reinstall the extensions, and run the backup job.  <br>
 - If any other extension is in a failed state, then it can interfere with the backup. Ensure those extension issues are resolved and retry the backup operation.
 - If the VM provisioning state is in an updating state, it can interfere with the backup. Ensure that it's healthy and retry the backup operation.
 

articles/iot-central/core/concepts-get-connected.md

@@ -106,7 +106,7 @@ If you have a security breach or your primary certificate is set to expire, use
 
 ### Register and connect devices
 
-To bulk connect devices using X.509 certificates, first register the devices in your application by using a CSV file to [import the device IDs and device names](howto-manage-devices.md#import-devices). The device IDs should all be in lower case.
+To bulk connect devices using X.509 certificates, first register the devices in your application by using a CSV file to [import the device IDs and device names](howto-manage-devices.md#import-devices). A device ID can contain letters, numbers, and the `-` character.
 
 Generate X.509 leaf certificates for your devices using the root or intermediate certificate you uploaded to your X.509 enrollment group. Use the **Device ID** as the `CNAME` value in the leaf certificates. Your device code needs the **ID scope** value for your application, the **device ID**, and the corresponding device certificate.
 
@@ -142,7 +142,7 @@ The flow is slightly different depending on whether the devices use SAS tokens o
 
     :::image type="content" source="media/concepts-get-connected/group-primary-key.png" alt-text="Group primary key from SAS-IoT-Devices enrollment group":::
 
-1. Use the `az iot central device compute-device-key` command to generate the device SAS keys. Use the group primary key from the previous step. The device IDs must be lower-case:
+1. Use the `az iot central device compute-device-key` command to generate the device SAS keys. Use the group primary key from the previous step. The device ID can contain letters, numbers, and the `-` character:
 
     ```azurecli
     az iot central device compute-device-key --primary-key <enrollment group primary key> --device-id <device ID>
@@ -163,7 +163,7 @@ The flow is slightly different depending on whether the devices use SAS tokens o
 
 1. [Create an enrollment group](#create-an-enrollment-group) and then [Add and verify a root or intermediate X.509 certificate](#add-and-verify-a-root-or-intermediate-x509-certificate) to your IoT Central application.
 
-1. Generate the leaf-certificates for your devices using the root or intermediate certificate you added to your IoT Central application. Use lower-case device IDs as the `CNAME` in the leaf certificates.
+1. Generate the leaf-certificates for your devices using the root or intermediate certificate you added to your IoT Central application. Use the device IDs as the `CNAME` in the leaf certificates. A device ID can contain letters, numbers, and the `-` character.
 
 1. The OEM flashes each device with a device ID, a generated leaf X.509 certificate, and the application **ID scope** value.
 
@@ -178,7 +178,7 @@ The flow is slightly different depending on whether the devices use SAS tokens o
 
 ## Individual enrollment-based device connectivity
 
-For customers connecting devices that each have their own authentication credentials, use individual enrollments. An individual enrollment is an entry for a single device that is allowed to connect. Individual enrollments can use either X.509 leaf certificates or SAS tokens (from a physical or virtual trusted platform module) as attestation mechanisms. The device ID (also known as registration ID) in an individual enrollment is alphanumeric, lowercase, and may contain hyphens. For more information, see [DPS individual enrollment](../../iot-dps/concepts-service.md#individual-enrollment).
+For customers connecting devices that each have their own authentication credentials, use individual enrollments. An individual enrollment is an entry for a single device that is allowed to connect. Individual enrollments can use either X.509 leaf certificates or SAS tokens (from a physical or virtual trusted platform module) as attestation mechanisms. The device ID (also known as registration ID) in an individual enrollment A device ID can contain letters, numbers, and the `-` character. For more information, see [DPS individual enrollment](../../iot-dps/concepts-service.md#individual-enrollment).
 
 > [!NOTE]
 > When you create an individual enrollment for a device, it takes precedence over the default group enrollment options in your IoT Central application.

articles/iot-central/core/how-to-connect-devices-x509.md

@@ -46,13 +46,16 @@ In this section, you use an X.509 certificate to connect a device with a cert de
     npm install
     ```
 
-1. Create a root certificate and then derive a device certificate by running the script. Be sure to only use lower-case alphanumerics and hyphens for certificate name:
+1. Create a root certificate and then derive a device certificate by running the script:
 
     ```cmd/sh
     node create_test_cert.js root mytestrootcert
     node create_test_cert.js device mytestdevice mytestrootcert
     ```
 
+    > [!TIP]
+    > A device ID can contain letters, numbers, and the `-` character.
+
 These commands produce three files each for the root and the device certificate
 
 filename | contents

articles/iot-central/core/howto-manage-devices.md

@@ -55,7 +55,7 @@ To add a device to your Azure IoT Central application:
 
 To connect large number of devices to your application, you can bulk import devices from a CSV file. The CSV file should have the following columns and headers:
 
-* **IOTC_DeviceID** - the device ID should be all lowercase.
+* **IOTC_DeviceID** - the device ID can contain letters, numbers, and the `-` character.
 * **IOTC_DeviceName** - this column is optional.
 
 To bulk-register devices in your application:

articles/iot-central/core/quick-create-simulated-device.md

@@ -125,7 +125,7 @@ To add a simulated device to your application, you use the **MXChip IoT DevKit**
 
 1. To add a new device as an operator choose **Devices** in the left pane. The **Devices** tab shows **All devices** and the **MXChip IoT DevKit** device template. Select **MXChip IoT DevKit**.
 
-1. To add a simulated DevKit device, select **+**. Use the suggested **Device ID** or enter your own lowercase **Device ID**. You can also enter a name for your new device. Make sure the **Simulated** toggle is **On** and then select **Create**.
+1. To add a simulated DevKit device, select **+**. Use the suggested **Device ID** or enter your own. A device ID can contain letters, numbers, and the `-` character. You can also enter a name for your new device. Make sure the **Simulated** toggle is **On** and then select **Create**.
 
     ![Simulated device](./media/quick-create-simulated-device/simulated-device.png)
 

articles/mysql/concepts-certificate-rotation.md

@@ -99,7 +99,7 @@ If you do not update the root certificate before February 15, 2021 (02/15/2021),
 ### 4. What is the impact if using App Service with Azure Database for MySQL?
 For Azure app services, connecting to Azure Database for MySQL, we can have two possible scenarios and it depends on how on you are using SSL with your application.
 *   This new certificate has been added to App Service at platform level. If you are using the SSL certificates included on App Service platform in your application, then no action is needed.
-*   If you are explicitly including the path to SSL cert file in your code, then you would need to download the new cert and update the code to use the new cert.
+*   If you are explicitly including the path to SSL cert file in your code, then you would need to download the new cert and update the code to use the new cert. A good example of this scenario is when you use custom containers in App Service as shared in the [App Service documentation](/app-service/tutorial-multi-container-app#configure-database-variables-in-wordpress.md)
 
 ### 5. What is the impact if using Azure Kubernetes Services (AKS) with Azure Database for MySQL?
 If you are trying to connect to the Azure Database for MySQL using Azure Kubernetes Services (AKS), it is similar to access from a dedicated customers host environment. Refer to the steps [here](../aks/ingress-own-tls.md).