diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfiguration.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfiguration.xml
index 86070f68f..64e0908ba 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfiguration.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfiguration.xml
@@ -32,7 +32,7 @@
                 </para>
     </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
   </Docs>
   <Members>
@@ -353,7 +353,7 @@
             </summary>
         <returns>A new instance with the option changed.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfigurationBuilder.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfigurationBuilder.xml
index c65a0e0dc..afdb54eb3 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfigurationBuilder.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Diagnostics/WarningsConfigurationBuilder.xml
@@ -33,7 +33,7 @@
                 </para>
     </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
   </Docs>
   <Members>
@@ -106,7 +106,7 @@
         </summary>
         <returns>The same builder instance so that multiple calls can be chained.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -158,7 +158,7 @@
         </summary>
         <returns>The same builder instance so that multiple calls can be chained.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -210,7 +210,7 @@
         </summary>
         <returns>The same builder instance so that multiple calls can be chained.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -259,7 +259,7 @@
         </summary>
         <returns>The same builder instance so that multiple calls can be chained.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -311,7 +311,7 @@
         </summary>
         <returns>The same builder instance so that multiple calls can be chained.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-warning-configuration">Configuration for specific messages</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-warning-configuration">Configuration for specific messages</see> for more information.
             </remarks>
       </Docs>
     </Member>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DatabaseFacade.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DatabaseFacade.xml
index b2f5fdc4e..8cc9b43d1 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DatabaseFacade.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DatabaseFacade.xml
@@ -308,7 +308,7 @@
         <returns>
           <see langword="true" /> if the database is available; <see langword="false" /> otherwise.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-connections">Database connections in EF Core</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-connections">Database connections in EF Core</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -362,7 +362,7 @@
                     for more information.
                 </para>
           <para>
-                    See <see href="https://aka.ms/efcore-connections">Database connections in EF Core</see> for more information.
+                    See <see href="https://aka.ms/efcore-docs-connections">Database connections in EF Core</see> for more information.
                 </para>
         </remarks>
         <exception cref="T:System.OperationCanceledException">If the <see cref="T:System.Threading.CancellationToken" /> is canceled.</exception>
@@ -594,8 +594,8 @@
         <returns>
           <see langword="true" /> if the database is created, <see langword="false" /> if it already existed.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-manage-schemas">Managing database schemas with EF Core</see>
-                and <see href="https://aka.ms/efcore-ensure-created">Database creation APIs</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-manage-schemas">Managing database schemas with EF Core</see>
+                and <see href="https://aka.ms/efcore-docs-ensure-created">Database creation APIs</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -679,8 +679,8 @@
                     for more information.
                 </para>
           <para>
-                    See <see href="https://aka.ms/efcore-manage-schemas">Managing database schemas with EF Core</see>
-                    and <see href="https://aka.ms/efcore-ensure-created">Database creation APIs</see> for more information.
+                    See <see href="https://aka.ms/efcore-docs-manage-schemas">Managing database schemas with EF Core</see>
+                    and <see href="https://aka.ms/efcore-docs-ensure-created">Database creation APIs</see> for more information.
                 </para>
         </remarks>
         <exception cref="T:System.OperationCanceledException">If the <see cref="T:System.Threading.CancellationToken" /> is canceled.</exception>
@@ -732,8 +732,8 @@
         <returns>
           <see langword="true" /> if the database is deleted, <see langword="false" /> if it did not exist.</returns>
         <remarks>
-                See <see href="https://aka.ms/efcore-manage-schemas">Managing database schemas with EF Core</see>
-                and <see href="https://aka.ms/efcore-ensure-created">Database creation APIs</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-manage-schemas">Managing database schemas with EF Core</see>
+                and <see href="https://aka.ms/efcore-docs-ensure-created">Database creation APIs</see> for more information.
             </remarks>
       </Docs>
     </Member>
@@ -796,8 +796,8 @@
                     for more information.
                 </para>
           <para>
