Merge pull request #210512 from MicrosoftDocs/main

Merge main to live, 4AM

Author: Jak-MS

.openpublishing.redirection.json

@@ -34262,6 +34262,11 @@
   "source_path_from_root": "/articles/virtual-machines/linux/copy-files-to-linux-vm-using-scp.md",
   "redirect_url": "/azure/virtual-machines/copy-files-to-vm-using-scp",
   "redirect_document_id": false
+},
+{
+  "source_path_from_root": "/articles/web-application-firewall/afds/waf-front-door-rate-limit-powershell.md",
+  "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-rate-limit-configure",
+  "redirect_document_id": true
 }
 	]
 }

articles/active-directory/manage-apps/configure-user-consent.md

@@ -2,14 +2,15 @@
 title: Configure how users consent to applications
 description: Learn how to manage how and when users can consent to applications that will have access to your organization's data.
 services: active-directory
-author: psignoret
+author: yuhko-msft
 manager: CelesteDG
 ms.service: active-directory
 ms.subservice: app-mgmt
 ms.workload: identity
 ms.topic: how-to
 ms.date: 08/10/2022
-ms.author: phsignor
+ms.author: yuhko
+ms.reviewer: phsignor
 ms.custom: contperf-fy21q2, contperf-fy22q2
 
 #customer intent: As an admin, I want to configure how end-users consent to applications.

articles/active-directory/manage-apps/manage-app-consent-policies.md

@@ -2,13 +2,14 @@
 title: Manage app consent policies
 description: Learn how to manage built-in and custom app consent policies to control when consent can be granted.
 services: active-directory
-author: psignoret
+author: yuhko-msft
 ms.service: active-directory
 ms.subservice: app-mgmt
 ms.workload: identity
 ms.topic: how-to
 ms.date: 09/02/2021
-ms.author: phsignor
+ms.author: yuhko
+ms.reviewer: phsignor
 ms.custom: contperf-fy21q2
 
 #customer intent: As an admin, I want to manage app consent policies for enterprise applications in Azure AD

articles/active-directory/managed-identities-azure-resources/qs-configure-template-windows-vm.md

@@ -120,7 +120,7 @@ In this section, you assign a user-assigned managed identity to an Azure VM usin
 
 ### Assign a user-assigned managed identity to an Azure VM
 
