Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: flang-msft

.openpublishing.publish.config.json

@@ -998,6 +998,7 @@
     ".openpublishing.redirection.baremetal-infrastructure.json",
     "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
     "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-    ".openpublishing.redirection.azure-vmware.json"
+    ".openpublishing.redirection.azure-vmware.json",
+    ".openpublishing.redirection.openshift.json"
   ]
 }

.openpublishing.redirection.openshift.json

@@ -0,0 +1,59 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/openshift/cluster-administration-cluster-admin-role.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/cluster-administration-security-context-constraints.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+	  {
+      "source_path_from_root": "/articles/openshift/howto-aad-app-configuration.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-create-private-cluster-3x.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-create-tenant.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-deploy-prometheus.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-manage-projects.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-run-privileged-containers.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/howto-setup-environment.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/migration.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/openshift/supported-resources.md",
+      "redirect_url": "/azure/openshift/intro-openshift",
+      "redirect_document_id": false
+    }
+	  ]
+}

articles/active-directory/enterprise-users/clean-up-unmanaged-azure-ad-accounts.md

@@ -61,19 +61,19 @@ Run the following cmdlets:
 
 To identify unmanaged Azure AD accounts, run:
 
-- `Connect-MgGraph --Scope User.Read.All`
+- `Connect-MgGraph -Scope User.ReadAll`
 
 - `Get-MsIdUnmanagedExternalUser`
 
 To reset unmanaged Azure AD account redemption status, run:
 
-- `Connect-MgGraph --Scope User.Readwrite.All`
+- `Connect-MgGraph -Scopes User.ReadWriteAll`
 
 - `Get-MsIdUnmanagedExternalUser | Reset-MsIdExternalUser`
 
 To delete unmanaged Azure AD accounts, run:
 
-- `Connect-MgGraph --Scope User.Readwrite.All`
+- `Connect-MgGraph -Scopes User.ReadWriteAll`
 
 - `Get-MsIdUnmanagedExternalUser | Remove-MgUser`
 

articles/aks/upgrade.md

@@ -15,14 +15,16 @@ An Azure Kubernetes Service (AKS) cluster will periodically need to be updated t
 - *Cluster Kubernetes version*: Part of the AKS cluster lifecycle involves performing upgrades to the latest Kubernetes version. It’s important you upgrade to apply the latest security releases and to get access to the latest Kubernetes features, as well as to stay within the [AKS support window][supported-k8s-versions].
 - *Node image version*: AKS regularly provides new node images with the latest OS and runtime updates. It's beneficial to upgrade your nodes' images regularly to ensure support for the latest AKS features and to apply essential security patches and hot fixes.
 
+For Linux nodes, node image security patches and hotfixes may be performed without your initiation as *unattended updates*. These updates are automatically applied, but AKS doesn't automatically reboot your Linux nodes to complete the update process. You're required to use a tool like [kured][node-updates-kured] or [node image upgrade][node-image-upgrade] to reboot the nodes and complete the cycle.
+
 The following table summarizes the details of updating each component:
 
 |Component name|Frequency of upgrade|Planned Maintenance supported|Supported operation methods|Documentation link|
 |--|--|--|--|--|
 |Cluster Kubernetes version (minor) upgrade|Roughly every three months|Yes| Automatic, Manual|[Upgrade an AKS cluster][upgrade-cluster]|
 |Cluster Kubernetes version upgrade to supported patch version|Approximately weekly. To determine the latest applicable version in your region, see the [AKS release tracker][release-tracker]|Yes|Automatic, Manual|[Upgrade an AKS cluster][upgrade-cluster]|
 |Node image version upgrade|**Linux**: weekly<br>**Windows**: monthly|Yes|Automatic, Manual|[AKS node image upgrade][node-image-upgrade]|
-|Security patches and hot fixes for node images|As-necessary||||
+|Security patches and hot fixes for node images|As-necessary|||[AKS node security patches][node-security-patches]|
 
 ## Automatic upgrades
 