-                    See <see href="https://aka.ms/efcore-manage-schemas">Managing database schemas with EF Core</see>
-                    and <see href="https://aka.ms/efcore-ensure-created">Database creation APIs</see> for more information.
+                    See <see href="https://aka.ms/efcore-docs-manage-schemas">Managing database schemas with EF Core</see>
+                    and <see href="https://aka.ms/efcore-docs-ensure-created">Database creation APIs</see> for more information.
                 </para>
         </remarks>
         <exception cref="T:System.OperationCanceledException">If the <see cref="T:System.Threading.CancellationToken" /> is canceled.</exception>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DbContextAttribute.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DbContextAttribute.xml
index 87b9852f1..a86924cf6 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DbContextAttribute.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/DbContextAttribute.xml
@@ -36,7 +36,7 @@
                 to identify which context a migration applies to.
             </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-manage-schemas">Managing database schemas with EF Cor</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-manage-schemas">Managing database schemas with EF Cor</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/IModelCacheKeyFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/IModelCacheKeyFactory.xml
index 068205790..e3cf23ac8 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/IModelCacheKeyFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/IModelCacheKeyFactory.xml
@@ -34,7 +34,7 @@
                 </para>
     </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-model-caching">EF Core model caching</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-model-caching">EF Core model caching</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKey.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKey.xml
index 5db9e23a1..e1e4caddb 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKey.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKey.xml
@@ -33,7 +33,7 @@
                 </para>
     </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-model-caching">EF Core model caching</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-model-caching">EF Core model caching</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKeyFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKeyFactory.xml
index 0c03704b4..5c94445c8 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKeyFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/ModelCacheKeyFactory.xml
@@ -42,7 +42,7 @@
                 </para>
     </summary>
     <remarks>
-                See <see href="https://aka.ms/efcore-model-caching">EF Core model caching</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-model-caching">EF Core model caching</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/SqlServerDbContextOptionsBuilder.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/SqlServerDbContextOptionsBuilder.xml
index cdc1fa643..dcee0bdbd 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/SqlServerDbContextOptionsBuilder.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Infrastructure/SqlServerDbContextOptionsBuilder.xml
@@ -295,8 +295,8 @@
       </AssemblyInfo>
       <Attributes>
         <Attribute FrameworkAlternate="efcore-3.1">
-          <AttributeName Language="C#">[System.Obsolete("Row-number paging is no longer supported. See https://ak.ms/AA6h122 for more information.")]</AttributeName>
-          <AttributeName Language="F#">[&lt;System.Obsolete("Row-number paging is no longer supported. See https://ak.ms/AA6h122 for more information.")&gt;]</AttributeName>
+          <AttributeName Language="C#">[System.Obsolete("Row-number paging is no longer supported. See https://aka.ms/AA6h122 for more information.")]</AttributeName>
+          <AttributeName Language="F#">[&lt;System.Obsolete("Row-number paging is no longer supported. See https://aka.ms/AA6h122 for more information.")&gt;]</AttributeName>
         </Attribute>
       </Attributes>
       <ReturnValue>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata.Builders/DbFunctionBuilder.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata.Builders/DbFunctionBuilder.xml
index a0fd776f3..fd6a9388b 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata.Builders/DbFunctionBuilder.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata.Builders/DbFunctionBuilder.xml
@@ -333,7 +333,7 @@
                     function. The callback takes a collection of expressions corresponding to
                     the parameters passed to the function call. The callback should return an
                     expression representing the desired translation.
-                </para>
+          </para>
           <para>
                     See https://go.microsoft.com/fwlink/?linkid=852477 for more information.
                 </para>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata/ValueGenerated.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata/ValueGenerated.xml
