Merge branch 'main' into patch-1

Author: Jak-MS

.openpublishing.publish.config.json

@@ -946,6 +946,7 @@
     "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
     "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
     ".openpublishing.redirection.virtual-desktop.json",
+    ".openpublishing.redirection.deployment-environments.json",
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
     "articles/applied-ai-services/.openpublishing.archived.json",
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",

.openpublishing.redirection.azure-monitor.json

@@ -5440,6 +5440,26 @@
             "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
             "redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-integration.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-existing-clusters.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-new-cluster.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
+            "redirect_document_id": false
         }
         ,
         {

.openpublishing.redirection.defender-for-cloud.json

@@ -710,6 +710,16 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-containers-usage",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-data-collection.md",
+            "redirect_url": "/azure/defender-for-cloud/monitoring-components",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-usage.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-va-acr",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/file-integrity-monitoring-usage.md",
             "redirect_url": "/azure/defender-for-cloud/file-integrity-monitoring-enable-log-analytics",
@@ -720,5 +730,6 @@
             "redirect_url": "/azure/defender-for-cloud/release-notes#azure-monitor-agent-integration-now-in-preview",
             "redirect_document_id": true
         }
+    
       ]
 }

.openpublishing.redirection.deployment-environments.json

@@ -0,0 +1,19 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/deployment-environments/how-to-configure-environment-types.md",
+      "redirect_url": "/azure/deployment-environments/how-to-configure-project-environment-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/deployment-environments/tutorial-create-and-configure-devcenter.md",
+      "redirect_url": "/azure/deployment-environments/quickstart-create-and-configure-devcenter",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/deployment-environments/tutorial-create-and-configure-projects.md",
+      "redirect_url": "/azure/deployment-environments/quickstart-create-and-configure-projects",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
     "redirections": [
+        {
+            "source_path":  "articles/backup/sap-hana-db-manage.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-manage",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/backup/sap-hana-db-restore.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-restore",
+            "redirect_document_id":  false  
+        },
+        {
+            "source_path":  "articles/backup/sap-hana-db-about.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-about",
+            "redirect_document_id":  false
+        },
         {
             "source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-dotnet-legacy.md",
             "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
@@ -11313,6 +11328,11 @@
             "redirect_url": "/azure/ddos-protection/telemetry",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/ddos-protection/ddos-protection-standard-features.md",
+            "redirect_url": "/azure/ddos-protection/ddos-protection-features",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/asc-for-iot/index.yml",
             "redirect_url": "/azure/defender-for-iot/",

articles/active-directory-b2c/json-transformations.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 08/10/2022
+ms.date: 09/07/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -251,6 +251,26 @@ The following claims transformation outputs a JSON string claim that will be the
     }
     ```
 
+The **GenerateJson** claims transformation accepts plain strings. If an input claim contains a JSON string, that string will be escaped. In the following example, if you use email output from [CreateJsonArray above](json-transformations.md#example-of-createjsonarray), that is ["[email protected]"], as an input parameter, the email will look like as shown in the following JSON claim:
+
+- Output claim:
+  - **requestBody**:
+
+    ```json
+    {
+       "customerEntity":{
+          "email":"[\"[email protected]\"]",
+          "userObjectId":"01234567-89ab-cdef-0123-456789abcdef",
+          "firstName":"John",
+          "lastName":"Smith",
+          "role":{
+             "name":"Administrator",
+             "id": 1
+          }
+       }
+    }
+    ```
+
 ## GetClaimFromJson
 
 Get a specified element from a JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimfromjson) of this claims transformation.

articles/active-directory-b2c/user-profile-attributes.md

@@ -8,9 +8,10 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 09/24/2021
+ms.date: 10/11/2021
 ms.author: kengaderdus
 ms.subservice: B2C
+ms.custom: b2c-support
 ---
 
 # User profile attributes
@@ -48,7 +49,7 @@ The table below lists the [user resource type](/graph/api/resources/user) attrib
 |creationType    |String|If the user account was created as a local account for an Azure Active Directory B2C tenant, the value is LocalAccount or nameCoexistence. Read only.|No|No|Persisted, Output|
 |dateOfBirth     |Date|Date of birth.|No|No|Persisted, Output|
 |department      |String|The name for the department in which the user works. Max length 64.|Yes|No|Persisted, Output|
-|displayName     |String|The display name for the user. Max length 256.|Yes|Yes|Persisted, Output|
+|displayName     |String|The display name for the user. Max length 256. \< \> characters aren't allowed. | Yes|Yes|Persisted, Output|
 |facsimileTelephoneNumber<sup>1</sup>|String|The telephone number of the user's business fax machine.|Yes|No|Persisted, Output|
 |givenName       |String|The given name (first name) of the user. Max length 64.|Yes|Yes|Persisted, Output|
 |jobTitle        |String|The user's job title. Max length 128.|Yes|Yes|Persisted, Output|
@@ -165,7 +166,7 @@ In user migration scenarios, if the accounts you want to migrate have weaker pas
 
 ## MFA phone number attribute
 
-When using a phone for multi-factor authentication (MFA), the mobile phone is used to verify the user identity. To [add](/graph/api/authentication-post-phonemethods) a new phone number programmatically, [update](/graph/api/b2cauthenticationmethodspolicy-update), [get](/graph/api/b2cauthenticationmethodspolicy-get), or [delete](/graph/api/phoneauthenticationmethod-delete) the phone number, use MS Graph API [phone authentication method](/graph/api/resources/phoneauthenticationmethod).
+When using a phone for multi-factor authentication (MFA), the mobile phone is used to verify the user identity. To [add](/graph/api/authentication-post-phonemethods) a new phone number programmatically, [update](/graph/api/phoneauthenticationmethod-update), [get](/graph/api/phoneauthenticationmethod-get), or [delete](/graph/api/phoneauthenticationmethod-delete) the phone number, use MS Graph API [phone authentication method](/graph/api/resources/phoneauthenticationmethod).
 
 In Azure AD B2C [custom policies](custom-policy-overview.md), the phone number is available through `strongAuthenticationPhoneNumber` claim type.
 

articles/active-directory/app-proxy/what-is-application-proxy.md

@@ -11,7 +11,7 @@ ms.workload: identity
 ms.date: 08/29/2022
 ms.author: kenwith
 ms.reviewer: ashishj
-ms.custom: has-adal-ref
+ms.custom: has-adal-ref, ignite-2022
 ---
 
 # Using Azure AD Application Proxy to publish on-premises apps for remote users
@@ -134,7 +134,7 @@ The following diagram illustrates in general how Azure AD authentication service
 
 |**Component**|**Description**|
 |:-|:-|
-|Endpoint|The endpoint is a URL or an [user portal](../manage-apps/end-user-experiences.md). Users can reach applications while outside of your network by accessing an external URL. Users within your network can access the application through a URL or an user portal. When users go to one of these endpoints, they authenticate in Azure AD and then are routed through the connector to the on-premises application.|
+|Endpoint|The endpoint is a URL or an [user portal](../manage-apps/end-user-experiences.md). Users can reach applications while outside of your network by accessing an external URL. Users within your network can access the application through a URL or a user portal. When users go to one of these endpoints, they authenticate in Azure AD and then are routed through the connector to the on-premises application.|
 |Azure AD|Azure AD performs the authentication using the tenant directory stored in the cloud.|
 |Application Proxy service|This Application Proxy service runs in the cloud as part of Azure AD. It passes the sign-on token from the user to the Application Proxy Connector. Application Proxy forwards any accessible headers on the request and sets the headers as per its protocol, to the client IP address. If the incoming request to the proxy already has that header, the client IP address is added to the end of the comma-separated list that is the value of the header.|
 |Application Proxy connector|The connector is a lightweight agent that runs on a Windows Server inside your network. The connector manages communication between the Application Proxy service in the cloud and the on-premises application. The connector only uses outbound connections, so you don't have to open any inbound ports or put anything in the DMZ. The connectors are stateless and pull information from the cloud as necessary. For more information about connectors, like how they load-balance and authenticate, see [Understand Azure AD Application Proxy connectors](./application-proxy-connectors.md).|

articles/active-directory/authentication/how-to-mfa-registration-campaign.md

@@ -5,6 +5,7 @@ description: Learn how to move your organization away from less secure authentic
 services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
+ms.custom: ignite-2022
 ms.topic: conceptual
 ms.date: 06/23/2022
 
@@ -13,8 +14,7 @@ author: mjsantani
 manager: amycolannino
 
 ms.collection: M365-identity-device-management
-
-# Customer intent: As an identity administrator, I want to encourage users to use the Microsoft Authenticator app in Azure AD to improve and secure user sign-in events.
+#Customer intent: As an identity administrator, I want to encourage users to use the Microsoft Authenticator app in Azure AD to improve and secure user sign-in events.
 ---
 # How to run a registration campaign to set up Microsoft Authenticator - Microsoft Authenticator
 
@@ -277,7 +277,7 @@ The feature aims to empower admins to get users set up with MFA using the Authen
 
 If this user doesn’t have the Authenticator app set up for push notifications and is enabled for it by policy, yes, the user will see the nudge. 
 
-**Will a user who has a the Authenticator app setup only for TOTP codes see the nudge?** 
+**Will a user who has the Authenticator app setup only for TOTP codes see the nudge?** 
 
 Yes. If the Authenticator app is not set up for push notifications and the user is enabled for it by policy, yes, the user will see the nudge.
 
@@ -308,4 +308,4 @@ It's the same as snoozing.
 
 ## Next steps
 
-[Enable passwordless sign-in with Microsoft Authenticator](howto-authentication-passwordless-phone.md)
+[Enable passwordless sign-in with Microsoft Authenticator](howto-authentication-passwordless-phone.md)

articles/active-directory/azuread-dev/videos.md

@@ -10,7 +10,7 @@ ms.topic: conceptual
 ms.workload: identity
 ms.date: 02/12/2020
 ms.author: marsma
-ms.custom: aaddev
+ms.custom: aaddev, ignite-2022
 ms.reviewer: celested
 ROBOTS: NOINDEX
 ---
@@ -21,7 +21,7 @@ Learn about the new Microsoft identity platform and how to migrate to it from th
 
 ## Migrate from v1.0 to v2.0
 
-**Learn about migrating to the the latest version of the Microsoft identity platform**
+**Learn about migrating to the latest version of the Microsoft identity platform**
 
 :::row:::
     :::column:::