@@ -64,3 +66,5 @@ For more information what cluster operations may trigger specific upgrade events
 [ts-ip-limit]: /troubleshoot/azure/azure-kubernetes/error-code-publicipcountlimitreached
 [ts-quota-exceeded]: /troubleshoot/azure/azure-kubernetes/error-code-quotaexceeded
 [ts-subnet-full]: /troubleshoot/azure/azure-kubernetes/error-code-subnetisfull-upgrade
+[node-security-patches]: ./concepts-security.md#node-security-patches
+[node-updates-kured]: ./node-updates-kured.md

articles/azure-monitor/alerts/action-groups.md

@@ -123,23 +123,27 @@ When you create or update an action group in the Azure portal, you can **test**
 
 1. Define an action, as described in the previous few sections. Then select **Review + create**. 
 
-1. On the page that lists the information that you entered, select **Test action group**.
+> [!NOTE]
+> 
+> If you are editing an already exisitng action group, you must save changes to the action group before testing.
+
+2. On the page that lists the information that you entered, select **Test action group**.
 
    :::image type="content" source="./media/action-groups/test-action-group.png" alt-text="Screenshot of test action group start page. A Test action group button is visible.":::
 
-2. Select a sample type and the notification and action types that you want to test. Then select **Test**.
+3. Select a sample type and the notification and action types that you want to test. Then select **Test**.
 
    :::image type="content" source="./media/action-groups/test-sample-action-group.png" alt-text="Screenshot of the Test sample action group page. An email notification type and a webhook action type are visible.":::
 
-3. If you close the window or select **Back to test setup** while the test is running, the test is stopped, and you don't get test results.
+4. If you close the window or select **Back to test setup** while the test is running, the test is stopped, and you don't get test results.
 
    :::image type="content" source="./media/action-groups/stop-running-test.png" alt-text="Screenshot of the Test sample action group page. A dialog box contains a Stop button and asks the user about stopping the test.":::
 
-4. When the test is complete, a test status of either **Success** or **Failed** appears. If the test failed and you'd like to get more information, select **View details**.
+5. When the test is complete, a test status of either **Success** or **Failed** appears. If the test failed and you'd like to get more information, select **View details**.
 
    :::image type="content" source="./media/action-groups/test-sample-failed.png" alt-text="Screenshot of the Test sample action group page. Error details are visible, and a white X on a red background indicates that a test failed.":::
 
-You can use the information in the **Error details** section to understand the issue. Then you can edit and test the action group again.
+You can use the information in the **Error details** section to understand the issue. Then you can edit, save changes, and test the action group again.
 
 When you run a test and select a notification type, you get a message with "Test" in the subject. The tests provide a way to check that your action group works as expected before you enable it in a production environment. All the details and links in test email notifications are from a sample reference set.
 

articles/azure-video-indexer/import-content-from-trial.md

@@ -7,17 +7,21 @@ ms.author: itnorman
 ms.custom: ignite-fall-2021
 ---
 
-# Import your content from the trial account
+# Import content from your trial account to a regular account
 
-When creating a new ARM-based account, you have an option to import your content from the trial account into the new ARM-based account free of charge.
+If you would like to transition from the Video Indexer trial account experience to that of a regular paid account, Video Indexer allows you at not cost to import the content in your trial content to your new regular account.
 
-## Considerations
+When might you want to switch from a trial to a regular account?
 
-Review the following considerations.
+* If you have used up the free trial minutes and want to continue indexing.
+* You are ready to start using Video Indexer for production workloads.
+* You want an experience which doesn't have minute, support, or SLA limitations. 
 