index 478fd149e..f0099a0be 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata/ValueGenerated.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Metadata/ValueGenerated.xml
@@ -43,7 +43,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> and
-                See <see href="https://aka.ms/efcore-value-generation">Value generation in EF Core</see> for more information.
+                See <see href="https://aka.ms/efcore-docs-value-generation">Value generation in EF Core</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CollectionShaperExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CollectionShaperExpression.xml
index ea206d4ca..1d996d348 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CollectionShaperExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CollectionShaperExpression.xml
@@ -37,7 +37,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CompiledQueryCacheKeyGenerator.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CompiledQueryCacheKeyGenerator.xml
index f4c47b907..182420972 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CompiledQueryCacheKeyGenerator.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/CompiledQueryCacheKeyGenerator.xml
@@ -47,7 +47,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EntityShaperExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EntityShaperExpression.xml
index d19e37f36..bd77b8682 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EntityShaperExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EntityShaperExpression.xml
@@ -31,7 +31,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EvaluatableExpressionFilter.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EvaluatableExpressionFilter.xml
index d426e9ca8..c4b56b985 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EvaluatableExpressionFilter.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/EvaluatableExpressionFilter.xml
@@ -32,7 +32,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionEqualityComparer.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionEqualityComparer.xml
index c315db784..ab4b6fb27 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionEqualityComparer.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionEqualityComparer.xml
@@ -23,7 +23,7 @@
             </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionPrinter.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionPrinter.xml
index c9047ffb2..6cf8587f3 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionPrinter.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ExpressionPrinter.xml
@@ -27,7 +27,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/GroupByShaperExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/GroupByShaperExpression.xml
index bfe98674d..59b20ed63 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/GroupByShaperExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/GroupByShaperExpression.xml
@@ -31,7 +31,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IAsyncQueryProvider.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IAsyncQueryProvider.xml
index 47e195801..6d99a0788 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IAsyncQueryProvider.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IAsyncQueryProvider.xml
@@ -28,7 +28,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ICompiledQueryCacheKeyGenerator.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ICompiledQueryCacheKeyGenerator.xml
index ca9263a4b..ec016a210 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ICompiledQueryCacheKeyGenerator.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ICompiledQueryCacheKeyGenerator.xml
@@ -35,7 +35,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEntityMaterializerSource.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEntityMaterializerSource.xml
index 03e08176b..04197c9f1 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEntityMaterializerSource.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEntityMaterializerSource.xml
@@ -30,7 +30,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilter.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilter.xml
index a18260548..687ed65b8 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilter.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilter.xml
@@ -25,7 +25,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilterPlugin.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilterPlugin.xml
index f8885f4f4..10b4f12ae 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilterPlugin.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IEvaluatableExpressionFilterPlugin.xml
@@ -24,7 +24,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IIncludableQueryable`2.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IIncludableQueryable`2.xml
index c00ea042e..14a3d6363 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IIncludableQueryable`2.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IIncludableQueryable`2.xml
@@ -57,7 +57,7 @@
             </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members />
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMemberTranslatorProvider.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMemberTranslatorProvider.xml
index a06526fda..129913a05 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMemberTranslatorProvider.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMemberTranslatorProvider.xml
@@ -18,9 +18,10 @@
                     Provides translations for LINQ <see cref="T:System.Linq.Expressions.MemberExpression" /> expressions.
                 </para>
       <para>
-                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton" />. This means a single instance
-                    is used by many <see cref="T:Microsoft.EntityFrameworkCore.DbContext" /> instances. The implementation must be thread-safe.
-                    This service cannot depend on services registered as <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />.
+                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />. This means that each
+                    <see cref="T:Microsoft.EntityFrameworkCore.DbContext" /> instance will use its own instance of this service.
+                    The implementation may depend on other services registered with any lifetime.
+                    The implementation does not need to be thread-safe.
                 </para>
     </summary>
     <remarks>To be added.</remarks>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorPlugin.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorPlugin.xml
index 1b9226d5f..fb22c2849 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorPlugin.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorPlugin.xml
@@ -18,10 +18,10 @@
                     Represents plugin for <see cref="T:Microsoft.EntityFrameworkCore.Query.IMethodCallTranslator" />.
                 </para>
       <para>
