Merge pull request #231625 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 3ab069c37c5d · 2023-03-22T09:39:09.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/enterprise-users/licensing-service-plan-reference.md b/articles/active-directory/enterprise-users/licensing-service-plan-reference.md
diff --git a/articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure-graph.md b/articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure-graph.md
@@ -75,8 +75,8 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
 
 1. Get the tenant ID of the source and target tenants. The example configuration described in this article uses the following tenant IDs:
 
-    - Source tenant ID: 3d0f5dec-5d3d-455c-8016-e2af1ae4d31a
-    - Target tenant ID: 376a1f89-b02f-4a85-8252-2974d1984d14
+    - Source tenant ID: {sourceTenantId}
+    - Target tenant ID: {targetTenantId}
 
 ## Step 2: Enable user synchronization in the target tenant
 
@@ -91,7 +91,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     Content-Type: application/json
     
     {
-      "tenantId": "3d0f5dec-5d3d-455c-8016-e2af1ae4d31a"
+      "tenantId": "{sourceTenantId}"
     }
     ```
     
@@ -103,7 +103,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     
     {
       "@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
-      "tenantId": "3d0f5dec-5d3d-455c-8016-e2af1ae4d31a",
+      "tenantId": "{sourceTenantId}",
       "isServiceProvider": null,
       "inboundTrust": null,
       "b2bCollaborationOutbound": null,
@@ -129,7 +129,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     **Request**
     
     ```http
