resolve conflicts

Author: laujan

.openpublishing.publish.config.json

@@ -1066,6 +1066,7 @@
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
   ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.sentinel.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",

.openpublishing.redirection.active-directory.json

@@ -13353,6 +13353,21 @@
           "redirect_url": "/azure/governance/policy/samples/pci-dss-4-0",
           "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/governance/policy/samples/NZ_ISM_Restricted_v3_5.md",
+          "redirect_url": "/azure/governance/policy/samples/nz-ism-restricted-3-5",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/samples/RBI_ITF_Banks_v2016.md",
+          "redirect_url": "/azure/governance/policy/samples/rbi-itf-banks-2016",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/samples/rbi_itf_nbfc_v2017.md",
+          "redirect_url": "/azure/governance/policy/samples/rbi-itf-nbfc-2017",
+          "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-policy/create-manage-policy.md",
             "redirect_url": "/azure/governance/policy/tutorials/create-and-manage",
@@ -23843,11 +23858,6 @@
             "redirect_url": "/azure/sentinel/data-connectors-reference",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/sentinel/data-connectors/cisco-asa-ftd-via-ama.md",
-            "redirect_url": "/azure/sentinel/data-connectors-reference",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/networking/scripts/virtual-network-powershell-sample-peer-two-virtual-networks.md",
             "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks-powershell",

.openpublishing.redirection.json

@@ -0,0 +1,179 @@
+{
+    "redirections": [
+        {
+            "source_path": "articles/sentinel/data-connectors/abnormalsecurity-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/abnormalsecurity-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/alicloud-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/alicloud-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/armorblox-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/armorblox-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/atlassian-confluence-audit-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/atlassian-confluence-audit-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/atlassian-jira-audit-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/atlassian-jira-audit-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/auth0-access-management-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/auth0-access-management-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/bitglass-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/bitglass-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cisco-duo-security-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cisco-duo-security-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cisco-secure-endpoint-amp-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cisco-secure-endpoint-amp-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cloudflare-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cloudflare-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cohesity-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cohesity-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/crowdstrike-falcon-data-replicator-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cyberarkepm.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cyberarkepm-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/cybersixgill-actionable-alerts-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/cybersixgill-actionable-alerts-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/digital-shadows-searchlight-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/digital-shadows-searchlight-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/google-apigeex-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/google-apigeex-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/google-cloud-platform-cloud-monitoring-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/google-cloud-platform-cloud-monitoring-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/google-cloud-platform-dns-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/google-cloud-platform-dns-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/google-cloud-platform-iam-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/google-cloud-platform-iam-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/google-workspace-g-suite-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/google-workspace-g-suite-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/holm-security-asset-data-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/holm-security-asset-data-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/imperva-cloud-waf-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/imperva-cloud-waf-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/mulesoft-cloudhub-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/mulesoft-cloudhub-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/netskope-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/netskope-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/onelogin-iam-platform-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/onelogin-iam-platform-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/oracle-cloud-infrastructure-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/oracle-cloud-infrastructure-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/proofpoint-on-demand-email-security-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/proofpoint-on-demand-email-security-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/qualys-vulnerability-management-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/qualys-vulnerability-management-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/rapid7-insight-platform-vulnerability-management-reports-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/rapid7-insight-platform-vulnerability-management-reports-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/sentinelone-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/sentinelone-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/slack-audit-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/slack-audit-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/trend-micro-vision-one-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/trend-vision-one-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/vmware-carbon-black-cloud-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/vmware-carbon-black-cloud-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/zero-networks-segment-audit-function-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/zero-networks-segment-audit-function-using-azure-functions",
+            "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/data-connectors/zoom-reports-using-azure-function.md",
+            "redirect_url": "/azure/sentinel/data-connectors/zoom-reports-using-azure-functions",
+            "redirect_document_id": true
+          }
+    ]
+}

.openpublishing.redirection.sentinel.json

@@ -47,7 +47,7 @@ Data resides in the **United States** for the following locations:
 
 Data resides in **Europe** for the following locations:
 
-> Algeria (DZ), Austria (AT), Azerbaijan (AZ), Bahrain (BH), Belarus (BY), Belgium (BE), Bulgaria (BG), Croatia (HR), Cyprus (CY), Czech Republic (CZ), Denmark (DK), Egypt (EG), Estonia (EE), Finland (FT), France (FR), Germany (DE), Greece (GR), Hungary (HU), Iceland (IS), Ireland (IE), Israel (IL), Italy (IT), Jordan (JO), Kazakhstan (KZ), Kenya (KE), Kuwait (KW), Latvia (LV), Lebanon (LB), Liechtenstein (LI), Lithuania (LT), Luxembourg (LU), North Macedonia (ML), Malta (MT), Montenegro (ME), Morocco (MA), Netherlands (NL), Nigeria (NG), Norway (NO), Oman (OM), Pakistan (PK), Poland (PL), Portugal (PT), Qatar (QA), Romania (RO), Russia (RU), Saudi Arabia (SA), Serbia (RS), Slovakia (SK), Slovenia (ST), South Africa (ZA), Spain (ES), Sweden (SE), Switzerland (CH), Tunisia (TN), Türkiye (TR), Ukraine (UA), United Arab Emirates (AE) and United Kingdom (GB)
+> Algeria (DZ), Austria (AT), Azerbaijan (AZ), Bahrain (BH), Belarus (BY), Belgium (BE), Bulgaria (BG), Croatia (HR), Cyprus (CY), Czech Republic (CZ), Denmark (DK), Egypt (EG), Estonia (EE), Finland (Fl), France (FR), Germany (DE), Greece (GR), Hungary (HU), Iceland (IS), Ireland (IE), Israel (IL), Italy (IT), Jordan (JO), Kazakhstan (KZ), Kenya (KE), Kuwait (KW), Latvia (LV), Lebanon (LB), Liechtenstein (LI), Lithuania (LT), Luxembourg (LU), North Macedonia (ML), Malta (MT), Montenegro (ME), Morocco (MA), Netherlands (NL), Nigeria (NG), Norway (NO), Oman (OM), Pakistan (PK), Poland (PL), Portugal (PT), Qatar (QA), Romania (RO), Russia (RU), Saudi Arabia (SA), Serbia (RS), Slovakia (SK), Slovenia (ST), South Africa (ZA), Spain (ES), Sweden (SE), Switzerland (CH), Tunisia (TN), Türkiye (TR), Ukraine (UA), United Arab Emirates (AE) and United Kingdom (GB)
 
 Data resides in **Asia Pacific** for the following locations:
 
