Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into Minor-doc-update-for-http_proxy

Author: PatAltimore

.openpublishing.redirection.active-directory.json

@@ -3433,17 +3433,17 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
-      "redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
+      "redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
-      "redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
+      "redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
-      "redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
+      "redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
       "redirect_document_id": false
     },
     {
@@ -5536,6 +5536,21 @@
       "redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
+      "redirect_url": "/azure/active-directory/develop/application-consent-experience",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
+      "redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
+      "redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
       "redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

.openpublishing.redirection.azure-monitor.json

@@ -5511,6 +5511,11 @@
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
             "redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -9,6 +9,11 @@
             "source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
             "redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
             "redirect_document_id": false
+        },       
+        {
+            "source_path":  "articles/sentinel/whats-new-archive.md",
+            "redirect_url":  "/azure/sentinel/whats-new",
+            "redirect_document_id":  false   
         },
         {
             "source_path":  "articles/backup/sap-hana-db-manage.md",
@@ -6423,11 +6428,6 @@
             "redirect_url": "/azure/storage/blobs/storage-encrypt-decrypt-blobs-key-vault",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/storage/blobs/storage-encrypt-decrypt-blobs-key-vault.md",
-            "redirect_url": "/azure/storage/blobs/client-side-encryption",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
             "redirect_url": "/azure/storage/common/storage-account-overview",

.whatsnew/.application-management.json

@@ -1,24 +1,24 @@
 {
-  "$schema": "https://whatsnewapi.azurewebsites.net/schema",
-  "docSetProductName": "Azure Active Directory application management",
-  "rootDirectory": "articles/active-directory/manage-apps/",
-  "docLinkSettings": {
-      "linkFormat": "relative",
-      "relativeLinkPrefix": "/azure/active-directory/manage-apps"
-  },
-  "inclusionCriteria": {
-      "excludePullRequestTitles": true,
-      "minAdditionsToFile" : 10,
-      "maxFilesChanged": 50,
-      "labels": [
-          "label:active-directory/svc",
-          "label:app-mgmt/subsvc"
-      ]
-  },
-  "areas": [
-      {
-          "name": ".",
-          "heading": "Azure Active Directory application management"
-      }
-  ]
-}
+    "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+    "docSetProductName": "Azure Active Directory application management",
+    "rootDirectory": "articles/active-directory/manage-apps/",
+    "docLinkSettings": {
+        "linkFormat": "relative",
+        "relativeLinkPrefix": "/azure/active-directory/manage-apps"
+    },
+    "inclusionCriteria": {
+        "omitPullRequestTitles": true,
+        "minAdditionsToFile": 10,
+        "maxFilesChanged": 50,
+        "labels": [
+            "label:active-directory/svc",
+            "label:app-mgmt/subsvc"
+        ]
+    },
+    "areas": [
+        {
+            "name": ".",
+            "heading": "Azure Active Directory application management"
+        }
+    ]
+}

articles/active-directory/authentication/concept-certificate-based-authentication-certificateuserids.md