-                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton" /> and multiple registrations
-                    are allowed. This means a single instance of each service is used by many <see cref="T:Microsoft.EntityFrameworkCore.DbContext" />
-                    instances. The implementation must be thread-safe.
-                    This service cannot depend on services registered as <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />.
+                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />. This means that each
+                    <see cref="T:Microsoft.EntityFrameworkCore.DbContext" /> instance will use its own instance of this service.
+                    The implementation may depend on other services registered with any lifetime.
+                    The implementation does not need to be thread-safe.
                 </para>
     </summary>
     <remarks>To be added.</remarks>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorProvider.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorProvider.xml
index 0c5e2b8f0..4e3ff460c 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorProvider.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IMethodCallTranslatorProvider.xml
@@ -18,9 +18,10 @@
                     Provides translations for LINQ <see cref="T:System.Linq.Expressions.MethodCallExpression" /> expressions.
                 </para>
       <para>
-                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton" />. This means a single instance
-                    is used by many <see cref="T:Microsoft.EntityFrameworkCore.DbContext" /> instances. The implementation must be thread-safe.
-                    This service cannot depend on services registered as <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />.
+                    The service lifetime is <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" />. This means that each
+                    <see cref="T:Microsoft.EntityFrameworkCore.DbContext" /> instance will use its own instance of this service.
+                    The implementation may depend on other services registered with any lifetime.
+                    The implementation does not need to be thread-safe.
                 </para>
     </summary>
     <remarks>To be added.</remarks>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/INavigationExpansionExtensibilityHelper.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/INavigationExpansionExtensibilityHelper.xml
index 287637d5d..3ad4e3ba0 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/INavigationExpansionExtensibilityHelper.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/INavigationExpansionExtensibilityHelper.xml
@@ -15,7 +15,7 @@
             </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IPrintableExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IPrintableExpression.xml
index 9f8351d30..9de94b932 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IPrintableExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IPrintableExpression.xml
@@ -24,7 +24,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryCompilationContextFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryCompilationContextFactory.xml
index 22abe054b..a5710e89c 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryCompilationContextFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryCompilationContextFactory.xml
@@ -35,7 +35,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryContextFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryContextFactory.xml
index c092138e1..294a004c2 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryContextFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryContextFactory.xml
@@ -35,7 +35,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPostprocessorFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPostprocessorFactory.xml
index a22afffe5..e2b37d188 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPostprocessorFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPostprocessorFactory.xml
@@ -26,7 +26,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPreprocessorFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPreprocessorFactory.xml
index 70f784f2c..1f3ff211c 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPreprocessorFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryTranslationPreprocessorFactory.xml
@@ -26,7 +26,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryableMethodTranslatingExpressionVisitorFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryableMethodTranslatingExpressionVisitorFactory.xml
index c20bfcd79..ad9accf8e 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryableMethodTranslatingExpressionVisitorFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryableMethodTranslatingExpressionVisitorFactory.xml
@@ -25,7 +25,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryingEnumerable.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryingEnumerable.xml
index 6ac7a1222..6a2ab4afe 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryingEnumerable.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IQueryingEnumerable.xml
@@ -23,7 +23,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IShapedQueryCompilingExpressionVisitorFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IShapedQueryCompilingExpressionVisitorFactory.xml
index 4005665a7..aacdffa8d 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IShapedQueryCompilingExpressionVisitorFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IShapedQueryCompilingExpressionVisitorFactory.xml
@@ -26,7 +26,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IncludeExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IncludeExpression.xml
index 10adeb49a..753f9d670 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IncludeExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/IncludeExpression.xml
@@ -31,7 +31,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/MaterializeCollectionNavigationExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/MaterializeCollectionNavigationExpression.xml
index ef9601741..830886ac2 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/MaterializeCollectionNavigationExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/MaterializeCollectionNavigationExpression.xml
@@ -31,7 +31,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionBindingExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionBindingExpression.xml
index 85891ae02..8896a84c5 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionBindingExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionBindingExpression.xml
@@ -32,7 +32,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionMember.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionMember.xml
index 5db137d71..1a5d85101 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionMember.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ProjectionMember.xml
@@ -36,7 +36,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryCompilationContext.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryCompilationContext.xml
index e824574d3..65be1deb8 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryCompilationContext.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryCompilationContext.xml
@@ -36,7 +36,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryContext.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryContext.xml
index 0a9b44fd3..53041a8e2 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryContext.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryContext.xml
@@ -56,7 +56,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryRootExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryRootExpression.xml
index 4efcc7c6d..7fcebab0f 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryRootExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryRootExpression.xml
@@ -29,7 +29,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPostprocessor.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPostprocessor.xml
index 9bd87adf6..00667f673 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPostprocessor.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPostprocessor.xml
@@ -28,7 +28,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPreprocessor.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPreprocessor.xml
index 5b4dd3ddc..06bb6b66a 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPreprocessor.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryTranslationPreprocessor.xml
@@ -27,7 +27,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethodTranslatingExpressionVisitor.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethodTranslatingExpressionVisitor.xml
index 1610d4919..ed09396f9 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethodTranslatingExpressionVisitor.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethodTranslatingExpressionVisitor.xml
@@ -27,7 +27,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethods.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethods.xml
index 8b362452d..6d534b623 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethods.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/QueryableMethods.xml
@@ -21,7 +21,7 @@
             </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ReplacingExpressionVisitor.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ReplacingExpressionVisitor.xml