@@ -99,4 +99,4 @@ After sign-up, profile editing, or sign-in action is complete, Azure AD B2C incl
 
 ## Next steps
 
-- [Create an Azure AD B2C tenant](tutorial-create-tenant.md).
+- [Create an Azure AD B2C tenant](tutorial-create-tenant.md).

articles/active-directory-b2c/data-residency.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/14/2023
+ms.date: 07/31/2023
 ms.author: justinha
 ms.reviewer: xyuan
 
@@ -49,6 +49,16 @@ A managed domain connects to a subnet in an Azure virtual network. Design this s
 * A managed domain requires 3-5 IP addresses. Make sure that your subnet IP address range can provide this number of addresses.
     * Restricting the available IP addresses can prevent the managed domain from maintaining two domain controllers.
 
+  >[!NOTE]
+  >You shouldn't use public IP addresses for virtual networks and their subnets due to the following issues:
+  >
+  >- **Scarcity of the IP address**: IPv4 public IP addresses are limited, and their demand often exceeds the available supply. Also, there are potentially overlapping IPs with public endpoints.
+  >- **Security risks**: Using public IPs for virtual networks exposes your devices directly to the internet, increasing the risk of unauthorized access and potential attacks. Without proper security measures, your devices may become vulnerable to various threats.
+  >
+  >- **Complexity**: Managing a virtual network with public IPs can be more complex than using private IPs, as it requires dealing with external IP ranges and ensuring proper network segmentation and security.
+  >
+  >It is strongly recommended to use private IP addresses. If you use a public IP, ensure you are the owner/dedicated user of the chosen IPs in the public range you chose.
+
 The following example diagram outlines a valid design where the managed domain has its own subnet, there's a gateway subnet for external connectivity, and application workloads are in a connected subnet within the virtual network:
 
 ![Recommended subnet design](./media/active-directory-domain-services-design-guide/vnet-subnet-design.png)

articles/active-directory-domain-services/network-considerations.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 01/29/2023
+ms.date: 07/31/2023
 ms.author: justinha
 
 #Customer intent: As an identity administrator, I want to create an Azure Active Directory Domain Services managed domain so that I can synchronize identity information with my Azure Active Directory tenant and provide Domain Services connectivity to virtual machines and applications in Azure.
@@ -106,6 +106,16 @@ To quickly create a managed domain, you can select **Review + create** to accept
 * Creates a subnet named *aadds-subnet* using the IP address range of *10.0.2.0/24*.
 * Synchronizes *All* users from Azure AD into the managed domain.
 
+>[!NOTE]
+>You shouldn't use public IP addresses for virtual networks and their subnets due to the following issues:
+>
+>- **Scarcity of the IP address**: IPv4 public IP addresses are limited, and their demand often exceeds the available supply. Also, there are potentially overlapping IPs with public endpoints.
+>- **Security risks**: Using public IPs for virtual networks exposes your devices directly to the internet, increasing the risk of unauthorized access and potential attacks. Without proper security measures, your devices may become vulnerable to various threats.
+>
+>- **Complexity**: Managing a virtual network with public IPs can be more complex than using private IPs, as it requires dealing with external IP ranges and ensuring proper network segmentation and security.
+>
+>It is strongly recommended to use private IP addresses. If you use a public IP, ensure you are the owner/dedicated user of the chosen IPs in the public range you chose.
+
 Select **Review + create** to accept these default configuration options.
 
 ## Deploy the managed domain

articles/active-directory-domain-services/tutorial-create-instance.md

@@ -60,7 +60,7 @@ Content-type: application/json
 {
   "value": [
   {
-  	"id": "8b1025e4-1dd2-430b-a150-2ef79cd700f5",
+    "id": "8b1025e4-1dd2-430b-a150-2ef79cd700f5",
         "displayName": "AWS Single-Account Access",
         "homePageUrl": "http://aws.amazon.com/",
         "supportedSingleSignOnModes": [

articles/active-directory/app-provisioning/application-provisioning-configuration-api.md

@@ -85,7 +85,7 @@ Summary of factors that influence the time it takes to complete an **initial cyc
 
 - Whether users in scope for provisioning are matched to existing users in the target application, or need to be created for the first time. Sync jobs for which all users are created for the first time take about *twice as long* as sync jobs for which all users are matched to existing users.
 
-- Number of errors in the [provisioning logs](check-status-user-account-provisioning.md). Performance is slower if there are many errors and the provisioning service has gone into a quarantine state.	
+- Number of errors in the [provisioning logs](check-status-user-account-provisioning.md). Performance is slower if there are many errors and the provisioning service has gone into a quarantine state.
 
 - Request rate limits and throttling implemented by the target system. Some target systems implement request rate limits and throttling, which can impact performance during large sync operations. Under these conditions, an app that receives too many requests too fast might slow its response rate or close the connection. To improve performance, the connector needs to adjust by not sending the app requests faster than the app can process them. Provisioning connectors built by Microsoft make this adjustment.