Merge branch 'main' into vp-csp-2303

browsers/edge/docfx.json

@@ -29,6 +29,7 @@
     "globalMetadata": {
       "uhfHeaderId": "MSDocsHeader-MSEdge",
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier3"
       ],

browsers/internet-explorer/docfx.json

@@ -24,6 +24,7 @@
     ],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier3"
       ],

education/docfx.json

@@ -28,6 +28,7 @@
     ],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.topic": "article",
       "ms.collection": [
         "education",

store-for-business/docfx.json

@@ -32,6 +32,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],

windows/application-management/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "breadcrumb_path": "/windows/resources/breadcrumb/toc.json",
       "ms.collection": [
         "tier2"

windows/client-management/connect-to-remote-aadj-pc.md

@@ -49,13 +49,17 @@ There's no requirement for the local device to be joined to a domain or Azure AD
 To connect to the remote computer:
 
 - Launch **Remote Desktop Connection** from Windows Search, or by running `mstsc.exe`.
-- Specify the name of the remote computer.
 - Select **Use a web account to sign in to the remote computer** option in the **Advanced** tab. This option is equivalent to the `enablerdsaadauth` RDP property. For more information, see [Supported RDP properties with Remote Desktop Services](/windows-server/remote/remote-desktop-services/clients/rdp-files).
+- Specify the name of the remote computer and select **Connect**. 
+
+    > [!NOTE]
+    > IP address cannot be used when **Use a web account to sign in to the remote computer** option is used.
+
 - When prompted for credentials, specify your user name in `user@domain.com` format.
 - You're then prompted to allow the remote desktop connection when connecting to a new PC. Azure AD remembers up to 15 hosts for 30 days before prompting again. If you see this dialogue, select **Yes** to connect.
 
 > [!IMPORTANT]
-> If your organization has configured and is using [Azure AD Conditional Access](/azure/active-directory/conditional-access/overview), your device must satisfy the conditional access requirements to allow connection to the remote computer.
+> If your organization has configured and is using [Azure AD Conditional Access](/azure/active-directory/conditional-access/overview), your device must satisfy the conditional access requirements to allow connection to the remote computer. Conditional Access policies with [grant controls](/azure/active-directory/conditional-access/concept-conditional-access-grant) and [session controls](/azure/active-directory/conditional-access/howto-conditional-access-session-lifetime) may be applied to the application **Microsoft Remote Desktop (a4a365df-50f1-4397-bc59-1a1564b8bb9c)** for controlled access.
 
 ### Disconnection when the session is locked
 
@@ -87,7 +91,7 @@ To connect to the remote computer:
 
 ### Supported configurations
 
-This table lists the supported configurations for remotely connecting to an Azure AD joined device:
+This table lists the supported configurations for remotely connecting to an Azure AD joined device without using Azure AD authentication:
 
 | **Criteria**                               | **Client operating system**       | **Supported credentials**                                          |
 |--------------------------------------------|-----------------------------------|--------------------------------------------------------------------|

windows/client-management/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],

windows/configuration/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],

windows/deployment/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],

windows/hub/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier1"
       ],

windows/privacy/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "breadcrumb_path": "/windows/resources/breadcrumb/toc.json",
       "uhfHeaderId": "MSDocsHeader-M365-IT",
       "ms.technology": "windows",

windows/security/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],

windows/whats-new/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],