index 0b29b9dcd..4bce710c8 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ReplacingExpressionVisitor.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ReplacingExpressionVisitor.xml
@@ -27,7 +27,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ResultCardinality.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ResultCardinality.xml
index 736364996..dfb1068d9 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ResultCardinality.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ResultCardinality.xml
@@ -26,7 +26,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryCompilingExpressionVisitor.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryCompilingExpressionVisitor.xml
index 1750890c1..4d219ff0d 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryCompilingExpressionVisitor.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryCompilingExpressionVisitor.xml
@@ -35,7 +35,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryExpression.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryExpression.xml
index cf265bc9e..dc6f70de7 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryExpression.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/ShapedQueryExpression.xml
@@ -31,7 +31,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/TransparentIdentifierFactory.xml b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/TransparentIdentifierFactory.xml
index 4b1e7d3f9..de317697b 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore.Query/TransparentIdentifierFactory.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore.Query/TransparentIdentifierFactory.xml
@@ -29,7 +29,7 @@
     </summary>
     <remarks>
                 See <see href="https://aka.ms/efcore-docs-providers">Implementation of database providers and extensions</see>
-                and <see href="https://aka.ms/efcore-how-queries-work">How EF Core queries work</see> for more information.
+                and <see href="https://aka.ms/efcore-docs-how-query-works">How EF Core queries work</see> for more information.
             </remarks>
   </Docs>
   <Members>
diff --git a/dotnet/xml/Microsoft.EntityFrameworkCore/PropertyAccessMode.xml b/dotnet/xml/Microsoft.EntityFrameworkCore/PropertyAccessMode.xml
index 21f732d79..bcf18ee9f 100644
--- a/dotnet/xml/Microsoft.EntityFrameworkCore/PropertyAccessMode.xml
+++ b/dotnet/xml/Microsoft.EntityFrameworkCore/PropertyAccessMode.xml
@@ -134,7 +134,7 @@
         <summary>
           <para>
                     All accesses to the property goes directly to the field, unless the field is
-                    not known, in which as access goes through the property.
+                    not known, in which case access goes through the property.
                 </para>
         </summary>
       </Docs>
@@ -191,7 +191,7 @@
         <summary>
           <para>
                     All accesses to the property go through the property, unless there is no property or
-                    it is missing a setter/getter, in which as access goes directly to the field.
+                    it is missing a setter/getter, in which case access goes directly to the field.
                 </para>
         </summary>
       </Docs>