+## Create a new ARM account for the import
+
+* First you need to create an account. The regular account needs to have been already created and available before performing the import. Azure Video Indexer accounts are Azure Resource Manager (ARM) based and account creation can be performed through the Azure portal (see [Create an account with the Azure portal](create-account-portal.md)) or API (see [Create accounts with API](/rest/api/videoindexer/stable/accounts)).  
+* The target ARM-based account has to be an empty account that has not yet been used to index any media files.
 * Import from trial can be performed only once per trial account.
-* The target ARM-based account needs to be created and available before import is assigned.
-* Target ARM-based account has to be an empty account (never indexed any media files).
 
 ## Import your data
 
@@ -28,15 +32,12 @@ To import your data, follow the steps:
  3. Click the **Import content to an ARM-based account**.
  4. From the dropdown menu choose the ARM-based account you wish to import the data to.
 
-    * If the account ID isn't showing, you can copy and paste the account ID from Azure portal or the account list, on the side blade in the Azure Video Indexer Portal.
+    * If the account ID isn't showing, you can copy and paste the account ID from the Azure portal or from the list of accounts under the User account blade at the top right of the Azure Video Indexer Portal.
+    
  5. Click **Import content**
 
     :::image type="content" alt-text="Screenshot that shows how to import your data." source="./media/create-account/import-to-arm-account.png":::
 
-All media and content model customizations will be copied from the trial account into the new ARM-based account.
-
-## Next steps
+All media and as well as your customized content model will be copied from the trial account into the new ARM-based account.
 
-You can programmatically interact with your trial account and/or with your Azure Video Indexer accounts that are connected to Azure by following the instructions in: [Use APIs](video-indexer-use-apis.md).
 
-You should use the same Azure AD user you used when connecting to Azure.

articles/containers/index.yml

@@ -150,12 +150,12 @@ conceptualContent:
         - url: ../openshift/intro-openshift.md
           itemType: overview
           text: What is Azure Red Hat OpenShift?
-        - url: ../openshift/howto-setup-environment.md
-          itemType: how-to-guide
-          text: Set up your Azure Red Hat OpenShift dev environment
         - url: ../openshift/tutorial-create-cluster.md
           itemType: tutorial
           text: Create an Azure Red Hat OpenShift cluster
+        - url: ../openshift/tutorial-connect-cluster.md
+          itemType: tutorial
+          text: Connect to an Azure Red Hat OpenShift cluster
       # footerLink (optional)
       footerLink:
         url: ../openshift/index.yml

articles/cosmos-db/nosql/how-to-delete-by-partition-key.md

@@ -15,11 +15,16 @@ ms.custom:
 
 This article explains how to use the Azure Cosmos DB SDKs to delete all items by logical partition key value. 
 
+> [!IMPORTANT]
+> Delete items by partition key value is in public preview.
+> This feature is provided without a service level agreement, and it's not recommended for production workloads.
+> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+
 ## Feature overview
 
 The delete by partition key feature is an asynchronous, background operation that allows you to delete all documents with the same logical partition key value, using the Comsos SDK.
 
-Because the number of documents to be deleted may be large, the operation runs in the background. Though the physical deletion operation runs in the background, the effects will be available immediately, as the documents to be deleted will not appear in the results of queries or read operations. 
+Because the number of documents to be deleted may be large, the operation runs in the background. Though the physical deletion operation runs in the background, the effects will be available immediately, as the documents to be deleted won't appear in the results of queries or read operations. 
 
 To help limit the resources used by this background task, the delete by partition key operation is constrained to consume at most 10% of the total available RU/s on the container each second.
 
@@ -73,10 +78,10 @@ When the delete by partition key operation is issued, only the documents that ex
 ### How is the delete by partition key operation prioritized among other operations against the container?
 By default, the delete by partition key value operation can consume up to a reserved fraction - 0.1, or 10% - of the overall RU/s on the resource. Any Request Units (RUs) in this bucket that are unused will be available for other non-background operations, such as reads, writes, and queries. 
 