-    PUT https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/3d0f5dec-5d3d-455c-8016-e2af1ae4d31a/identitySynchronization
+    PUT https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{sourceTenantId}/identitySynchronization
     Content-type: application/json
     
     {
@@ -156,7 +156,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     **Request**
     
     ```http
-    PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/3d0f5dec-5d3d-455c-8016-e2af1ae4d31a
+    PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{sourceTenantId}
     Content-Type: application/json
     
     {
@@ -187,7 +187,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     Content-Type: application/json
     
     {
-      "tenantId": "376a1f89-b02f-4a85-8252-2974d1984d14"
+      "tenantId": "{targetTenantId}"
     }
     ```
     
@@ -199,7 +199,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     
     {
       "@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
-      "tenantId": "376a1f89-b02f-4a85-8252-2974d1984d14",
+      "tenantId": "{targetTenantId}",
       "isServiceProvider": null,
       "inboundTrust": null,
       "b2bCollaborationOutbound": null,
@@ -225,7 +225,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
     **Request**
     
     ```http
-    PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/376a1f89-b02f-4a85-8252-2974d1984d14
+    PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{targetTenantId}
     Content-Type: application/json
     
     {
@@ -290,7 +290,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
             "appId": "{appId}",
             "appDisplayName": "Fabrikam",
             "applicationTemplateId": "518e5f48-1fc8-4c48-9387-9fdf28b0dfe7",
-            "appOwnerTenantId": "376a1f89-b02f-4a85-8252-2974d1984d14",
+            "appOwnerTenantId": "{targetTenantId}",
             "appRoleAssignmentRequired": true,
             "displayName": "Fabrikam",
             "errorUrl": null,
@@ -342,7 +342,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
         "credentials": [
             {
                 "key": "CompanyId",
-                "value": "376a1f89-b02f-4a85-8252-2974d1984d14"
+                "value": "{targetTenantId}"
             },
             {
                 "key": "AuthenticationType",
@@ -439,7 +439,7 @@ In the source tenant, to enable provisioning, create a provisioning job.
         "value": [ 
             { 
                 "key": "CompanyId", 
-                "value": "376a1f89-b02f-4a85-8252-2974d1984d14" 
+                "value": "{targetTenantId}" 
             },
             {
                 "key": "AuthenticationType",
@@ -645,7 +645,7 @@ Now that you have a configuration, you can test on-demand provisioning with one
             {
                 "id": "{id}",
                 "activityDateTime": "2022-12-11T00:40:37Z",
-                "tenantId": "376a1f89-b02f-4a85-8252-2974d1984d14",
+                "tenantId": "{targetTenantId}",
                 "jobId": "{jobId}",
                 "cycleId": "{cycleId}",
                 "changeId": "{changeId}",
diff --git a/articles/active-directory/standards/nist-authenticator-assurance-level-1.md b/articles/active-directory/standards/nist-authenticator-assurance-level-1.md
@@ -28,16 +28,20 @@ Before you begin authenticator assurance level 1 (AAL1), you can review the foll
 
 ## Permitted authenticator types
 
-To achieve AAL1, you can use any NIST single-factor or multifactor [permitted authenticator](nist-authenticator-types.md). Note that Password and Phone (SMS) are not covered in [AAL2](nist-authenticator-assurance-level-2.md) or [AAL3](nist-authenticator-assurance-level-2.md).
+To achieve AAL1, you can use any NIST single-factor or multifactor [permitted authenticator](nist-authenticator-types.md). 
 
 |Azure AD authentication method|NIST authenticator type |
 | - | - |
-|Password |memorized secret |
-|Phone (SMS)|out-of-band |
-|FIDO 2 security key <br> Microsoft Authenticator app for iOS (passwordless) <br> Windows Hello for Business with software TPM <br> Smartcard (Active Directory Federation Services) | Multi-factor crypto software |
+|Password |Memorized Secret |
+|Phone (SMS): Not recommended | Out-of-band |
+|Microsoft Authenticator App for iOS (Passwordless) <br> Microsoft Authenticator App for Android (Passwordless)|Multi-factor Out-of-band |
+|Single-factor certificate | Single-factor crypto software |
+|Multi-factor Software Certificate (PIN Protected) <br> Windows Hello for Business with software TPM <br> | Multi-factor crypto software | 
+|Windows Hello for Business with hardware TPM <br> Hardware protected certificate (smartcard/security key/TPM) <br> FIDO 2 security key | Multi-factor crypto hardware
+
 
 > [!TIP]
-> We recommend you meet at least AAL2. If necessary, meet AAL3 for business reasons, industry standards, or compliance requirements.
+> We recommend you select at a minimum phishing resistant AAL2 authneticators. Select AAL3 authenticators as necessary for business reasons, industry standards, or compliance requirements.
 
 ## FIPS 140 validation
 
diff --git a/articles/app-service/troubleshoot-domain-ssl-certificates.md b/articles/app-service/troubleshoot-domain-ssl-certificates.md
@@ -202,7 +202,7 @@ The App Service certificate was renewed, but the app that uses the App Service c
 
 #### Cause
 
-App Service automatically syncs your certificate within 48 hours. When you rotate or update a certificate, sometimes the application is still retrieving the old certificate and not the newly updated certificate. The reason is that the job to sync the certificate resource hasn't run yet. To resolve this problem, sync the certificate, which automatically updates the hostname bindings for the certificate in App Service without causing any downtime to your apps.
+App Service automatically syncs your certificate within 24 hours. When you rotate or update a certificate, sometimes the application is still retrieving the old certificate and not the newly updated certificate. The reason is that the job to sync the certificate resource hasn't run yet. To resolve this problem, sync the certificate, which automatically updates the hostname bindings for the certificate in App Service without causing any downtime to your apps.
 
 #### Solution
 
diff --git a/articles/azure-maps/how-to-dev-guide-py-sdk.md b/articles/azure-maps/how-to-dev-guide-py-sdk.md
@@ -159,13 +159,14 @@ def fuzzy_search():
         query="Starbucks",
         coordinates=(47.61010, -122.34255)
     )
-    # Print the search results 
-    print("Starbucks search result nearby Seattle:") 
-    for result_item in result.results:
-        print(f"* {result_item.address.street_number }   {result_item.address.street_name }")
-        print(f"  {result_item.address.municipality } {result_item.address.country_code } {result_item.address.postal_code }")
-        print(f"  Coordinate: {result_item.position.lat}, {result_item.position.lon}"
-  ) 
+    
+    # Print the search results
+    if len(result.results) > 0:
+        print("Starbucks search result nearby Seattle:")
+        for result_item in result.results:
+            print(f"* {result_item.address.street_number }   {result_item.address.street_name }")
+            print(f"  {result_item.address.municipality } {result_item.address.country_code } {result_item.address.postal_code }")
+            print(f"  Coordinate: {result_item.position.lat}, {result_item.position.lon}") 
 
 if __name__ == '__main__': 
     fuzzy_search() 
@@ -233,7 +234,12 @@ def search_address():
     result = maps_search_client.search_address( 
         query="1301 Alaskan Way, Seattle, WA 98101, US" 
     )
-    print(f"Coordinate: {result.results[0].position.lat}, {result.results[0].position.lon}")
+    
+    # Print reuslts if any
+    if len(result.results) > 0:
+        print(f"Coordinate: {result.results[0].position.lat}, {result.results[0].position.lon}")
+    else:
+        print("No address found")
 
 if __name__ == '__main__':
     search_address()
diff --git a/articles/azure-vmware/install-vmware-hcx.md b/articles/azure-vmware/install-vmware-hcx.md
@@ -153,6 +153,8 @@ Continue to the next tutorial to configure the VMware HCX Connector.  After you'
 
 >[Configure VMware HCX in Azure VMware Solution](configure-vmware-hcx.md) 
 
+>[Understanding HCX Network Underlay Requirements](https://communities.vmware.com/t5/HCX-Documents/HCX-Network-Underlay-Characterization-and-Performance-Outcomes-1/ta-p/2873360)
+
 >[VMware blog series - cloud migration](https://blogs.vmware.com/vsphere/2019/10/cloud-migration-series-part-2.html) 
 
 >[Uninstall VMware HCX in Azure VMware Solution](uninstall-vmware-hcx.md)
diff --git a/articles/cognitive-services/openai/includes/chat-markup-language.md b/articles/cognitive-services/openai/includes/chat-markup-language.md
@@ -14,7 +14,7 @@ keywords: ChatGPT
 ## Working with the ChatGPT models (preview)
 
 > [!NOTE]
-> The Chat Completion API is the recommended method of interacting with the ChatGPT (gtp-45-turbo) models.
+> The Chat Completion API is the recommended method of interacting with the ChatGPT (gpt-45-turbo) models.
 
 The following code snippet shows the most basic way to use the ChatGPT models with ChatML. If this is your first time using these models programmatically we recommend starting with our [ChatGPT & GPT-4 Quickstart](../chatgpt-quickstart.md).
 
@@ -290,4 +290,4 @@ assert tokens == [100264, 882, 198, 9906, 100265, 100264, 78191]
 
 * [Learn more about Azure OpenAI](../overview.md).
 * Get started with the ChatGPT model with [the ChatGPT quickstart](../chatgpt-quickstart.md).
-* For more examples, check out the [Azure OpenAI Samples GitHub repository](https://github.com/Azure/openai-samples)
+* For more examples, check out the [Azure OpenAI Samples GitHub repository](https://github.com/Azure/openai-samples)
