Merge pull request #206091 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

.openpublishing.redirection.azure-monitor.json

@@ -420,6 +420,11 @@
             "source_path_from_root": "/articles/azure-monitor/insights/network-insights-overview.md" ,
             "redirect_url": "/azure/network-watcher/network-insights-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/key-vault-insights-overview.md" ,
+            "redirect_url": "/azure/key-vault/key-vault-insights-overview",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory/fundamentals/security-operations-privileged-accounts.md

@@ -34,7 +34,7 @@ The log files you use for investigation and monitoring are:
 
 * [Azure AD Audit logs](../reports-monitoring/concept-audit-logs.md)
 * [Microsoft 365 Audit logs](/microsoft-365/compliance/auditing-solutions-overview)
-* [Azure Key Vault insights](../../azure-monitor/insights/key-vault-insights-overview.md)
+* [Azure Key Vault insights](../../key-vault/key-vault-insights-overview.md)
 
 From the Azure portal, you can view the Azure AD Audit logs and download as comma-separated value (CSV) or JavaScript Object Notation (JSON) files. The Azure portal has several ways to integrate Azure AD logs with other tools that allow for greater automation of monitoring and alerting:
 

articles/active-directory/roles/security-emergency-access.md

@@ -89,7 +89,7 @@ Some organizations use AD Domain Services and AD FS or similar identity provider
 
 ## Store account credentials safely
 
-Organizations need to ensure that the credentials for emergency access accounts are kept secure and known only to individuals who are authorized to use them. Some customers use a smartcard and others use passwords. A password for an emergency access account is usually separated into two or three parts, written on separate pieces of paper, and stored in secure, fireproof safes that are in secure, separate locations.
+Organizations need to ensure that the credentials for emergency access accounts are kept secure and known only to individuals who are authorized to use them. Some customers use a smartcard for Windows Server AD, a [FIDO2 security key](../authentication/howto-authentication-passwordless-security-key.md) for Azure AD and others use passwords. A password for an emergency access account is usually separated into two or three parts, written on separate pieces of paper, and stored in secure, fireproof safes that are in secure, separate locations.
 
 If using passwords, make sure the accounts have strong passwords that do not expire the password. Ideally, the passwords should be at least 16 characters long and randomly generated.
 

articles/aks/learn/quick-kubernetes-deploy-rm-template.md

@@ -63,8 +63,6 @@ For more information about creating SSH keys, see [Create and manage SSH keys fo
 
 The template used in this quickstart is from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/aks/).
 
-:::code language="json" source="~/quickstart-templates/quickstarts/microsoft.kubernetes/aks/azuredeploy.json":::
-
 For more AKS samples, see the [AKS quickstart templates][aks-quickstart-templates] site.
 
 ## Deploy the template

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-browse-app-1.md

@@ -0,0 +1,14 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+
+In the App Service page:
+
+1. From the left menu, select **Overview**.
+
+1. Select the URL of your app.
+
+    You can also navigate directly to `https://<app-name>.azurewebsites.net`.

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-browse-app-2.md

@@ -0,0 +1,10 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+
+Add a few tasks to the list.
+
+Congratulations, you're running a data-driven PHP app in Azure App Service.

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-change-site-root-1.md

@@ -0,0 +1,12 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+
+In the App Service page:
+
+1. From the left menu, select **Configuration**.
+
+1. Select the **General settings** tab.

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-change-site-root-2.md

@@ -0,0 +1,14 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+
+In the General settings tab:
+
+1. In the **Startup Command** box, enter the following command: *cp /home/site/wwwroot/default /etc/nginx/sites-available/default && service nginx reload*.
+
+    It replaces the Nginx configuration file in the PHP 8.0 container and restarts Nginx. This configuration ensures that this change is made to the container each time it starts.
+
+1. Select **Save**.

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-clean-up-resources-1.md

@@ -0,0 +1,11 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+In the search bar at the top of the Azure portal:
+
+   1. Enter the resource group name.
+
+   1. Select the resource group.

articles/app-service/includes/tutorial-php-mysql-app/azure-portal-clean-up-resources-2.md

@@ -0,0 +1,8 @@
+---
+author: cephalin
+ms.author: cephalin
+ms.topic: include
+ms.date: 07/07/2022
+---
+
+In the resource group page, click **Delete resource group**.