-To assign a user-assigned identity to a VM, your account needs the [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor) and [Managed Identity Operator](../../role-based-access-control/built-in-roles.md#managed-identity-operator) role assignments. No other Azure AD directory role assignments are required.
+To assign a user-assigned identity to a VM, your account needs the [Managed Identity Operator](../../role-based-access-control/built-in-roles.md#managed-identity-operator) role assignment. No other Azure AD directory role assignments are required.
 
 1. Under the `resources` element, add the following entry to assign a user-assigned managed identity to your VM.  Be sure to replace `<USERASSIGNEDIDENTITY>` with the name of the user-assigned managed identity you created.
 

articles/active-directory/saas-apps/fortigate-ssl-vpn-tutorial.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 05/13/2022
+ms.date: 09/08/2022
 ms.author: jeedes
 ---
 
@@ -219,7 +219,7 @@ To complete these steps, you'll need the values you recorded earlier:
     		set entity-id < Identifier (Entity ID)Entity ID>
     		set single-sign-on-url < Reply URL Reply URL>
     		set single-logout-url <Logout URL>
-    		set idp-entity-id <Azure AD Identifier>
+    		set idp-entity-id <Azure Login URL>
 		set idp-single-sign-on-url <Azure AD Identifier>
     		set idp-single-logout-url <Azure Logout URL>
     		set idp-cert <Base64 SAML Certificate Name>

articles/active-directory/saas-apps/infrascale-cloud-backup-tutorial.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 06/24/2022
+ms.date: 09/08/2022
 ms.author: jeedes
 
 ---
@@ -78,28 +78,11 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     b. In the **Reply URL** textbox, type the URL:
     `https://dashboard.managedoffsitebackup.net/Account/AssertionConsumerService`  
 
-    c. In the **Sign-on URL** text box, type one of the following URLs:
-    
-    | **Sign-on URL** |
-    |------------|
-    | `https://dashboard.avgonlinebackup.com/Account/SingleSignOn` |
-    | `https://dashboard.infrascale.com/Account/SingleSignOn` |
-    | `https://dashboard.managedoffsitebackup.net/Account/SingleSignOn` |
-    | `https://dashboard.sosonlinebackup.com/Account/SingleSignOn` |
-    |`https://dashboard.trustboxbackup.com/Account/SingleSignOn` |
-    | `https://radialpoint-dashboard.managedoffsitebackup.net/Account/SingleSignOn` |
-    | `https://dashboard-cw.infrascale.com/Account/SingleSignOn` |
-    | `https://dashboard.digicelcloudbackup.com/Account/SingleSignOn` |
-    | `https://dashboard-cw.sosonlinebackup.com/Account/SingleSignOn` |
-    |`https://dashboard.my-data.dk/Account/SingleSignOn` |
-    |`https://dashboard.beesafe.nu/Account/SingleSignOn` |
-    |`https://dashboard.bekcloud.com/Account/SingleSignOn` |
-    | `https://dashboard.alltimesecure.com/Account/SingleSignOn` |
-    | `https://dashboard-ec1.sosonlinebackup.com/Account/SingleSignOn` |
-    | `https://dashboard.glcsecurecloud.com/Account/SingleSignOninfrascalecloudbackup.com/infrascalecloudbackup.com/` |
+    c. The **Sign-on URL** text box requires a specific URL for your company. The general pattern of the URL is:
+    `https://[OptionalPrefix]dashboard[OptionalSuffix].CompanySpecificString.[com/net,etc]/Account/SingleSignOn`
 
     > [!Note]
-    > The Identifier value is not real. Update this value with the actual Identifier URL. Contact [Infrascale Cloud Backup support team](mailto:[email protected]) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+    > Do not enter this in the Sign-on URL text box. The Identifier value is not a real URL – just a general pattern. Update this value with the actual Identifier URL obtained from Infrascale. Contact [Infrascale Cloud Backup support team](mailto:[email protected]) to get the value.
 
 1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
 

articles/aks/TOC.yml

@@ -44,7 +44,7 @@
           href: quickstart-helm.md
         - name: Develop with Dapr
           href: quickstart-dapr.md
-    - name: Subscribe to AKS events with Event Grid (Preview)
+    - name: Subscribe to AKS events with Event Grid
       href: quickstart-event-grid.md
 - name: Tutorials
   items:

articles/aks/quickstart-event-grid.md

@@ -1,5 +1,5 @@
 ---
-title: Subscribe to Azure Kubernetes Service events with Azure Event Grid  (Preview)
+title: Subscribe to Azure Kubernetes Service events with Azure Event Grid
 description: Use Azure Event Grid to subscribe to Azure Kubernetes Service events
 services: container-service
 author: zr-msft
@@ -8,70 +8,17 @@ ms.date: 07/12/2021
 ms.author: zarhoads
 ---
 
-# Quickstart: Subscribe to Azure Kubernetes Service (AKS) events with Azure Event Grid (Preview)
+# Quickstart: Subscribe to Azure Kubernetes Service (AKS) events with Azure Event Grid
 
 Azure Event Grid is a fully managed event routing service that provides uniform event consumption using a publish-subscribe model.
 
 In this quickstart, you'll create an AKS cluster and subscribe to AKS events.
 
-[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
-
 ## Prerequisites
 
 * An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
 * [Azure CLI][azure-cli-install] or [Azure PowerShell][azure-powershell-install] installed.
 
-### Register the `EventgridPreview` preview feature
-
-To use the feature, you must also enable the `EventgridPreview` feature flag on your subscription.
-
-### [Azure CLI](#tab/azure-cli)
-
-Register the `EventgridPreview` feature flag by using the [az feature register][az-feature-register] command, as shown in the following example:
-
-```azurecli-interactive
-az feature register --namespace "Microsoft.ContainerService" --name "EventgridPreview"
-```
-
-It takes a few minutes for the status to show *Registered*. Verify the registration status by using the [az feature list][az-feature-list] command:
-
-```azurecli-interactive
-az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/EventgridPreview')].{Name:name,State:properties.state}"
-```
-
-When ready, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [az provider register][az-provider-register] command:
-
-```azurecli-interactive
-az provider register --namespace Microsoft.ContainerService
-```
-
-[!INCLUDE [event-grid-register-provider-cli.md](../../includes/event-grid-register-provider-cli.md)]
-
-### [Azure PowerShell](#tab/azure-powershell)
-
-Register the `EventgridPreview` feature flag by using the [Register-AzProviderPreviewFeature][register-azproviderpreviewfeature] cmdlet, as shown in the following example:
-
-```azurepowershell-interactive
-Register-AzProviderPreviewFeature -ProviderNamespace Microsoft.ContainerService -Name EventgridPreview
-```
-
-It takes a few minutes for the status to show *Registered*. Verify the registration status by using the [Get-AzProviderPreviewFeature][get-azproviderpreviewfeature] cmdlet:
-
-```azurepowershell-interactive
-Get-AzProviderPreviewFeature -ProviderNamespace Microsoft.ContainerService -Name EventgridPreview |
- Format-Table -Property Name, @{name='State'; expression={$_.Properties.State}}
-```
-
-When ready, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [Register-AzResourceProvider][register-azresourceprovider] command:
-
-```azurepowershell-interactive
-Register-AzResourceProvider -ProviderNamespace Microsoft.ContainerService
-```
-
-[!INCLUDE [event-grid-register-provider-powershell.md](../../includes/event-grid-register-provider-powershell.md)]
-
----
-
 ## Create an AKS cluster
 
 ### [Azure CLI](#tab/azure-cli)
@@ -267,12 +214,6 @@ To learn more about AKS, and walk through a complete code to deployment example,
 [new-azeventhub]: /powershell/module/az.eventhub/new-azeventhub
 [az-eventgrid-event-subscription-create]: /cli/azure/eventgrid/event-subscription#az-eventgrid-event-subscription-create
 [new-azeventgridsubscription]: /powershell/module/az.eventgrid/new-azeventgridsubscription
-[az-feature-register]: /cli/azure/feature#az_feature_register
-[register-azproviderpreviewfeature]: /powershell/module/az.resources/register-azproviderpreviewfeature
-[az-feature-list]: /cli/azure/feature#az_feature_list
-[get-azproviderpreviewfeature]: /powershell/module/az.resources/get-azproviderpreviewfeature
-[az-provider-register]: /cli/azure/provider#az_provider_register
-[register-azresourceprovider]: /powershell/module/az.resources/register-azresourceprovider
 [az-group-delete]: /cli/azure/group#az_group_delete
 [sp-delete]: kubernetes-service-principal.md#other-considerations
 [remove-azresourcegroup]: /powershell/module/az.resources/remove-azresourcegroup

articles/app-service/configure-custom-container.md

@@ -494,7 +494,7 @@ The following lists show supported and unsupported Docker Compose configuration
 - networks (ignored)
 - secrets (ignored)
 - ports other than 80 and 8080 (ignored)
-
+- default environment variables like `$variable and ${variable}` unlike in docker
 #### Syntax Limitations
 
 - "version x.x" always needs to be the first YAML statement in the file

articles/app-service/quickstart-wordpress.md

@@ -9,24 +9,19 @@ ms.author: msangapu
 ms.custom: mvc
 ---
 # Create a WordPress site
-<!--
-Other WP options on Azure:
-- https://docs.microsoft.com/en-us/azure/mysql/flexible-server/tutorial-deploy-wordpress-on-aks
-- https://docs.microsoft.com/en-us/azure/virtual-machines/linux/tutorial-lamp-stack#install-wordpress
--->
 
-[WordPress](https://www.wordpress.org) is an open source content management system (CMS) that can be used to create websites, blogs, and other applications. Over 40% of the web uses WordPress from  blogs to major news websites.
+[WordPress](https://www.wordpress.org) is an open source content management system (CMS) that can be used to create websites, blogs, and other applications. Over 40% of the web uses WordPress from  blogs to major news websites. WordPress can be run on a few different Azure services: [AKS](/azure/mysql/flexible-server/tutorial-deploy-wordpress-on-aks), [Virtual Machines](/azure/virtual-machines/linux/tutorial-lamp-stack#install-wordpress), and App Service. For a full list of WordPress options on Azure, see [WordPress on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?search=wordpress&page=1)
 
-In this quickstart, you'll learn how to create and deploy your first [WordPress](https://www.wordpress.org) site to [Azure App Service on Linux](overview.md#app-service-on-linux) using the [WordPress on the Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/WordPress.WordPress?tab=Overview). It uses the **Basic** tier and [**incurs a cost**](https://azure.microsoft.com/pricing/details/app-service/linux/) for your Azure subscription. The WordPress installation comes with pre-installed plugins for performance improvements, [W3TC](https://wordpress.org/plugins/w3-total-cache/) for caching and [Smush](https://wordpress.org/plugins/wp-smushit/) for image compression.
+In this quickstart, you'll learn how to create and deploy your first [WordPress](https://azuremarketplace.microsoft.com/marketplace/apps/WordPress.WordPress?tab=Overview) site to [Azure App Service on Linux](overview.md#app-service-on-linux). It uses the **Basic** tier and [**incurs a cost**](https://azure.microsoft.com/pricing/details/app-service/linux/) for your Azure subscription. The WordPress installation comes with pre-installed plugins for performance improvements, [W3TC](https://wordpress.org/plugins/w3-total-cache/) for caching and [Smush](https://wordpress.org/plugins/wp-smushit/) for image compression.
 
 To complete this quickstart, you need an Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs).
 
 > [!IMPORTANT]
 > - [After November 28, 2022, PHP will only be supported on App Service on Linux.](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#end-of-life-for-php-74).
 > - The MySQL Flexible Server is created behind a private [Virtual Network](/azure/virtual-network/virtual-networks-overview) and can't be accessed directly. To access the database, use phpMyAdmin that's deployed with the WordPress site. It can be found at the URL : https://`<sitename>`.azurewebsites.net/phpmyadmin
 >
->  If you have feedback to improve this WordPress offering on App Service, submit your ideas at [Web Apps Community](https://feedback.azure.com/d365community/forum/b09330d1-c625-ec11-b6e6-000d3a4f0f1c).
-
+>  Additional documentation, including [Migrating to App Service](https://github.com/Azure/wordpress-linux-appservice/blob/main/WordPress/wordpress_migration_linux_appservices.md), can be found at [WordPress - App Service on Linux](https://github.com/Azure/wordpress-linux-appservice/tree/main/WordPress). If you have feedback to improve this WordPress offering on App Service, submit your ideas at [Web Apps Community](https://feedback.azure.com/d365community/forum/b09330d1-c625-ec11-b6e6-000d3a4f0f1c). 
+>
 ## Create WordPress site using Azure portal
 
 1. To start creating the WordPress site, browse to [https://ms.portal.azure.com/#create/WordPress.WordPress](https://ms.portal.azure.com/#create/WordPress.WordPress).
@@ -73,11 +68,11 @@ When no longer needed, you can delete the resource group, App service, and all r
     :::image type="content" source="./media/quickstart-wordpress/delete-resource-group.png" alt-text="Delete resource group.":::
 ## Change MySQL password
 
-The WordPress configuration is modified to use [Application Settings](reference-app-settings.md#wordpress) to connect to the MySQL database. To change the MySQL database password, see [update admin password](../mysql/single-server/how-to-create-manage-server-portal.md#update-admin-password). Whenever the MySQL database credentials are changed, the [Application Settings](reference-app-settings.md#wordpress) also need to be updated. The [Application Settings for MySQL database](reference-app-settings.md#wordpress) begin with the **`DATABASE_`** prefix. For more information on updating MySQL passwords, see [WordPress on App Service](https://azure.github.io/AppService/2022/02/23/WordPress-on-App-Service-Public-Preview.html#known-limitations).
+The WordPress configuration is modified to use [Application Settings](reference-app-settings.md#wordpress) to connect to the MySQL database. To change the MySQL database password, see [update admin password](../mysql/single-server/how-to-create-manage-server-portal.md#update-admin-password). Whenever the MySQL database credentials are changed, the [Application Settings](reference-app-settings.md#wordpress) also need to be updated. The [Application Settings for MySQL database](reference-app-settings.md#wordpress) begin with the **`DATABASE_`** prefix. For more information on updating MySQL passwords, see [Changing MySQL database password](https://github.com/Azure/wordpress-linux-appservice/blob/main/WordPress/changing_mysql_database_password.md).
 
 ## Change WordPress admin password
 
-The [Application Settings](reference-app-settings.md#wordpress) for WordPress admin credentials are only for deployment purposes. Modifying these values has no effect on the WordPress installation. To change the WordPress admin password, see [resetting your password](https://wordpress.org/support/article/resetting-your-password/#to-change-your-password). The [Application Settings for WordPress admin credentials](reference-app-settings.md#wordpress) begin with the **`WORDPRESS_ADMIN_`** prefix. For more information on updating the WordPress admin password, see [WordPress on App Service](https://azure.github.io/AppService/2022/02/23/WordPress-on-App-Service-Public-Preview.html#known-limitations).
+The [Application Settings](reference-app-settings.md#wordpress) for WordPress admin credentials are only for deployment purposes. Modifying these values has no effect on the WordPress installation. To change the WordPress admin password, see [resetting your password](https://wordpress.org/support/article/resetting-your-password/#to-change-your-password). The [Application Settings for WordPress admin credentials](reference-app-settings.md#wordpress) begin with the **`WORDPRESS_ADMIN_`** prefix. For more information on updating the WordPress admin password, see [Changing WordPress Admin Credentials](https://github.com/Azure/wordpress-linux-appservice/blob/main/WordPress/changing_wordpress_admin_credentials.md).
 
 ## Next steps