@@ -157,6 +157,27 @@ GET https://graph.microsoft.com/v1.0/users?$filter=startswith(certificateUserIds
 GET https://graph.microsoft.com/v1.0/users?$filter=certificateUserIds eq '[email protected]'
 ```
             
+## Update certificate user IDs using Microsoft Graph queries
+PATCH the user object certificateUserIds value for a given userId
+
+#### Request body:
+
+```http
+PATCH https://graph.microsoft.us/v1.0/users/{id}
+Content-Type: application/json
+{
+
+    "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users(authorizationInfo,department)/$entity",
+    "department": "Accounting",
+    "authorizationInfo": {
+        "certificateUserIds": [
+            "X509:<PN>123456789098765@mil"
+        ]
+    }
+}
+```
+
+
 ## Next steps
 
 - [Overview of Azure AD CBA](concept-certificate-based-authentication.md)

articles/active-directory/authentication/howto-authentication-temporary-access-pass.md

@@ -142,10 +142,15 @@ Users managing their security information at [https://aka.ms/mysecurityinfo](htt
 ![Screenshot of how users can manage a Temporary Access Pass in My Security Info.](./media/how-to-authentication-temporary-access-pass/tap-my-security-info.png)
 
 ### Windows device setup
-Users with a Temporary Access Pass can navigate the setup process on Windows 10 and 11 to perform device join operations and configure Windows Hello For Business. Temporary Access Pass usage for setting up Windows Hello for Business varies based on the devices joined state: 
-- During Azure AD Join setup, users can authenticate with a TAP (no password required) and setup Windows Hello for Business.
-- On already Azure AD Joined devices, users must first authenticate with another method such as a password, smartcard or FIDO2 key, before using TAP to set up Windows Hello for Business. 
-- On Hybrid Azure AD Joined devices, users must first authenticate with another method such as a password, smartcard or FIDO2 key, before using TAP to set up Windows Hello for Business. 
+Users with a Temporary Access Pass can navigate the setup process on Windows 10 and 11 to perform device join operations and configure Windows Hello for Business. Temporary Access Pass usage for setting up Windows Hello for Business varies based on the devices joined state. 
+
+For Azure AD Joined devices: 
+- During the Azure AD Join setup process, users can authenticate with a TAP (no password required) to join the device and register Windows Hello for Business.
+- On already joined devices, users must first authenticate with another method such as a password, smartcard or FIDO2 key, before using TAP to set up Windows Hello for Business. 
+- If the [Web sign-in](https://learn.microsoft.com/windows/client-management/mdm/policy-csp-authentication#authentication-enablewebsignin) feature on Windows is also enabled, the user can use TAP to sign into the device. This is intended only for completing initial device setup, or recovery when the user does not know or have a password. 
+
+For Hybrid Azure AD Joined devices: 
+- Users must first authenticate with another method such as a password, smartcard or FIDO2 key, before using TAP to set up Windows Hello for Business. 
 
 ![Screenshot of how to enter Temporary Access Pass when setting up Windows 10.](./media/how-to-authentication-temporary-access-pass/windows-10-tap.png)
 
@@ -164,7 +169,9 @@ If MFA is required for the resource tenant, the guest user needs to perform MFA
 ### Expiration
 
 An expired or deleted Temporary Access Pass can’t be used for interactive or non-interactive authentication. 
-Users need to reauthenticate with different authentication methods after the Temporary Access Pass is expired or deleted. 
+Users need to reauthenticate with different authentication methods after the Temporary Access Pass is expired or deleted.
+
+The token lifetime (session token, refresh token, access token, etc.) obtained via a Temporary Access Pass login will be limited to the Temporary Access Pass lifetime. As a result, a Temporary Access Pass expiring will lead to the expiration of the associated token.
 
 ## Delete an expired Temporary Access Pass
 

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

@@ -127,7 +127,7 @@ On Windows 7, iOS, Android, and macOS Azure AD identifies the device using a cli
 
 #### Chrome support
 
-For Chrome support in **Windows 10 Creators Update (version 1703)** or later, install the [Windows 10 Accounts](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji) or [Office Online](https://chrome.google.com/webstore/detail/office/ndjpnladcallmjemlbaebfadecfhkepb) extensions. These extensions are required when a Conditional Access policy requires device-specific details.
+For Chrome support in **Windows 10 Creators Update (version 1703)** or later, install the [Windows Accounts](https://chrome.google.com/webstore/detail/windows-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji) or [Office](https://chrome.google.com/webstore/detail/office/ndjpnladcallmjemlbaebfadecfhkepb) extensions. These extensions are required when a Conditional Access policy requires device-specific details.
 
 To automatically deploy this extension to Chrome browsers, create the following registry key:
 

articles/active-directory/develop/TOC.yml

@@ -35,18 +35,19 @@
       items:
         - name: Permissions and consent overview
           href: permissions-consent-overview.md
+        - name: Delegated access
+          href: delegated-access-primer.md
+        - name: Scopes and permissions
+          href: scopes-oidc.md
         - name: "Authorization options: ACLs, RBAC, ABAC"
           href: authorization-basics.md
         - name: RBAC for app developers
           href: custom-rbac-for-developers.md
-        - name: Scopes, permissions, and consent
-          displayName: Scopes
-          href: v2-permissions-and-consent.md
+        - name: Requesting permissions through consent
+          href: consent-types-developer.md
         - name: Application consent experiences
           displayName: App consent experiences
           href: application-consent-experience.md
-        - name: Consent framework
-          href: consent-framework.md
         - name: Conditional Access dev guide
           href: v2-conditional-access-dev-guide.md
           displayName: ca

articles/active-directory/develop/access-tokens.md

@@ -324,4 +324,4 @@ Check out [Primary Refresh Tokens](../devices/concept-primary-refresh-token.md)
 ## Next steps
 
 - Learn about [`id_tokens` in Azure AD](id-tokens.md).
-- Learn about permission and consent ( [v1.0](../azuread-dev/v1-permissions-consent.md), [v2.0](v2-permissions-and-consent.md)).
+- Learn about permission and consent ( [v1.0](../azuread-dev/v1-permissions-consent.md), [v2.0](permissions-consent-overview.md)).