Merge pull request #301738 from MicrosoftDocs/main

Merged by Learn.Build PR Management system

Author: learn-build-service-prod[bot]

articles/azure-functions/TOC.yml

@@ -668,12 +668,6 @@
           items:
             - name: Azure Cosmos DB - portal
               href: functions-integrate-store-unstructured-data-cosmosdb.md
-            - name: Azure Cache for Redis
-              items:
-                - name: Get started with VS Code
-                  href: ../redis/tutorial-functions-getting-started.md?toc=%2fazure%2fazure-functions%2ftoc.json
-                - name: Create a write-behind cache
-                  href: ../redis/tutorial-write-behind.md?toc=%2fazure%2fazure-functions%2ftoc.json
             - name: Storage
               items:
                 - name: Azure portal

articles/cloud-services-extended-support/in-place-migration-powershell.md

@@ -21,7 +21,7 @@ ms.custom: devx-track-azurepowershell
 These steps show you how to use Azure PowerShell commands to migrate from [Cloud Services (classic)](../cloud-services/cloud-services-choose-me.md) to [Cloud Services (extended support)](overview.md).
 
 ## Plan for migration
-Planning is the most important step for a successful migration experience. Review the [Cloud Services (extended support) overview](overview.md) and [Planning for migration of IaaS resources from classic to Azure Resource Manager](/azure/virtual-machines/migration-classic-resource-manager-plan) before beginning any migration steps. 
+Planning is the most important step for a successful migration experience. Review the [Cloud Services (extended support) overview](overview.md) and [Planning for migration of IaaS resources from classic to Azure Resource Manager](/previous-versions/azure/virtual-machines/migration/migration-classic-resource-manager-plan) before beginning any migration steps. 
 
 ## Install the latest version of PowerShell
 There are two main options to install Azure PowerShell: [PowerShell Gallery](https://www.powershellgallery.com/profiles/azure-sdk/) or [Web Platform Installer (WebPI)](https://aka.ms/webpi-azps). WebPI receives monthly updates. PowerShell Gallery receives updates on a continuous basis. This article is based on Azure PowerShell version 2.1.0.

articles/communication-services/tutorials/includes/url-shortener-js.md

@@ -20,7 +20,7 @@ You can find the completed code for this tutorial at Azure Samples GitHub [SMS U
 -	An active Azure Communication Services resource. For more information, see [Create an Azure Communication Services resource](../../quickstarts/create-communication-resource.md).
 -	An Azure Communication Services phone number. [Get a phone number](../../quickstarts/telephony/get-phone-number.md). You need to [verify your phone number](../../quickstarts/sms/apply-for-toll-free-verification.md) so it can send messages with URLs. 
 -	Deployed [AzUrlShortener](https://github.com/microsoft/AzUrlShortener). Click [Deploy to Azure](https://github.com/microsoft/AzUrlShortener/wiki/How-to-deploy-your-AzUrlShortener) button for quick deploy.
-    - [*Optional*] Deploy the [Admin web app](https://github.com/microsoft/AzUrlShortener/blob/main/src/Cloud5mins.ShortenerTools.TinyBlazorAdmin/README.md) to manage and monitor links in UI.
+    - [*Optional*] Deploy the [Admin web app](https://github.com/microsoft/AzUrlShortener/tree/main/src/TinyBlazorAdmin) to manage and monitor links in UI.
 -	For this tutorial, SMS requests are routed to an Azure Function. You can use an existing service, different framework like express or just run the tutorial as a Node.js console app. To follow this tutorial with an Azure Function, see instructions to set it up at [Azure Function for TypeScript](/azure/azure-functions/create-first-function-vs-code-typescript).
 
 ## Architecture overview

articles/confidential-computing/partner-pages/habu.md

@@ -19,11 +19,8 @@ Data clean rooms allow organizations to share data and collaborate on analytics
 
 Collaboration partners can now participate in cross-cloud, cross-region data sharing - with protections against unauthorized access to data across partners, cloud providers, and even Habu. You can hear more from Habu’s Chief Product Officer, Matthew Karasick, on their [partnership with Azure here](https://build.microsoft.com/en-US/home?source=partnerdetail).
 
-You can also get started on their [Azure Marketplace solution](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/habuinc1663874067667.habu), today.
-
-
 ## Learn more
 
 - Learn more about [Habu](https://habu.com/).
 
-- Check out the [Azure confidential computing webinar series](https://vshow.on24.com/vshow/Azure_Confidential/exhibits/Home) for more such partners.
+- Check out the [Azure confidential computing webinar series](https://info.microsoft.com/ww-ondemand-increase-data-privacy-with-azure-confidential-computing.html) for more such partners.

articles/data-manager-for-agri/concepts-ingest-satellite-imagery.md

@@ -94,7 +94,7 @@ While Azure Data Manager for Agriculture is in preview, it supports ingesting da
 
 ### Sentinel-2
 
-[Sentinel-2](https://sentinel.esa.int/web/sentinel/missions/sentinel-2) is a satellite constellation that the European Space Agency (ESA) launched under the Copernicus mission. This constellation has a pair of satellites and carries a multispectral instrument (MSI) payload that samples 13 spectral bands: four bands at 10 m, six bands at 20 m, and three bands at 60-m spatial resolution.  
+[Sentinel-2](https://www.esa.int/Applications/Observing_the_Earth/Copernicus/Sentinel-2) is a satellite constellation that the European Space Agency (ESA) launched under the Copernicus mission. This constellation has a pair of satellites and carries a multispectral instrument (MSI) payload that samples 13 spectral bands: four bands at 10 m, six bands at 20 m, and three bands at 60-m spatial resolution.  
 
 Sentinel-2 has two products:
 

articles/defender-for-iot/organizations/best-practices/understand-network-architecture.md

@@ -98,7 +98,7 @@ Based on the results of the matching process, devices track their network traffi
 
 ## Implementing Defender for IoT deployment with a unidirectional gateway
 
-If you're working with a unidirectional gateway, such as [Waterfall](https://waterfall-security.com/), [Owl Cyber Defense](https://owlcyberdefense.com/products/data-diode-products/), or [Hirschmann](https://hirschmann.com/en/Hirschmann_Produkte/Hirschmann-News/Rail_Data_Diode/index.phtml), where data passes through a data diode in one direction only, use one of the following methods to understand where to place your OT sensors:
+If you're working with a unidirectional gateway, such as [Waterfall](https://waterfall-security.com/), [Owl Cyber Defense](https://owlcyberdefense.com/products/data-diode-products/), or [Hirschmann](https://www.belden.com/products/by-brand/hirschmann/cybersecurity), where data passes through a data diode in one direction only, use one of the following methods to understand where to place your OT sensors:
 
 - **Place your OT sensors outside the network perimeter (Recommended)**. In this scenario, your sensor receives SPAN traffic through the diode, unidirectionally from the network to the sensor's monitoring port. We recommend using this method in large deployments. For example:
 

articles/defender-for-iot/organizations/traffic-mirroring/configure-mirror-span.md

@@ -76,7 +76,7 @@ switchport mode trunk
 
 ## Deploy with unidirectional gateways/data diodes
 
-You might deploy Defender for IoT with unidirectional gateways, also known as data diodes. Data diodes provide a secure way to monitor networks as they only allow data to flow in one direction. This means data can be monitored without compromising the security of the network, as data cannot be sent back in the opposite direction. Examples of data diode solutions are [Waterfall](https://waterfall-security.com), [Owl Cyber Defense](https://owlcyberdefense.com/products/data-diode-products/), or [Hirschmann](https://hirschmann.com/en/Hirschmann_Produkte/Hirschmann-News/Rail_Data_Diode/index.phtml).
+You might deploy Defender for IoT with unidirectional gateways, also known as data diodes. Data diodes provide a secure way to monitor networks as they only allow data to flow in one direction. This means data can be monitored without compromising the security of the network, as data cannot be sent back in the opposite direction. Examples of data diode solutions are [Waterfall](https://waterfall-security.com), [Owl Cyber Defense](https://owlcyberdefense.com/products/data-diode-products/), or [Hirschmann](https://www.belden.com/products/by-brand/hirschmann/cybersecurity).
 
 If unidirectional gateways are needed, we recommend deploying your data diodes on the SPAN traffic going to the sensor monitoring port. For example, use a data diode to monitor traffic from a sensitive system, such as an industrial control system, while keeping the system completely isolated from the monitoring system. 
 

articles/event-grid/sdk-overview.md

@@ -20,7 +20,7 @@ The management SDKs enable you to create, update, and delete Event Grid topics a
 | SDK | Package | Reference documentation |  Samples | 
 | -------- | ------- | ----------------------- | ---- | 
 | REST API | | [REST reference](/rest/api/eventgrid/controlplane-preview/ca-certificates) | |
-| .NET | [`Azure.ResourceManager.EventGrid`](https://www.nuget.org/packages/Azure.ResourceManager.EventGrid/). The package has the latest `Namespaces` API. | .NET reference: [Preview](/dotnet/api/overview/azure/resourcemanager.eventgrid-readme?view=azure-dotnet-preview&preserve-view=true), [GA](/dotnet/api/overview/azure/event-grid) | [.NET samples](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/eventgrid/Azure.ResourceManager.EventGrid/samples) |
+| .NET | [`Azure.ResourceManager.EventGrid`](https://www.nuget.org/packages/Azure.ResourceManager.EventGrid/). The package has the latest `Namespaces` API. | .NET reference: [Preview](/dotnet/api/overview/azure/resourcemanager.eventgrid-readme?view=azure-dotnet-preview&preserve-view=true), [GA](/dotnet/api/overview/azure/event-grid) | [.NET samples](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/eventgrid/Azure.ResourceManager.EventGrid) |
 | Java | [`azure-resourcemanager-eventgrid`](https://central.sonatype.com/artifact/com.azure.resourcemanager/azure-resourcemanager-eventgrid/). The package has the latest `Namespaces` API. | Java reference: [Preview](/java/api/overview/azure/resourcemanager-eventgrid-readme?view=azure-java-preview&preserve-view=true), [GA](/java/api/overview/azure/event-grid) | [Java samples](https://github.com/azure/azure-sdk-for-java/tree/main/sdk/eventgrid/azure-resourcemanager-eventgrid/src/samples) |
 | JavaScript | [`@azure/arm-eventgrid`](https://www.npmjs.com/package/@azure/arm-eventgrid). The package has the latest `Namespaces` API. | JavaScript reference: [Preview](/javascript/api/overview/azure/arm-eventgrid-readme?view=azure-node-preview&preserve-view=true), [GA](/javascript/api/overview/azure/event-grid) | [JavaScript and TypeScript samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/eventgrid/arm-eventgrid) |
 | Python | [`azure-mgmt-eventgrid`](https://pypi.org/project/azure-mgmt-eventgrid/). The package has the latest `Namespaces` API. | Python reference: [Preview](/python/api/azure-mgmt-eventgrid/?view=azure-python-preview&preserve-view=true), [GA](/python/api/overview/azure/event-grid) | [Python samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-mgmt-eventgrid/generated_samples)

articles/expressroute/expressroute-locations.md

@@ -190,7 +190,7 @@ The following table shows locations by service provider. If you want to view ava
 | --- | --- | --- | --- |
 | **[REANNZ](https://www.reannz.co.nz/products-and-services/cloud-connect/)** | ✓ | ✓ | Auckland |
 | **RedCLARA** | ✓ | ✓ | Sao Paulo |
-| **[Reliance Jio](https://www.jio.com/business/jio-cloud-connect)** | ✓ | ✓ | Mumbai |
+| **[Reliance Jio](https://www.jio.com/business/services/connectivity/cloud-connect/)** | ✓ | ✓ | Mumbai |
 | **[Retelit](https://www.retelit.it/EN/Home.aspx)** | ✓ | ✓ | Milan |
 | **RISQ** |&check; | &check; | Quebec City<br/>Montreal |
 | **SCSK** |&check; | &check; | Tokyo3 |
@@ -255,7 +255,7 @@ Azure national clouds are isolated from each other and from the Azure public clo
 | **[Internet2](https://internet2.edu/services/microsoft-azure-expressroute/)** |&check; |&check; |Dallas |
 | **[Level 3 Communications](https://www.lumen.com/en-us/edge-cloud/cloud-connect.html)** |&check; |&check; |Chicago<br/>Silicon Valley<br/>Washington DC |
 | **[Megaport](https://www.megaport.com/services/microsoft-expressroute/)** |&check; | &check; | Chicago<br/>Dallas<br/>San Antonio<br/>Seattle<br/>Washington DC |
-| **[Verizon](https://www.verizon.com/about/news/verizon-expands-cloud-solutions-secure-cloud-interconnect-0)** |&check; |&check; |Chicago<br/>Dallas<br/>New York<br/>Silicon Valley<br/>Washington DC |
+| **[Verizon](https://www.verizon.com/business/verizonpartnersolutions/products/cloud/secure-cloud-interconnect/)** |&check; |&check; |Chicago<br/>Dallas<br/>New York<br/>Silicon Valley<br/>Washington DC |
 
 #### [China cloud](#tab/china-cloud)
 
@@ -430,7 +430,7 @@ Enabling private connectivity to meet your needs can be challenging, depending o
 | **[Optus](https://www.optus.com.au/enterprise/networking/network-connectivity/express-link/)** | Australia |
 | **[Equinix Professional Services](https://www.equinix.com/services/consulting/)** | North America |
 | **[New Era](https://www.neweratech.com/us/)** | North America |
-| **[Lightstream](https://www.lightstream.tech/partners/microsoft-azure/)** | North America |
+| **[Lightstream](https://lightstream.io/about-us/partners-alliances/microsoft/)** | North America |
 | **[The IT Consultancy Group](https://itconsult.com.au/)** | Australia |
 | **[MOQdigital](https://www.brennanit.com.au/solutions/cloud-services/)** | Australia |
 | **[MSG Services](https://www.msg-services.de/it-services/managed-services/cloud-outsourcing/)** | Europe (Germany) |

articles/governance/service-groups/create-service-group-rest-api.md

@@ -62,7 +62,7 @@ endpoint and request body:
 
 
 In the preceding examples, the new service group is created under the root service group. To
-specify a different service group as the parent, use the **properties.parent.id** property.
+specify a different service group as the parent, use the **properties.parent.resourceId** property.
 
 - REST API URI
 
@@ -77,7 +77,7 @@ specify a different service group as the parent, use the **properties.parent.id*
     "properties": {
       "displayName": "Contoso Group",
       "parent": {
-        "id": "/providers/Microsoft.Management/serviceGroups/HoldingGroup"
+        "resourceId": "/providers/Microsoft.Management/serviceGroups/HoldingGroup"
       }
     }
   }