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

Author: billmath

.openpublishing.redirection.active-directory.json

@@ -6580,6 +6580,11 @@
       "redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/scripts/powershell-export-apps-with-expriring-secrets.md",
+      "redirect_url": "/troubleshoot/azure/active-directory/manage-apps/scripts/powershell-export-apps-with-expiring-secrets",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/application-config-add-app-problem-problem-adding-gallery-app.md",
       "redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",

.openpublishing.redirection.azure-monitor.json

@@ -6150,6 +6150,11 @@
             "source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
             "redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
+            "redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
+            "redirect_document_id": false
         }
 
     ]

README.md

@@ -1,6 +1,6 @@
 # Microsoft Azure Documentation
 
-Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
+Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation. 
 
 ## Getting Started
 

articles/active-directory/develop/howto-restore-app.md

@@ -59,7 +59,7 @@ This is because organization-specific settings are stored on a separate object,
 2. Select **Restore app registration**.
 
 ## Permanently delete an application
-You can manually permanently delete an application from your organization. A permanently deleted application can't be restored by you, another administrator, or by Microsoft customer support.
+You can manually permanently delete an application from your organization. A permanently deleted application can't be restored by you, another administrator, or by Microsoft customer support. However, this does not permanently delete the corresponding service principal. A service principal cannot be restored without having an active corresponding application, so the service principal can be manually deleted, which is also permanent. If no action is taken the service principal will be permanently deleted 30 days after deleting the application.
 
 ### To permanently delete an application
 

articles/active-directory/develop/msal-android-shared-devices.md

@@ -95,13 +95,10 @@ These Microsoft applications support Azure AD's shared device mode:
 
 - [Microsoft Teams](/microsoftteams/platform/)
 - [Microsoft Managed Home Screen](/mem/intune/apps/app-configuration-managed-home-screen-app) app for Android Enterprise
-- [Microsoft Edge](/microsoft-edge) (in Public Preview)
-- [Outlook](/mem/intune/apps/app-configuration-policies-outlook) (in Public Preview)
-- [Microsoft Power Apps](/power-apps) (in Public Preview)
-- [Yammer](/yammer) (in Public Preview)
-
-> [!IMPORTANT]
-> Public preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Supplemental terms of use for Microsoft Azure previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+- [Microsoft Edge](/microsoft-edge)
+- [Outlook](/mem/intune/apps/app-configuration-policies-outlook)
+- [Microsoft Power Apps](/power-apps)
+- [Microsoft Viva Engage](/viva/engage/overview) (previously [Yammer](/yammer))
 
 ## Shared device sign-out and the overall app lifecycle
 

articles/active-directory/enterprise-users/media/users-restrict-guest-permissions/external-collaboration-settings.png

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
 ms.topic: conceptual
-ms.date: 05/09/2023
+ms.date: 05/24/2023
 ms.author: cmulligan
 ms.custom: it-pro
 
@@ -27,10 +27,9 @@ Adding secure sign-in to your app and setting up a customer identity and access
 This article describes each of these steps and outlines important planning considerations. In the following table, select a **Step** for details and planning considerations, or go directly to the **How-to guides**.
 
 
-
 | Step  |  How-to guides |
 |---------|---------|
-| **[Step 1: Create a customer tenant](#step-1-create-a-customer-tenant)**   | &#8226; [Create a customer tenant](how-to-create-customer-tenant-portal.md)</br>&#8226; [Or start a free trial](https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl)  |
+|**[Step 1: Create a customer tenant](#step-1-create-a-customer-tenant)**   | &#8226; [Create a customer tenant](how-to-create-customer-tenant-portal.md)</br>&#8226; <a href="https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl" target="_blank">Or start a free trial</a>  |
 |**[Step 2: Register your application](#step-2-register-your-application)**   | &#8226; [Register your application](how-to-register-ciam-app.md)  |
 |**[Step 3: Integrate a sign-in flow with your app](#step-3-integrate-a-sign-in-flow-with-your-app)**     | &#8226; [Create a user flow](how-to-user-flow-sign-up-sign-in-customers.md) </br>&#8226; [Add your app to the user flow](how-to-user-flow-add-application.md)   |
 |**[Step 4: Customize and secure your sign-in](#step-4-customize-and-secure-your-sign-in)**     |  &#8226; [Customize branding](concept-branding-customers.md) </br>&#8226; [Add identity providers](concept-authentication-methods-customers.md)  </br>&#8226; [Collect attributes during sign-up](how-to-define-custom-attributes.md)</br>&#8226; [Add attributes to the token](how-to-add-attributes-to-token.md) </br>&#8226; [Add multifactor authentication (MFA)](concept-security-customers.md)    |

articles/active-directory/external-identities/customers/concept-planning-your-solution.md

@@ -26,7 +26,7 @@ This how-to guide uses a sample ASP.NET browserless app to show how to add authe
 
 - [Visual Studio Code](https://code.visualstudio.com/download) or another code editor.
 
-- Azure AD for customers tenant. If you don't already have one, [sign up for a free trial](https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl). 
+- Azure AD for customers tenant. If you don't already have one, <a href="https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl" target="_blank">sign up for a free trial</a>. 
 
 ## Register the headless app
 

articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sample-sign-in.md

@@ -32,7 +32,7 @@ The article series is broken down into the following steps:
 
 - [Visual Studio Code](https://code.visualstudio.com/download) or another code editor.
 
-- Azure AD for customers tenant. If you don't already have one, [sign up for a free trial](https://aka.ms/ciam-free-trial).
+- Azure AD for customers tenant. If you don't already have one, <a href="https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl" target="_blank">sign up for a free trial</a>.
 
 ##  OAuth 2.0 device authorization grant flow
 

articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-overview.md

@@ -38,7 +38,7 @@ In this article, you complete the following tasks:
 
 - [Visual Studio Code](https://code.visualstudio.com/download) or another code editor.
 
-- Azure AD for customers tenant. If you don't already have one, [sign up for a free trial](https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl). 
+- Azure AD for customers tenant. If you don't already have one, <a href="https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl" target="_blank">sign up for a free trial</a>. 
 
 ## Register the browserless app