-For example, suppose you have provisioned 1000 RU/s on a container. There is an ongoing delete by partition key operation that consumes 100 RUs each second for 5 seconds. During each of these 5 seconds, there are 900 RUs available for non-background database operations. Once the delete operation is complete, all 1000 RU/s are now available again. 
+For example, suppose you've provisioned 1000 RU/s on a container. There's an ongoing delete by partition key operation that consumes 100 RUs each second for 5 seconds. During each of these 5 seconds, there are 900 RUs available for non-background database operations. Once the delete operation is complete, all 1000 RU/s are now available again. 
 
 ### Known issues
-For certain scenarios, the effects of a delete by partition key operation is not guaranteed to be immediately reflected. The effect may be partially seen as the operation progresses. 
+For certain scenarios, the effects of a delete by partition key operation isn't guaranteed to be immediately reflected. The effect may be partially seen as the operation progresses. 
 
 - [Aggregate queries](query/aggregate-functions.md) that use the index - for example, COUNT queries - that are issued during an ongoing delete by partition key operation may contain the results of the documents to be deleted. This may occur until the delete operation is fully complete.
 - Queries issued against the [analytical store](../analytical-store-introduction.md) during an ongoing delete by partition key operation may contain the results of the documents to be deleted. This may occur until the delete operation is fully complete.
@@ -102,4 +107,4 @@ See the following articles to learn about more SDK operations in Azure Cosmos DB
 - [Query an Azure Cosmos DB container
 ](how-to-query-container.md)
 - [Transactional batch operations in Azure Cosmos DB using the .NET SDK
-](transactional-batch.md)
+](transactional-batch.md)

articles/logic-apps/logic-apps-limits-and-config.md

@@ -5,7 +5,7 @@ services: logic-apps
 ms.suite: integration
 ms.reviewer: rohithah, laveeshb, rarayudu, azla
 ms.topic: reference
-ms.date: 11/03/2022
+ms.date: 01/23/2023
 ---
 
 # Limits and configuration reference for Azure Logic Apps
@@ -497,11 +497,6 @@ If your workflow uses [managed connectors](../connectors/managed.md), such as th
 * [Adjust communication settings for the on-premises data gateway](/data-integration/gateway/service-gateway-communication)
 * [Configure proxy settings for the on-premises data gateway](/data-integration/gateway/service-gateway-proxy)
 
-> [!IMPORTANT]
-> If you're using [Microsoft Azure operated by 21Vianet](/azure/china/), managed connectors and custom connectors don't have reserved or fixed IP addresses. 
-> So, you can't set up firewall rules for logic apps that use these connectors in this cloud. For the Azure Logic Apps service IPs, review the 
-> [documentation version for Azure operated by 21Vianet](https://docs.azure.cn/en-us/logic-apps/logic-apps-limits-and-config#firewall-ip-configuration).
-
 <a name="ip-setup-considerations"></a>
 
 ### Firewall IP configuration considerations

articles/machine-learning/how-to-secure-training-vnet.md

@@ -148,10 +148,10 @@ In the `az ml compute create` command, replace the following values:
 
 ```azurecli
 # create a compute cluster with no public IP
-az ml compute create --name cpu-cluster --resource-group rg --workspace-name ws --vnet-name yourvnet --subnet yoursubnet --type AmlCompute --set enable-node-public-ip=False
+az ml compute create --name cpu-cluster --resource-group rg --workspace-name ws --vnet-name yourvnet --subnet yoursubnet --type AmlCompute --set enable_node_public_ip=False
 
 # create a compute instance with no public IP
-az ml compute create --name myci --resource-group rg --workspace-name ws --vnet-name yourvnet --subnet yoursubnet --type ComputeInstance --set enable-node-public-ip=False
+az ml compute create --name myci --resource-group rg --workspace-name ws --vnet-name yourvnet --subnet yoursubnet --type ComputeInstance --set enable_node_public_ip=False
 ```
 
 # [Python](#tab/python)