From 43bde61b2e170c04988bb0905b54732fc1db321e Mon Sep 17 00:00:00 2001
From: Arthur Vickers <ajcvickers@hotmail.com>
Date: Thu, 19 Jan 2023 14:40:31 +0000
Subject: [PATCH 1/3] [BULK] DocuTune - Rebranding of Azure Cosmos DB APIs

---
 CONTRIBUTING.md                               |  2 +-
 .../core/modeling/owned-entities.md           |  2 +-
 entity-framework/core/modeling/sequences.md   |  2 +-
 .../core/providers/cosmos/index.md            | 14 +++----
 .../core/providers/cosmos/limitations.md      |  2 +-
 .../providers/cosmos/unstructured-data.md     |  4 +-
 .../core/providers/writing-a-provider.md      |  6 +--
 .../core/querying/database-functions.md       |  2 +-
 .../core/testing/testing-with-the-database.md |  2 +-
 .../core/what-is-new/ef-core-3.x/index.md     |  6 +--
 .../ef-core-5.0/breaking-changes.md           | 16 ++++----
 .../core/what-is-new/ef-core-5.0/plan.md      | 10 ++---
 .../core/what-is-new/ef-core-5.0/whatsnew.md  | 12 +++---
 .../ef-core-6.0/breaking-changes.md           | 10 ++---
 .../core/what-is-new/ef-core-6.0/plan.md      |  8 ++--
 .../core/what-is-new/ef-core-6.0/whatsnew.md  | 38 +++++++++----------
 .../ef-core-7.0/breaking-changes.md           |  4 +-
 .../core/what-is-new/ef-core-7.0/plan.md      |  8 ++--
 entity-framework/dotnet-data/index.yml        |  6 +--
 entity-framework/index.yml                    |  2 +-
 entity-framework/toc.yml                      |  4 +-
 21 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 986811b6e4..adb47345e7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ To highlight selected lines in a rendered snippet (usually renders as yellow bac
 
 ## Test your changes with DocFX
 
-Test your changes with the [DocFX command-line tool](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool), which creates a locally hosted version of the site. DocFX doesn't render style and site extensions created for Microsoft Docs.
+Test your changes with the [DocFX command-line tool](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool), which creates a locally hosted version of the site. DocFX doesn't render style and site extensions created for Microsoft Learn.
 
 DocFX requires the .NET Framework on Windows, or Mono for Linux or macOS.
 
diff --git a/entity-framework/core/modeling/owned-entities.md b/entity-framework/core/modeling/owned-entities.md
index 304371a3be..d8e22d9367 100644
--- a/entity-framework/core/modeling/owned-entities.md
+++ b/entity-framework/core/modeling/owned-entities.md
@@ -13,7 +13,7 @@ Owned entities are essentially a part of the owner and cannot exist without it,
 
 ## Configuring types as owned
 
-In most providers, entity types are never configured as owned by convention - you must explicitly use the `OwnsOne` method in `OnModelCreating` or annotate the type with `OwnedAttribute` to configure the type as owned. The Azure Cosmos DB provider is an exception to this. Because Cosmos DB is a document database, the provider configures all related entity types as owned by default.
+In most providers, entity types are never configured as owned by convention - you must explicitly use the `OwnsOne` method in `OnModelCreating` or annotate the type with `OwnedAttribute` to configure the type as owned. The Azure Cosmos DB provider is an exception to this. Because Azure Cosmos DB is a document database, the provider configures all related entity types as owned by default.
 
 In this example, `StreetAddress` is a type with no identity property. It is used as a property of the Order type to specify the shipping address for a particular order.
 
diff --git a/entity-framework/core/modeling/sequences.md b/entity-framework/core/modeling/sequences.md
index 7fb62ea3bc..b4a5c193eb 100644
--- a/entity-framework/core/modeling/sequences.md
+++ b/entity-framework/core/modeling/sequences.md
@@ -8,7 +8,7 @@ uid: core/modeling/sequences
 # Sequences
 
 > [!NOTE]
-> Sequences are a feature typically supported only by relational databases. If you're using a non-relational database such as Cosmos, check your database documentation on generating unique values.
+> Sequences are a feature typically supported only by relational databases. If you're using a non-relational database such as Azure Cosmos DB, check your database documentation on generating unique values.
 
 A sequence generates unique, sequential numeric values in the database. Sequences are not associated with a specific table, and multiple tables can be set up to draw values from the same sequence.
 
diff --git a/entity-framework/core/providers/cosmos/index.md b/entity-framework/core/providers/cosmos/index.md
index 8880a4fc0e..e9b4c0f826 100644
--- a/entity-framework/core/providers/cosmos/index.md
+++ b/entity-framework/core/providers/cosmos/index.md
@@ -1,6 +1,6 @@
 ---
 title: Azure Cosmos DB Provider - EF Core
-description: Documentation for the database provider that allows Entity Framework Core to be used with the Azure Cosmos DB SQL API
+description: Documentation for the database provider that allows Entity Framework Core to be used with the Azure Cosmos DB for NoSQL
 author: AndriySvyryd
 ms.date: 01/11/2022
 uid: core/providers/cosmos/index
@@ -12,7 +12,7 @@ This database provider allows Entity Framework Core to be used with Azure Cosmos
 It is strongly recommended to familiarize yourself with the [Azure Cosmos DB documentation](/azure/cosmos-db/introduction) before reading this section.
 
 > [!NOTE]
-> This provider only works with the SQL API of Azure Cosmos DB.
+> This provider only works with the Azure Cosmos DB for NoSQL of Azure Cosmos DB.
 
 ## Install
 
@@ -57,9 +57,9 @@ Saving and querying data follows the normal EF pattern:
 > [!IMPORTANT]
 > Calling [EnsureCreatedAsync](/dotnet/api/Microsoft.EntityFrameworkCore.Storage.IDatabaseCreator.EnsureCreatedAsync) is necessary to create the required containers and insert the [seed data](xref:core/modeling/data-seeding) if present in the model. However `EnsureCreatedAsync` should only be called during deployment, not normal operation, as it may cause performance issues.
 
-## Cosmos options
+## Azure Cosmos DB options
 
-It is also possible to configure the Cosmos DB provider with a single connection string and to specify other options to customize the connection:
+It is also possible to configure the Azure Cosmos DB provider with a single connection string and to specify other options to customize the connection:
 
 [!code-csharp[Configuration](../../../../samples/core/Cosmos/ModelBuilding/OptionsContext.cs?name=Configuration)]
 
@@ -84,7 +84,7 @@ If no other entity type will ever be stored in the same container the discrimina
 
 ### Partition keys
 
-By default EF Core will create containers with the partition key set to `"__partitionKey"` without supplying any value for it when inserting items. But to fully leverage the performance capabilities of Azure Cosmos a [carefully selected partition key](/azure/cosmos-db/partition-data) should be used. It can be configured by calling [HasPartitionKey](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.HasPartitionKey):
+By default EF Core will create containers with the partition key set to `"__partitionKey"` without supplying any value for it when inserting items. But to fully leverage the performance capabilities of Azure Cosmos DB a [carefully selected partition key](/azure/cosmos-db/partition-data) should be used. It can be configured by calling [HasPartitionKey](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.HasPartitionKey):
 
 [!code-csharp[PartitionKey](../../../../samples/core/Cosmos/ModelBuilding/OrderContext.cs?name=PartitionKey)]
 
@@ -99,7 +99,7 @@ It is generally recommended to add the partition key to the primary key as that
 
 ### Provisioned throughput
 
-If you use EF Core to create the Azure Cosmos database or containers you can configure [provisioned throughput](/azure/cosmos-db/set-throughput) for the database by calling <xref:Microsoft.EntityFrameworkCore.CosmosModelBuilderExtensions.HasAutoscaleThroughput%2A?displayProperty=nameWithType> or <xref:Microsoft.EntityFrameworkCore.CosmosModelBuilderExtensions.HasManualThroughput%2A?displayProperty=nameWithType>. For example:
+If you use EF Core to create the Azure Cosmos DB database or containers you can configure [provisioned throughput](/azure/cosmos-db/set-throughput) for the database by calling <xref:Microsoft.EntityFrameworkCore.CosmosModelBuilderExtensions.HasAutoscaleThroughput%2A?displayProperty=nameWithType> or <xref:Microsoft.EntityFrameworkCore.CosmosModelBuilderExtensions.HasManualThroughput%2A?displayProperty=nameWithType>. For example:
 
 <!--
 modelBuilder.HasManualThroughput(2000);
@@ -124,7 +124,7 @@ modelBuilder.Entity<Family>(
 > [!NOTE]
 > Related entity types are configured as owned by default. To prevent this for a specific entity type call <xref:Microsoft.EntityFrameworkCore.ModelBuilder.Entity%2A?displayProperty=nameWithType>.
 
-For Cosmos, owned entities are embedded in the same item as the owner. To change a property name use [ToJsonProperty](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.ToJsonProperty):
+For Azure Cosmos DB, owned entities are embedded in the same item as the owner. To change a property name use [ToJsonProperty](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.ToJsonProperty):
 
 [!code-csharp[PropertyNames](../../../../samples/core/Cosmos/ModelBuilding/OrderContext.cs?name=PropertyNames)]
 
diff --git a/entity-framework/core/providers/cosmos/limitations.md b/entity-framework/core/providers/cosmos/limitations.md
index 96d9ce42dc..60b5fe611d 100644
--- a/entity-framework/core/providers/cosmos/limitations.md
+++ b/entity-framework/core/providers/cosmos/limitations.md
@@ -7,7 +7,7 @@ uid: core/providers/cosmos/limitations
 ---
 # EF Core Azure Cosmos DB Provider Limitations
 
-The Cosmos provider has a number of limitations. Many of these limitations are a result of limitations in the underlying Cosmos database engine and are not specific to EF. But most simply [haven't been implemented yet](https://github.com/dotnet/efcore/issues?page=1&q=is%3Aissue+is%3Aopen+Cosmos+in%3Atitle+label%3Atype-enhancement+sort%3Areactions-%2B1-desc).
+The Azure Cosmos DB provider has a number of limitations. Many of these limitations are a result of limitations in the underlying Azure Cosmos DB database engine and are not specific to EF. But most simply [haven't been implemented yet](https://github.com/dotnet/efcore/issues?page=1&q=is%3Aissue+is%3Aopen+Cosmos+in%3Atitle+label%3Atype-enhancement+sort%3Areactions-%2B1-desc).
 
 These are some of the commonly requested features:
 
diff --git a/entity-framework/core/providers/cosmos/unstructured-data.md b/entity-framework/core/providers/cosmos/unstructured-data.md
index 5df00805ed..e499aefb92 100644
--- a/entity-framework/core/providers/cosmos/unstructured-data.md
+++ b/entity-framework/core/providers/cosmos/unstructured-data.md
@@ -48,11 +48,11 @@ To decouple completely from EF Core get the [CosmosClient](/dotnet/api/Microsoft
 
 ## Missing property values
 
-In the previous example we removed the `"TrackingNumber"` property from the order. Because of how indexing works in Cosmos DB, queries that reference the missing property somewhere else than in the projection could return unexpected results. For example:
+In the previous example we removed the `"TrackingNumber"` property from the order. Because of how indexing works in Azure Cosmos DB, queries that reference the missing property somewhere else than in the projection could return unexpected results. For example:
 
 [!code-csharp[MissingProperties](../../../../samples/core/Cosmos/UnstructuredData/Sample.cs?name=MissingProperties)]
 
 The sorted query actually returns no results. This means that one should take care to always populate properties mapped by EF Core when working with the store directly.
 
 > [!NOTE]
-> This behavior might change in future versions of Cosmos. For instance, currently if the indexing policy defines the composite index {Id/? ASC, TrackingNumber/? ASC)}, then a query that has 'ORDER BY c.Id ASC, c.Discriminator ASC' __would__ return items that are missing the `"TrackingNumber"` property.
+> This behavior might change in future versions of Azure Cosmos DB. For instance, currently if the indexing policy defines the composite index {Id/? ASC, TrackingNumber/? ASC)}, then a query that has 'ORDER BY c.Id ASC, c.Discriminator ASC' __would__ return items that are missing the `"TrackingNumber"` property.
diff --git a/entity-framework/core/providers/writing-a-provider.md b/entity-framework/core/providers/writing-a-provider.md
index 11e298f283..178643308e 100644
--- a/entity-framework/core/providers/writing-a-provider.md
+++ b/entity-framework/core/providers/writing-a-provider.md
@@ -20,7 +20,7 @@ The EF Core codebase is open source and contains several database providers that
 
 Starting with work after the 2.1 release, we have created a [log of changes](xref:core/providers/provider-log) that may need corresponding changes in provider code. This is intended to help when updating an existing provider to work with a new version of EF Core.
 
-Prior to 2.1, we used the [`providers-beware`](https://github.com/dotnet/efcore/labels/providers-beware) and [`providers-fyi`](https://github.com/dotnet/efcore/labels/providers-fyi) labels on our GitHub issues and pull requests for a similar purpose. We will continiue to use these lables on issues to give an indication which work items in a given release may also require work to be done in providers. A `providers-beware` label typically means that the implementation of an work item may break providers, while a `providers-fyi` label typically means that providers will not be broken, but code may need to be changed anyway, for example, to enable new functionality.
+Prior to 2.1, we used the [`providers-beware`](https://github.com/dotnet/efcore/labels/providers-beware) and [`providers-fyi`](https://github.com/dotnet/efcore/labels/providers-fyi) labels on our GitHub issues and pull requests for a similar purpose. We will continue to use these labels on issues to give an indication which work items in a given release may also require work to be done in providers. A `providers-beware` label typically means that the implementation of a work item may break providers, while a `providers-fyi` label typically means that providers will not be broken, but code may need to be changed anyway, for example, to enable new functionality.
 
 ## Suggested naming of third party providers
 
@@ -36,11 +36,11 @@ For example:
 
 ## The EF Core specification tests
 
-EF Core provides a specification test suite project, which all providers are encouraged to implement. The project contains tests which ensure that the provider function correctly, e.g. by executing various LINQ queries and ensuring that the correct results are returned. This test suite is used by EF Core's own providers (SQL Server, SQLite, Cosmos...) as the primary regression testing mechanism, and are continuously updated and improved as new features are added to EF Core. By implementing these tests for other, 3rd-party providers, you can ensure that your database provider works correctly and implements all the latest EF Core features. Note that the test suite is quite large, as it covers the entire EF Core feature set; you don't have to implement everything - it's perfectly fine to cherry-pick certain test classes, and incrementally improve your coverage with time.
+EF Core provides a specification test suite project, which all providers are encouraged to implement. The project contains tests which ensure that the provider function correctly, e.g. by executing various LINQ queries and ensuring that the correct results are returned. This test suite is used by EF Core's own providers (such as SQL Server, SQLite, and Azure Cosmos DB) as the primary regression testing mechanism, and are continuously updated and improved as new features are added to EF Core. By implementing these tests for other, 3rd-party providers, you can ensure that your database provider works correctly and implements all the latest EF Core features. Note that the test suite is quite large, as it covers the entire EF Core feature set; you don't have to implement everything - it's perfectly fine to cherry-pick certain test classes, and incrementally improve your coverage with time.
 
 To start using the specification tests, follow these steps:
 
-* Create an xunit test project in your provider solution. We suggest the name `<Provider>.FunctionalTests` for consistency, so if your provider is called `AcmeSoftware.EntityFramework.AcmeDb`, call the test project `AcmeSoftware.EntityFramework.AcmeDb.FunctionalTests`.
+* Create an xUnit test project in your provider solution. We suggest the name `<Provider>.FunctionalTests` for consistency, so if your provider is called `AcmeSoftware.EntityFramework.AcmeDb`, call the test project `AcmeSoftware.EntityFramework.AcmeDb.FunctionalTests`.
 * From your new test project, reference the EF specification tests, which are published as regular Nuget packages. For relational providers, the specification test suite is [Microsoft.EntityFrameworkCore.Relational.Specification.Tests](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Relational.Specification.Tests), for non-relational provider, use [Microsoft.EntityFrameworkCore.Specification.Tests](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Specification.Tests)).
 * Pick a test class from the EF specification tests, and extend it from a corresponding test class in your own project. The available test classes can be seen in the [EF source code](https://github.com/dotnet/efcore/tree/main/test/EFCore.Relational.Specification.Tests). Your class should be named based on the EF test class, with your provider name inserted where appropriate. For example, `NorthwindWhereQueryRelationalTestBase` (which is a good place to start), would be extended by `NorthwindWhereQueryAcmeDbTest`.
 * At the very beginning, you'll have a bit of test infrastructure to implement - once that's done once, things will become easier. For example, for `NorthwindWhereQueryAcmeDbTest` you'll have to implement `NorthwindWhereQueryAcmeDbFixture`, which will require a `AcmeDbNorthwindTestStoreFactory`, which would need a Northwind.sql script to seed the AcmeDb version of the Northwind database. We strongly suggest keeping another EF Core provider's test suite open nearby, and following what it does. For example, the SQL Server implementation of the specification tests is visible [here](https://github.com/dotnet/efcore/tree/main/test/EFCore.SqlServer.FunctionalTests).
diff --git a/entity-framework/core/querying/database-functions.md b/entity-framework/core/querying/database-functions.md
index 3fecc05230..11889d42fb 100644
--- a/entity-framework/core/querying/database-functions.md
+++ b/entity-framework/core/querying/database-functions.md
@@ -52,4 +52,4 @@ Apart from mappings provided by EF Core providers, users can also define custom
 
 - [SqlServer built-in function mappings](xref:core/providers/sql-server/functions)
 - [Sqlite built-in function mappings](xref:core/providers/sqlite/functions)
-- [Cosmos built-in function mappings](xref:core/providers/cosmos/functions)
+- [Azure Cosmos DB built-in function mappings](xref:core/providers/cosmos/functions)
diff --git a/entity-framework/core/testing/testing-with-the-database.md b/entity-framework/core/testing/testing-with-the-database.md
index 4c7fd80548..df8f743a69 100644
--- a/entity-framework/core/testing/testing-with-the-database.md
+++ b/entity-framework/core/testing/testing-with-the-database.md
@@ -26,7 +26,7 @@ In certain cases, databases have a special edition or version which can be helpf
 
 We generally recommend installing SQL Server Developer edition rather than LocalDB, since it provides the full SQL Server feature set and is generally very easy to do.
 
-When using a cloud database, it's usually appropriate to test against a local version of the database, both to improve speed and to decrease costs. For example, when using SQL Azure in production, you can test against a locally-installed SQL Server - the two are extremely similar (though it's still wise to run tests against SQL Azure itself before going into production). When using Cosmos, [the Cosmos emulator](/azure/cosmos-db/local-emulator) is a useful tool both for developing locally and for running tests.
+When using a cloud database, it's usually appropriate to test against a local version of the database, both to improve speed and to decrease costs. For example, when using SQL Azure in production, you can test against a locally-installed SQL Server - the two are extremely similar (though it's still wise to run tests against SQL Azure itself before going into production). When using Azure Cosmos DB, [the Azure Cosmos DB emulator](/azure/cosmos-db/local-emulator) is a useful tool both for developing locally and for running tests.
 
 ## Creating, seeding and managing a test database
 
diff --git a/entity-framework/core/what-is-new/ef-core-3.x/index.md b/entity-framework/core/what-is-new/ef-core-3.x/index.md
index 9821fd98f0..c8018b359f 100644
--- a/entity-framework/core/what-is-new/ef-core-3.x/index.md
+++ b/entity-framework/core/what-is-new/ef-core-3.x/index.md
@@ -56,11 +56,11 @@ Another aspect of the design that changed significantly in 3.x is that we now al
 
 Similarly to client evaluation, if EF Core 3.x can't translate a LINQ query into a single SQL statement, it throws a runtime exception. But we made EF Core capable of translating many of the common patterns that used to generate multiple queries to a single query with JOINs.
 
-## Cosmos DB support
+## Azure Cosmos DB support
 
-The Cosmos DB provider for EF Core enables developers familiar with the EF programing model to easily target Azure Cosmos DB as an application database. The goal is to make some of the advantages of Cosmos DB, like global distribution, "always on" availability, elastic scalability, and low latency, even more accessible to .NET developers. The provider enables most EF Core features, like automatic change tracking, LINQ, and value conversions, against the SQL API in Cosmos DB.
+The Azure Cosmos DB provider for EF Core enables developers familiar with the EF programing model to easily target Azure Cosmos DB as an application database. The goal is to make some of the advantages of Azure Cosmos DB, like global distribution, "always on" availability, elastic scalability, and low latency, even more accessible to .NET developers. The provider enables most EF Core features, like automatic change tracking, LINQ, and value conversions, against Azure Cosmos DB for NoSQL.
 
-See the [Cosmos DB provider documentation](xref:core/providers/cosmos/index) for more details.
+See the [Azure Cosmos DB provider documentation](xref:core/providers/cosmos/index) for more details.
 
 ## C# 8.0 support
 
diff --git a/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md b/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
index f968a1322a..8f54ad45bb 100644
--- a/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
+++ b/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
@@ -23,10 +23,10 @@ The following API and behavior changes have the potential to break existing appl
 | [ToView() is treated differently by migrations](#toview)                                                                              | Medium     |
 | [ToTable(null) marks the entity type as not mapped to a table](#totable)                                                              | Medium     |
 | [Removed HasGeometricDimension method from SQLite NTS extension](#geometric-sqlite)                                                   | Low        |
-| [Cosmos: Partition key is now added to the primary key](#cosmos-partition-key)                                                        | Low        |
-| [Cosmos: `id` property renamed to `__id`](#cosmos-id)                                                                                 | Low        |
-| [Cosmos: byte[] is now stored as a base64 string instead of a number array](#cosmos-byte)                                             | Low        |
-| [Cosmos: GetPropertyName and SetPropertyName were renamed](#cosmos-metadata)                                                          | Low        |
+| [Azure Cosmos DB: Partition key is now added to the primary key](#cosmos-partition-key)                                                        | Low        |
+| [Azure Cosmos DB: `id` property renamed to `__id`](#cosmos-id)                                                                                 | Low        |
+| [Azure Cosmos DB: byte[] is now stored as a base64 string instead of a number array](#cosmos-byte)                                             | Low        |
+| [Azure Cosmos DB: GetPropertyName and SetPropertyName were renamed](#cosmos-metadata)                                                          | Low        |
 | [Value generators are called when the entity state is changed from Detached to Unchanged, Updated, or Deleted](#non-added-generation) | Low        |
 | [IMigrationsModelDiffer now uses IRelationalModel](#relational-model)                                                                 | Low        |
 | [Discriminators are read-only](#read-only-discriminators)                                                                             | Low        |
@@ -336,7 +336,7 @@ modelBuilder.Entity<GeoEntity>(
 
 <a name="cosmos-partition-key"></a>
 
-### Cosmos: Partition key is now added to the primary key
+### Azure Cosmos DB: Partition key is now added to the primary key
 
 [Tracking Issue #15289](https://github.com/dotnet/efcore/issues/15289)
 
@@ -363,7 +363,7 @@ modelBuilder.Entity<Blog>()
 
 <a name="cosmos-id"></a>
 
-### Cosmos: `id` property renamed to `__id`
+### Azure Cosmos DB: `id` property renamed to `__id`
 
 [Tracking Issue #17751](https://github.com/dotnet/efcore/issues/17751)
 
@@ -391,7 +391,7 @@ modelBuilder.Entity<Blog>()
 
 <a name="cosmos-byte"></a>
 
-### Cosmos: byte[] is now stored as a base64 string instead of a number array
+### Azure Cosmos DB: byte[] is now stored as a base64 string instead of a number array
 
 [Tracking Issue #17306](https://github.com/dotnet/efcore/issues/17306)
 
@@ -413,7 +413,7 @@ Existing data stored as number arrays will still be queried correctly, but curre
 
 <a name="cosmos-metadata"></a>
 
-### Cosmos: GetPropertyName and SetPropertyName were renamed
+### Azure Cosmos DB: GetPropertyName and SetPropertyName were renamed
 
 [Tracking Issue #17874](https://github.com/dotnet/efcore/issues/17874)
 
diff --git a/entity-framework/core/what-is-new/ef-core-5.0/plan.md b/entity-framework/core/what-is-new/ef-core-5.0/plan.md
index 24f3b3d4dd..ce72245595 100644
--- a/entity-framework/core/what-is-new/ef-core-5.0/plan.md
+++ b/entity-framework/core/what-is-new/ef-core-5.0/plan.md
@@ -251,7 +251,7 @@ Tracked by [#1675](https://github.com/dotnet/EntityFramework.Docs/issues/1675)
 
 T-shirt size: M
 
-Status: Completed. The new documentation is [live on the Microsoft docs site](/dotnet/standard/data/sqlite/?tabs=netcore-cli).
+Status: Completed. The new documentation is [live on Microsoft Learn](/dotnet/standard/data/sqlite/?tabs=netcore-cli).
 
 The EF Team also owns the Microsoft.Data.Sqlite ADO.NET provider. We plan to fully document this provider as part of the 5.0 release.
 
@@ -259,7 +259,7 @@ The EF Team also owns the Microsoft.Data.Sqlite ADO.NET provider. We plan to ful
 
 Lead documenter: @ajcvickers
 
-Tracked by [issues in the docs repo in the 5.0 milestone](https://github.com/dotnet/EntityFramework.Docs/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A5.0.0+)
+Tracked by [issues in the documentation repo in the 5.0 milestone](https://github.com/dotnet/EntityFramework.Docs/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A5.0.0+)
 
 T-shirt size: L
 
@@ -267,9 +267,9 @@ Status: In-progress
 
 We are already in the process of updating documentation for the 3.0 and 3.1 releases. We are also working on:
 
-* An overhaul of the getting started docs to make them more approachable/easier to follow
-* Reorganization of docs to make things easier to find and to add cross-references
-* Adding more details and clarifications to existing docs
+* An overhaul of the getting started articles to make them more approachable/easier to follow
+* Reorganization of articles to make things easier to find and to add cross-references
+* Adding more details and clarifications to existing articles
 * Updating the samples and adding more examples
 
 ## Fixing bugs
diff --git a/entity-framework/core/what-is-new/ef-core-5.0/whatsnew.md b/entity-framework/core/what-is-new/ef-core-5.0/whatsnew.md
index 4fe4f7b4f2..c0b5563598 100644
--- a/entity-framework/core/what-is-new/ef-core-5.0/whatsnew.md
+++ b/entity-framework/core/what-is-new/ef-core-5.0/whatsnew.md
@@ -363,13 +363,13 @@ For further information, [see the full documentation on event counters](xref:cor
 * Scaffolding existing databases now singularizes table names, so tables named `People` and `Addresses` will be scaffolded to entity types called `Person` and `Address`. [Original database names can still be preserved](xref:core/managing-schemas/scaffolding#preserving-names).
 * The new [`--no-onconfiguring`](xref:core/cli/dotnet#dotnet-ef-dbcontext-scaffold) option can instruct EF Core to exclude `OnModelConfiguring` when scaffolding a model.
 
-### Cosmos
+### Azure Cosmos DB
 
-* [Cosmos connection settings](xref:core/providers/cosmos/index#cosmos-options) have been expanded.
-* Optimistic concurrency is now [supported on Cosmos via the use of ETags](xref:core/providers/cosmos/index#optimistic-concurrency-with-etags).
-* The new `WithPartitionKey` method allows the Cosmos [partition key](xref:core/providers/cosmos/index#partition-keys) to be included both in the model and in queries.
-* The string methods [`Contains`](/dotnet/api/system.string.contains), [`StartsWith`](/dotnet/api/system.string.startswith) and [`EndsWith`](/dotnet/api/system.string.endswith) are now translated for Cosmos.
-* The C# `is` operator is now translated on Cosmos.
+* [Azure Cosmos DB connection settings](xref:core/providers/cosmos/index#cosmos-options) have been expanded.
+* Optimistic concurrency is now [supported on Azure Cosmos DB via the use of ETags](xref:core/providers/cosmos/index#optimistic-concurrency-with-etags).
+* The new `WithPartitionKey` method allows the Azure Cosmos DB [partition key](xref:core/providers/cosmos/index#partition-keys) to be included both in the model and in queries.
+* The string methods [`Contains`](/dotnet/api/system.string.contains), [`StartsWith`](/dotnet/api/system.string.startswith) and [`EndsWith`](/dotnet/api/system.string.endswith) are now translated for Azure Cosmos DB.
+* The C# `is` operator is now translated on Azure Cosmos DB.
 
 ### Sqlite
 
diff --git a/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md b/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
index 03e0d88398..ab9fad886d 100644
--- a/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
+++ b/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
@@ -20,7 +20,7 @@ EF Core 6.0 targets .NET 6. Applications targeting older .NET, .NET Core, and .N
 |:------------------------------------------------------------------------------------------------------------------------------------|------------|
 | [Nested optional dependents sharing a table and with no required properties cannot be saved](#nested-optionals)                     | High       |
 | [Changing the owner of an owned entity now throws an exception](#owned-reparenting)                                                 | Medium     |
-| [Cosmos: Related entity types are discovered as owned](#cosmos-owned)                                                               | Medium     |
+| [Azure Cosmos DB: Related entity types are discovered as owned](#cosmos-owned)                                                               | Medium     |
 | [SQLite: Connections are pooled](#connection-pool)                                                                                  | Medium     |
 | [Many-to-many relationships without mapped join entities are now scaffolded](#many-to-many)                                         | Medium     |
 | [Cleaned up mapping between DeleteBehavior and ON DELETE values](#on-delete)                                                        | Low        |
@@ -32,7 +32,7 @@ EF Core 6.0 targets .NET 6. Applications targeting older .NET, .NET Core, and .N
 | [Added IReadOnly Metadata interfaces and removed extension methods](#ireadonly-metadata)                                            | Low        |
 | [IExecutionStrategy is now a singleton service](#iexecutionstrategy)                                                                | Low        |
 | [SQL Server: More errors are considered transient](#transient-errors)                                                               | Low        |
-| [Cosmos: More characters are escaped in 'id' values](#cosmos-id)                                                                    | Low        |
+| [Azure Cosmos DB: More characters are escaped in 'id' values](#cosmos-id)                                                                    | Low        |
 | [Some Singleton services are now Scoped](#query-services)                                                                           | Low*       |
 | [New caching API for extensions that add or replace services](#extensions-caching)                                                  | Low*       |
 | [New snapshot and design-time model initialization procedure](#snapshot-initialization)                                             | Low        |
@@ -169,7 +169,7 @@ Instead of assigning the same owned instance to a new owner you can assign a cop
 
 <a name="cosmos-owned"></a>
 
-### Cosmos: Related entity types are discovered as owned
+### Azure Cosmos DB: Related entity types are discovered as owned
 
 [Tracking Issue #24803](https://github.com/dotnet/efcore/issues/24803)
 [What's new: Default to implicit ownership](xref:core/what-is-new/ef-core-6.0/whatsnew#default-to-implicit-ownership)
@@ -184,7 +184,7 @@ Related entity types will now be owned by the entity type on which they were dis
 
 #### Why
 
-This behavior follows the common pattern of modeling data in Azure Cosmos DB of embedding related data into a single document. Cosmos DB does not natively support joining different documents, so modeling related entities as non-owned has limited usefulness.
+This behavior follows the common pattern of modeling data in Azure Cosmos DB of embedding related data into a single document. Azure Cosmos DB does not natively support joining different documents, so modeling related entities as non-owned has limited usefulness.
 
 #### Mitigations
 
@@ -548,7 +548,7 @@ To change the set of errors that are considered transient, use a custom executio
 
 <a name="cosmos-id"></a>
 
-### Cosmos: More characters are escaped in 'id' values
+### Azure Cosmos DB: More characters are escaped in 'id' values
 
 [Tracking Issue #25100](https://github.com/dotnet/efcore/issues/25100)
 
diff --git a/entity-framework/core/what-is-new/ef-core-6.0/plan.md b/entity-framework/core/what-is-new/ef-core-6.0/plan.md
index 819ea49303..7f35b2372e 100644
--- a/entity-framework/core/what-is-new/ef-core-6.0/plan.md
+++ b/entity-framework/core/what-is-new/ef-core-6.0/plan.md
@@ -182,7 +182,7 @@ It was previously the team view that owned entities, intended for [aggregate sup
 
 This work is initially scoped to allow [value converters which map to multiple columns](https://github.com/dotnet/efcore/issues/13947). We may pull in additional support based on feedback during the release.
 
-### Cosmos database provider
+### Azure Cosmos DB database provider
 
 Tracked by [issues labeled with 'area-cosmos' and in the 6.0 milestone](https://github.com/dotnet/efcore/issues?q=is%3Aopen+is%3Aissue+milestone%3A6.0.0+label%3Aarea-cosmos)
 
@@ -190,9 +190,9 @@ Status: Expanded/Complete
 
 T-shirt size: Large
 
-We are actively gathering feedback on which improvements to make to the Cosmos provider in EF Core 6.0. We will update this document as we learn more. For now, please make sure to vote (👍) for the Cosmos features that you need.
+We are actively gathering feedback on which improvements to make to the Azure Cosmos DB provider in EF Core 6.0. We will update this document as we learn more. For now, please make sure to vote (👍) for the Azure Cosmos DB features that you need.
 
-Update: We have been doing extensive customer development around the Cosmos provider. This has resulted in the following enhancements being pulled into EF Core 6.0:
+Update: We have been doing extensive customer development around the Azure Cosmos DB provider. This has resulted in the following enhancements being pulled into EF Core 6.0:
 
 - [Azure Cosmos DB provider should default to implicit ownership](https://github.com/dotnet/efcore/issues/24803)
 - [Set partition key on join entity type by convention](https://github.com/dotnet/efcore/issues/23491)
@@ -206,7 +206,7 @@ Update: We have been doing extensive customer development around the Cosmos prov
 
 Update: The following issues were cut from the 6.0 release:
 
-- [Find/FindAsync performs SQL API query when entity has embedded entities](https://github.com/dotnet/efcore/issues/24202)
+- [Find/FindAsync performs Azure Cosmos DB for NoSQL query when entity has embedded entities](https://github.com/dotnet/efcore/issues/24202)
 - [Optimize more queries that could use ReadItem](https://github.com/dotnet/efcore/issues/20693)
 - [Detect partition key filters in more queries](https://github.com/dotnet/efcore/issues/20350)
 - [Translate subquery in filter condition](https://github.com/dotnet/efcore/issues/17957)
diff --git a/entity-framework/core/what-is-new/ef-core-6.0/whatsnew.md b/entity-framework/core/what-is-new/ef-core-6.0/whatsnew.md
index f86a7401b5..115ff55df1 100644
--- a/entity-framework/core/what-is-new/ef-core-6.0/whatsnew.md
+++ b/entity-framework/core/what-is-new/ef-core-6.0/whatsnew.md
@@ -707,7 +707,7 @@ After these improvements, the gap between the popular "micro-ORM" [Dapper](https
 > [!NOTE]
 > See [Announcing Entity Framework Core 6.0 Preview 4: Performance Edition](https://devblogs.microsoft.com/dotnet/announcing-entity-framework-core-6-0-preview-4-performance-edition/) on the .NET Blog for a detailed discussion of query performance improvements in EF Core 6.0.
 
-## Cosmos provider enhancements
+## Azure Cosmos DB provider enhancements
 
 EF Core 6.0 contains many improvements to the Azure Cosmos DB database provider.
 
@@ -718,7 +718,7 @@ EF Core 6.0 contains many improvements to the Azure Cosmos DB database provider.
 
 GitHub Issue: [#24803](https://github.com/dotnet/efcore/issues/24803).
 
-When building a model for the Cosmos provider, EF Core 6.0 will mark child entity types as owned by their parent entity by default. This removes the need for much of the `OwnsMany` and `OwnsOne` calls in the Cosmos model. This makes it easier to embed child types into the document for the parent type, which is usually the appropriate way to model parents and children in a document database.
+When building a model for the Azure Cosmos DB provider, EF Core 6.0 will mark child entity types as owned by their parent entity by default. This removes the need for much of the `OwnsMany` and `OwnsOne` calls in the Azure Cosmos DB model. This makes it easier to embed child types into the document for the parent type, which is usually the appropriate way to model parents and children in a document database.
 
 For example, consider these entity types:
 
@@ -756,7 +756,7 @@ public class Child
 -->
 [!code-csharp[Model](../../../../samples/core/Miscellaneous/NewInEFCore6.Cosmos/CosmosImplicitOwnershipSample.cs?name=Model)]
 
-In EF Core 5.0, these types would have been modeled for Cosmos with the following configuration:
+In EF Core 5.0, these types would have been modeled for Azure Cosmos DB with the following configuration:
 
 <!--
 modelBuilder.Entity<Family>()
@@ -779,7 +779,7 @@ modelBuilder.Entity<Family>().HasPartitionKey(e => e.LastName);
 -->
 [!code-csharp[OnModelCreating](../../../../samples/core/Miscellaneous/NewInEFCore6.Cosmos/CosmosImplicitOwnershipSample.cs?name=OnModelCreating)]
 
-The resulting Cosmos documents have the family's parents, children, pets, and address embedded in the family document. For example:
+The resulting Azure Cosmos DB documents have the family's parents, children, pets, and address embedded in the family document. For example:
 
 ```json
 {
@@ -841,7 +841,7 @@ The resulting Cosmos documents have the family's parents, children, pets, and ad
 
 GitHub Issue: [#14762](https://github.com/dotnet/efcore/issues/14762).
 
-EF Core 6.0 natively maps collections of primitive types when using the Cosmos database provider. For example, consider this entity type:
+EF Core 6.0 natively maps collections of primitive types when using the Azure Cosmos DB database provider. For example, consider this entity type:
 
 <!--
 public class Book
@@ -928,7 +928,7 @@ Limitations:
 
 GitHub Issue: [#16143](https://github.com/dotnet/efcore/issues/16143).
 
-The Cosmos provider now translates more Base Class Library (BCL) methods to Cosmos built-in-functions. The following tables show translations that are new in EF Core 6.0.
+The Azure Cosmos DB provider now translates more Base Class Library (BCL) methods to Azure Cosmos DB built-in-functions. The following tables show translations that are new in EF Core 6.0.
 
 **String translations**
 
@@ -1046,7 +1046,7 @@ WHERE ((c["Discriminator"] = "Triangle") AND (c["InsertedOn"] <= GetCurrentDateT
 
 GitHub Issue: [#17311](https://github.com/dotnet/efcore/issues/17311).
 
-Sometimes it is necessary to execute a raw SQL query instead of using LINQ. This is now supported with the Cosmos provider through use of the `FromSql` method. This works the same way it always has done with relational providers. For example:
+Sometimes it is necessary to execute a raw SQL query instead of using LINQ. This is now supported with the Azure Cosmos DB provider through use of the `FromSql` method. This works the same way it always has done with relational providers. For example:
 
 <!--
 var maxAngle = 60;
@@ -1095,12 +1095,12 @@ ORDER BY c["Angle1"]
 
 GitHub Issue: [#17298](https://github.com/dotnet/efcore/issues/17298).
 
-The Cosmos provider now logs more diagnostic information, including events for inserting, querying, updating, and deleting data from the database. The request units (RU) are included in these events whenever appropriate.
+The Azure Cosmos DB provider now logs more diagnostic information, including events for inserting, querying, updating, and deleting data from the database. The request units (RU) are included in these events whenever appropriate.
 
 > [!NOTE]
 > The logs show here use `EnableSensitiveDataLogging()` so that ID values are shown.
 
-Inserting an item into the Cosmos database generates the `CosmosEventId.ExecutedCreateItem` event. For example, this code:
+Inserting an item into the Azure Cosmos DB database generates the `CosmosEventId.ExecutedCreateItem` event. For example, this code:
 
 <!--
 var triangle = new Triangle
@@ -1123,7 +1123,7 @@ info: 8/30/2021 14:41:13.356 CosmosEventId.ExecutedCreateItem[30104] (Microsoft.
       Executed CreateItem (5 ms, 7.43 RU) ActivityId='417db46f-fcdd-49d9-a7f0-77210cd06f84', Container='Shapes', Id='Impossible', Partition='TrianglesPartition'
 ```
 
-Retrieving items from the Cosmos database using a query generates the `CosmosEventId.ExecutingSqlQuery` event, and then one or more `CosmosEventId.ExecutedReadNext` events for the items read. For example, this code:
+Retrieving items from the Azure Cosmos DB database using a query generates the `CosmosEventId.ExecutingSqlQuery` event, and then one or more `CosmosEventId.ExecutedReadNext` events for the items read. For example, this code:
 
 <!--
 var equilateral = context.Triangles.Single(e => e.Name == "Equilateral");
@@ -1147,7 +1147,7 @@ info: 8/30/2021 14:41:13.651 CosmosEventId.ExecutedReadNext[30102] (Microsoft.En
       OFFSET 0 LIMIT 2
 ```
 
-Retrieving a single item from the Cosmos database using `Find` with a partition key generates the `CosmosEventId.ExecutingReadItem` and `CosmosEventId.ExecutedReadItem` events. For example, this code:
+Retrieving a single item from the Azure Cosmos DB database using `Find` with a partition key generates the `CosmosEventId.ExecutingReadItem` and `CosmosEventId.ExecutedReadItem` events. For example, this code:
 
 <!--
 var isosceles = context.Triangles.Find("Isosceles", "TrianglesPartition");
@@ -1163,7 +1163,7 @@ info: 8/30/2021 14:53:39.330 CosmosEventId.ExecutedReadItem[30103] (Microsoft.En
       Executed ReadItem (1 ms, 1 RU) ActivityId='3c278643-4e7f-4bb2-9953-6055b5f1288f', Container='Shapes', Id='Isosceles', Partition='TrianglesPartition'
 ```
 
-Saving an updated item to the Cosmos database generates the `CosmosEventId.ExecutedReplaceItem` event. For example, this code:
+Saving an updated item to the Azure Cosmos DB database generates the `CosmosEventId.ExecutedReplaceItem` event. For example, this code:
 
 <!--
 triangle.Angle2 = 89;
@@ -1178,7 +1178,7 @@ info: 8/30/2021 14:53:39.343 CosmosEventId.ExecutedReplaceItem[30105] (Microsoft
       Executed ReplaceItem (6 ms, 10.67 RU) ActivityId='1525b958-fea1-49e8-89f9-d429d0351fdb', Container='Shapes', Id='Impossible', Partition='TrianglesPartition'
 ```
 
-Deleting an item from the Cosmos database generates the `CosmosEventId.ExecutedDeleteItem` event. For example, this code:
+Deleting an item from the Azure Cosmos DB database generates the `CosmosEventId.ExecutedDeleteItem` event. For example, this code:
 
 <!--
 context.Remove(triangle);
@@ -1197,7 +1197,7 @@ info: 8/30/2021 14:53:39.359 CosmosEventId.ExecutedDeleteItem[30106] (Microsoft.
 
 GitHub Issue: [#17301](https://github.com/dotnet/efcore/issues/17301).
 
-The Cosmos model can now be configured with manual or auto-scale throughput. These values provision throughput on the database. For example:
+The Azure Cosmos DB model can now be configured with manual or auto-scale throughput. These values provision throughput on the database. For example:
 
 <!--
 modelBuilder.HasManualThroughput(2000);
@@ -1221,7 +1221,7 @@ modelBuilder.Entity<Family>(
 
 GitHub Issue: [#17307](https://github.com/dotnet/efcore/issues/17307).
 
-Entity types in the Cosmos model can now be configured with the default time-to-live and time-to-live for the analytical store. For example:
+Entity types in the Azure Cosmos DB model can now be configured with the default time-to-live and time-to-live for the analytical store. For example:
 
 <!--
 modelBuilder.Entity<Family>(
@@ -1237,7 +1237,7 @@ modelBuilder.Entity<Family>(
 
 GitHub Issue: [#21274](https://github.com/dotnet/efcore/issues/21274). This feature was contributed by [@dnperfors](https://github.com/dnperfors). Many thanks!
 
-The `HttpClientFactory` used by the Cosmos provider can now be set explicitly. This can be especially useful during testing, for example to bypass certificate validation when using the Cosmos emulator on Linux:
+The `HttpClientFactory` used by the Azure Cosmos DB provider can now be set explicitly. This can be especially useful during testing, for example to bypass certificate validation when using the Azure Cosmos DB emulator on Linux:
 
 <!--
 optionsBuilder
@@ -1260,7 +1260,7 @@ optionsBuilder
 [!code-csharp[HttpClientFactory](../../../../samples/core/Miscellaneous/NewInEFCore6.Cosmos/CosmosPrimitiveTypesSample.cs?name=HttpClientFactory)]
 
 > [!NOTE]
-> See [Taking the EF Core Azure Cosmos DB Provider for a Test Drive](https://devblogs.microsoft.com/dotnet/taking-the-ef-core-azure-cosmos-db-provider-for-a-test-drive/) on the .NET Blog for a detailed example of applying the Cosmos provider improvements to an existing application.
+> See [Taking the EF Core Azure Cosmos DB Provider for a Test Drive](https://devblogs.microsoft.com/dotnet/taking-the-ef-core-azure-cosmos-db-provider-for-a-test-drive/) on the .NET Blog for a detailed example of applying the Azure Cosmos DB provider improvements to an existing application.
 
 ## Improvements to scaffolding from an existing database
 
@@ -2031,7 +2031,7 @@ Note that translation of <xref:System.Object.ToString> for SQL Server is already
 
 GitHub Issue: [#16141](https://github.com/dotnet/efcore/issues/16141). This feature was contributed by [@RaymondHuy](https://github.com/RaymondHuy). Many thanks!
 
-`EF.Functions.Random` maps to a database function returning a pseudo-random number between 0 and 1 exclusive. Translations have been implemented in the EF Core repo for SQL Server, SQLite, and Cosmos. For example, consider a `User` entity type with a `Popularity` property:
+`EF.Functions.Random` maps to a database function returning a pseudo-random number between 0 and 1 exclusive. Translations have been implemented in the EF Core repo for SQL Server, SQLite, and Azure Cosmos DB. For example, consider a `User` entity type with a `Popularity` property:
 
 <!--
     public class User
@@ -2123,7 +2123,7 @@ public class CustomerDensity
 -->
 [!code-csharp[ViewType](../../../../samples/core/Miscellaneous/NewInEFCore6/ToInMemoryQuerySample.cs?name=ViewType)]
 
-And define an DbSet property for it on the DbContext, along with sets for other top-level entity types:
+And define a DbSet property for it on the DbContext, along with sets for other top-level entity types:
 
 <!--
         public DbSet<Customer> Customers { get; set; }
diff --git a/entity-framework/core/what-is-new/ef-core-7.0/breaking-changes.md b/entity-framework/core/what-is-new/ef-core-7.0/breaking-changes.md
index 1fcaf0fb90..e8145f0ba1 100644
--- a/entity-framework/core/what-is-new/ef-core-7.0/breaking-changes.md
+++ b/entity-framework/core/what-is-new/ef-core-7.0/breaking-changes.md
@@ -62,7 +62,7 @@ This change was made to ensure that, by default, either the connection is secure
 
 There are three ways to proceed:
 
-1. [Install a valid certificate on the server](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine). Note that this is an involved process and requires a obtaining a certificate and ensuring it is signed by an authority trusted by the client.
+1. [Install a valid certificate on the server](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine). Note that this is an involved process and requires obtaining a certificate and ensuring it is signed by an authority trusted by the client.
 2. If the server has a certificate, but it is not trusted by the client, then `TrustServerCertificate=True` to allow bypassing the normal trust mechanims.
 3. Explicitly add `Encrypt=False` to the connection string.
 
@@ -398,7 +398,7 @@ Query or attach entities before marking entities as `Deleted`, or manually set n
 
 #### Old behavior
 
-In EF Core 6.0, using the Cosmos <xref:Microsoft.EntityFrameworkCore.CosmosQueryableExtensions.FromSqlRaw%2A> extension method when using a relational provider, or the relational <xref:Microsoft.EntityFrameworkCore.RelationalQueryableExtensions.FromSqlRaw%2A> extension method when using the Cosmos provider could silently fail.
+In EF Core 6.0, using the Azure Cosmos DB <xref:Microsoft.EntityFrameworkCore.CosmosQueryableExtensions.FromSqlRaw%2A> extension method when using a relational provider, or the relational <xref:Microsoft.EntityFrameworkCore.RelationalQueryableExtensions.FromSqlRaw%2A> extension method when using the Azure Cosmos DB provider could silently fail.
 
 #### New behavior
 
diff --git a/entity-framework/core/what-is-new/ef-core-7.0/plan.md b/entity-framework/core/what-is-new/ef-core-7.0/plan.md
index 1c38b123a4..8348194f5b 100644
--- a/entity-framework/core/what-is-new/ef-core-7.0/plan.md
+++ b/entity-framework/core/what-is-new/ef-core-7.0/plan.md
@@ -181,23 +181,23 @@ Tracked by [issues labeled with 'area-cosmos' and in the 7.0 milestone](https://
 
 Value proposition: Continue to make EF Core the easiest and most productive way to work with [Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/#overview).
 
-We made [significant improvements to the EF Core Cosmos database provider for the 6.0 release](/ef/core/what-is-new/ef-core-6.0/whatsnew#cosmos-provider-enhancements). These improvements created a first-class experience for working with Azure Cosmos DB from EF Core, which is reflected by significant growth in adoption. We plan to continue this momentum in EF7 with the following further Cosmos provider enhancements:
+We made [significant improvements to the EF Core Azure Cosmos DB database provider for the 6.0 release](/ef/core/what-is-new/ef-core-6.0/whatsnew#cosmos-provider-enhancements). These improvements created a first-class experience for working with Azure Cosmos DB from EF Core, which is reflected by significant growth in adoption. We plan to continue this momentum in EF7 with the following further Azure Cosmos DB provider enhancements:
 
 - [Issue #16146: Support aggregate operators](https://github.com/dotnet/efcore/issues/16146)
 - [Issue #17306: Allow to use a custom JSON serializer](https://github.com/dotnet/efcore/issues/17306)
 - [Issue #17670: Translate non-persisted property in query when possible](https://github.com/dotnet/efcore/issues/17670)
 - [Issue #19944: Support trigger execution](https://github.com/dotnet/efcore/issues/19944)
 - [Issue #20350: Detect partition key filters in more queries](https://github.com/dotnet/efcore/issues/20350)
-- [Issue #20910: Add translation for string.Compare for Cosmos](https://github.com/dotnet/efcore/issues/20910)
+- [Issue #20910: Add translation for string.Compare for Azure Cosmos DB](https://github.com/dotnet/efcore/issues/20910)
 - [Issue #23538: Improve query tree during translation](https://github.com/dotnet/efcore/issues/23538)
 - [Issue #24571: Allow terminating operators after Skip and Take](https://github.com/dotnet/efcore/issues/24571)
 - [Issue #24513: Add support for pagination (MaxItemCount)](https://github.com/dotnet/efcore/issues/24513)
 - [Issue #25700: translate Length/Count on collections](https://github.com/dotnet/efcore/issues/25700)
 - [Issue #25701: translate indexing into collection](https://github.com/dotnet/efcore/issues/25701)
-- [Issue #26478: Implement interceptors for Cosmos](https://github.com/dotnet/efcore/issues/26478)
+- [Issue #26478: Implement interceptors for Azure Cosmos DB](https://github.com/dotnet/efcore/issues/26478)
 - [Issue #26491: Support AAD RBAC via the ClientSecretCredential](https://github.com/dotnet/efcore/issues/26491)
 
-Please make sure to vote (👍) for the [Cosmos provider features](https://github.com/dotnet/efcore/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-cosmos) that you need so that we can assess where to invest for the most benefit.
+Please make sure to vote (👍) for the [Azure Cosmos DB provider features](https://github.com/dotnet/efcore/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-cosmos) that you need so that we can assess where to invest for the most benefit.
 
 ### Migrations experience
 
diff --git a/entity-framework/dotnet-data/index.yml b/entity-framework/dotnet-data/index.yml
index 699243cb5c..4276274e61 100644
--- a/entity-framework/dotnet-data/index.yml
+++ b/entity-framework/dotnet-data/index.yml
@@ -86,7 +86,7 @@ additionalContent:
             - url: /azure/cosmos-db/sql/create-notebook-visualize-data
               text: "Create a notebook in Azure Cosmos DB to analyze and visualize the data"
             - url: /azure/cosmos-db/mongodb/mongodb-introduction
-              text: "Azure Cosmos DB API for MongoDB"
+              text: "Azure Cosmos DB for MongoDB"
             - url: /ef/core/providers/cosmos/
               text: "EF Core Azure Cosmos DB provider"
 
@@ -94,9 +94,9 @@ additionalContent:
         - title: Graph database (Azure Cosmos DB Graph API)
           links:
             - url: /azure/cosmos-db/graph/graph-introduction
-              text: "Introduction to Gremlin API in Azure Cosmos Db"
+              text: "Introduction to Azure Cosmos DB for Apache Gremlin"
             - url: /azure/cosmos-db/graph/create-graph-dotnet
-              text: "Build a .NET Framework or Core application using the Azure Cosmos DB Gremlin API account"
+              text: "Build a .NET Framework or Core application using the Azure Cosmos DB for Apache Gremlin account"
             - url: /sql/relational-databases/graphs/sql-graph-architecture
               text: "SQL Graph Architecture"
 
diff --git a/entity-framework/index.yml b/entity-framework/index.yml
index 6a8dd54c53..7c54e5040e 100644
--- a/entity-framework/index.yml
+++ b/entity-framework/index.yml
@@ -80,7 +80,7 @@ additionalContent:
           - url: https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql
             text: "MySQL and MariaDB"
           - url: core/providers/cosmos/index.md
-            text: "Cosmos DB SQL API"
+            text: "Azure Cosmos DB for NoSQL"
           - url: core/providers/in-memory/index.md
             text: "In memory (testing)"
           - url: core/providers/index.md
diff --git a/entity-framework/toc.yml b/entity-framework/toc.yml
index 60e56c52d1..fdb691e4a0 100644
--- a/entity-framework/toc.yml
+++ b/entity-framework/toc.yml
@@ -387,13 +387,13 @@
           href: core/providers/sqlite/spatial.md
         - name: Microsoft.Data.Sqlite >>
           href: /dotnet/standard/data/sqlite/
-      - name: Cosmos
+      - name: Azure Cosmos DB
         items:
         - name: Overview
           href: core/providers/cosmos/index.md
         - name: Work with unstructured data
           href: core/providers/cosmos/unstructured-data.md
-        - name: Cosmos limitations
+        - name: Azure Cosmos DB limitations
           href: core/providers/cosmos/limitations.md
         - name: Function mappings
           href: core/providers/cosmos/functions.md

From 8701ac647a93703b0997423396756697936cfdf1 Mon Sep 17 00:00:00 2001
From: Alex Buck <abuck@microsoft.com>
Date: Thu, 20 Oct 2022 09:03:24 -0400
Subject: [PATCH 2/3] Fixes

---
 entity-framework/core/providers/cosmos/index.md       | 6 +++---
 entity-framework/core/what-is-new/ef-core-6.0/plan.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/entity-framework/core/providers/cosmos/index.md b/entity-framework/core/providers/cosmos/index.md
index e9b4c0f826..e3d88185dd 100644
--- a/entity-framework/core/providers/cosmos/index.md
+++ b/entity-framework/core/providers/cosmos/index.md
@@ -1,6 +1,6 @@
 ---
 title: Azure Cosmos DB Provider - EF Core
-description: Documentation for the database provider that allows Entity Framework Core to be used with the Azure Cosmos DB for NoSQL
+description: Documentation for the database provider that allows Entity Framework Core to be used with Azure Cosmos DB.
 author: AndriySvyryd
 ms.date: 01/11/2022
 uid: core/providers/cosmos/index
@@ -12,7 +12,7 @@ This database provider allows Entity Framework Core to be used with Azure Cosmos
 It is strongly recommended to familiarize yourself with the [Azure Cosmos DB documentation](/azure/cosmos-db/introduction) before reading this section.
 
 > [!NOTE]
-> This provider only works with the Azure Cosmos DB for NoSQL of Azure Cosmos DB.
+> This provider only works with Azure Cosmos DB for NoSQL.
 
 ## Install
 
@@ -84,7 +84,7 @@ If no other entity type will ever be stored in the same container the discrimina
 
 ### Partition keys
 
-By default EF Core will create containers with the partition key set to `"__partitionKey"` without supplying any value for it when inserting items. But to fully leverage the performance capabilities of Azure Cosmos DB a [carefully selected partition key](/azure/cosmos-db/partition-data) should be used. It can be configured by calling [HasPartitionKey](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.HasPartitionKey):
+By default, EF Core will create containers with the partition key set to `"__partitionKey"` without supplying any value for it when inserting items. But to fully leverage the performance capabilities of Azure Cosmos DB, a [carefully selected partition key](/azure/cosmos-db/partition-data) should be used. It can be configured by calling [HasPartitionKey](/dotnet/api/Microsoft.EntityFrameworkCore.CosmosEntityTypeBuilderExtensions.HasPartitionKey):
 
 [!code-csharp[PartitionKey](../../../../samples/core/Cosmos/ModelBuilding/OrderContext.cs?name=PartitionKey)]
 
diff --git a/entity-framework/core/what-is-new/ef-core-6.0/plan.md b/entity-framework/core/what-is-new/ef-core-6.0/plan.md
index 7f35b2372e..2cf1e41a3c 100644
--- a/entity-framework/core/what-is-new/ef-core-6.0/plan.md
+++ b/entity-framework/core/what-is-new/ef-core-6.0/plan.md
@@ -206,7 +206,7 @@ Update: We have been doing extensive customer development around the Azure Cosmo
 
 Update: The following issues were cut from the 6.0 release:
 
-- [Find/FindAsync performs Azure Cosmos DB for NoSQL query when entity has embedded entities](https://github.com/dotnet/efcore/issues/24202)
+- [Find/FindAsync performs SQL API query when entity has embedded entities](https://github.com/dotnet/efcore/issues/24202)
 - [Optimize more queries that could use ReadItem](https://github.com/dotnet/efcore/issues/20693)
 - [Detect partition key filters in more queries](https://github.com/dotnet/efcore/issues/20350)
 - [Translate subquery in filter condition](https://github.com/dotnet/efcore/issues/17957)

From c90f9dcd3a0503bcaafdfe101d981052c551d4ad Mon Sep 17 00:00:00 2001
From: Arthur Vickers <ajcvickers@hotmail.com>
Date: Tue, 24 Jan 2023 12:14:33 +0000
Subject: [PATCH 3/3] Format

---
 .../core/what-is-new/ef-core-5.0/breaking-changes.md      | 8 ++++----
 .../core/what-is-new/ef-core-6.0/breaking-changes.md      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md b/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
index 8f54ad45bb..9aa11173bf 100644
--- a/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
+++ b/entity-framework/core/what-is-new/ef-core-5.0/breaking-changes.md
@@ -23,10 +23,10 @@ The following API and behavior changes have the potential to break existing appl
 | [ToView() is treated differently by migrations](#toview)                                                                              | Medium     |
 | [ToTable(null) marks the entity type as not mapped to a table](#totable)                                                              | Medium     |
 | [Removed HasGeometricDimension method from SQLite NTS extension](#geometric-sqlite)                                                   | Low        |
-| [Azure Cosmos DB: Partition key is now added to the primary key](#cosmos-partition-key)                                                        | Low        |
-| [Azure Cosmos DB: `id` property renamed to `__id`](#cosmos-id)                                                                                 | Low        |
-| [Azure Cosmos DB: byte[] is now stored as a base64 string instead of a number array](#cosmos-byte)                                             | Low        |
-| [Azure Cosmos DB: GetPropertyName and SetPropertyName were renamed](#cosmos-metadata)                                                          | Low        |
+| [Azure Cosmos DB: Partition key is now added to the primary key](#cosmos-partition-key)                                               | Low        |
+| [Azure Cosmos DB: `id` property renamed to `__id`](#cosmos-id)                                                                        | Low        |
+| [Azure Cosmos DB: byte[] is now stored as a base64 string instead of a number array](#cosmos-byte)                                    | Low        |
+| [Azure Cosmos DB: GetPropertyName and SetPropertyName were renamed](#cosmos-metadata)                                                 | Low        |
 | [Value generators are called when the entity state is changed from Detached to Unchanged, Updated, or Deleted](#non-added-generation) | Low        |
 | [IMigrationsModelDiffer now uses IRelationalModel](#relational-model)                                                                 | Low        |
 | [Discriminators are read-only](#read-only-discriminators)                                                                             | Low        |
diff --git a/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md b/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
index ab9fad886d..104c6ffc2d 100644
--- a/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
+++ b/entity-framework/core/what-is-new/ef-core-6.0/breaking-changes.md
@@ -20,7 +20,7 @@ EF Core 6.0 targets .NET 6. Applications targeting older .NET, .NET Core, and .N
 |:------------------------------------------------------------------------------------------------------------------------------------|------------|
 | [Nested optional dependents sharing a table and with no required properties cannot be saved](#nested-optionals)                     | High       |
 | [Changing the owner of an owned entity now throws an exception](#owned-reparenting)                                                 | Medium     |
-| [Azure Cosmos DB: Related entity types are discovered as owned](#cosmos-owned)                                                               | Medium     |
+| [Azure Cosmos DB: Related entity types are discovered as owned](#cosmos-owned)                                                      | Medium     |
 | [SQLite: Connections are pooled](#connection-pool)                                                                                  | Medium     |
 | [Many-to-many relationships without mapped join entities are now scaffolded](#many-to-many)                                         | Medium     |
 | [Cleaned up mapping between DeleteBehavior and ON DELETE values](#on-delete)                                                        | Low        |
@@ -32,7 +32,7 @@ EF Core 6.0 targets .NET 6. Applications targeting older .NET, .NET Core, and .N
 | [Added IReadOnly Metadata interfaces and removed extension methods](#ireadonly-metadata)                                            | Low        |
 | [IExecutionStrategy is now a singleton service](#iexecutionstrategy)                                                                | Low        |
 | [SQL Server: More errors are considered transient](#transient-errors)                                                               | Low        |
-| [Azure Cosmos DB: More characters are escaped in 'id' values](#cosmos-id)                                                                    | Low        |
+| [Azure Cosmos DB: More characters are escaped in 'id' values](#cosmos-id)                                                           | Low        |
 | [Some Singleton services are now Scoped](#query-services)                                                                           | Low*       |
 | [New caching API for extensions that add or replace services](#extensions-caching)                                                  | Low*       |
 | [New snapshot and design-time model initialization procedure](#snapshot-initialization)                                             | Low        |