Remainder of merge work for key modeling

Leftovers from 02400d9

.openpublishing.redirection.json

@@ -284,6 +284,11 @@
             "source_path": "entity-framework/core/modeling/relational/fk-constraints.md",
             "redirect_url": "/ef/core/modeling/relationships#foreign-key-constraint-name",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "entity-framework/core/modeling/relational/unique-constraints.md",
+            "redirect_url": "/ef/core/modeling/keys",
+            "redirect_document_id": false
         }
     ]
 }

entity-framework/core/modeling/keys.md

@@ -35,7 +35,7 @@ You can also configure multiple properties to be the key of an entity - this is
 
 ## Primary key name
 
-By convention, on relational databases primary keys are created with the name `PK_<type name>`. You can use the Fluent API to configure the name of the primary key constraint as follows:
+By convention, on relational databases primary keys are created with the name `PK_<type name>`. You can configure the name of the primary key constraint as follows:
 
 [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/KeyName.cs?name=KeyName&highlight=5)]
 
@@ -59,10 +59,14 @@ Alternate keys are typically introduced for you when needed and you do not need
 
 [!code-csharp[Main](../../../samples/core/Modeling/Conventions/AlternateKey.cs?name=AlternateKey&highlight=12)]
 
-You can also use the Fluent API to configure a single property to be an alternate key:
+You can also configure a single property to be an alternate key:
 
 [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/AlternateKeySingle.cs?name=AlternateKeySingle&highlight=4)]
 
-You can also use the Fluent API to configure multiple properties to be an alternate key (known as a composite alternate key):
+You can also configure multiple properties to be an alternate key (known as a composite alternate key):
 
 [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/AlternateKeyComposite.cs?name=AlternateKeyComposite&highlight=4)]
+
+Finally, by convention, the index and constraint that are introduced for an alternate key will be named `AK_<type name>_<property name>` (for composite alternate keys `<property name>` becomes an underscore separated list of property names). You can configure the name of the alternate key's index and unique constraint:
+
+[!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/AlternateKeyName.cs?name=AlternateKeyName&highlight=5)]

entity-framework/toc.yml

@@ -126,8 +126,6 @@
           href: core/modeling/relational/sequences.md
         - name: Default Values
           href: core/modeling/relational/default-values.md
-        - name: Alternate Keys (Unique Constraints)
-          href: core/modeling/relational/unique-constraints.md
         - name: Inheritance (Relational Database)
           href: core/modeling/relational/inheritance.md
     - name: Managing Database Schemas

samples/core/Modeling/FluentAPI/Relational/AlternateKeyName.cs → samples/core/Modeling/FluentAPI/AlternateKeyName.cs

@@ -2,17 +2,18 @@
 
 namespace EFModeling.FluentAPI.Relational.AlternateKeyName
 {
-    #region Model
     class MyContext : DbContext
     {
         public DbSet<Car> Cars { get; set; }
 
+        #region AlternateKeyName
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<Car>()
                 .HasAlternateKey(c => c.LicensePlate)
                 .HasName("AlternateKey_LicensePlate");
         }
+        #endregion
     }
 
     class Car
@@ -22,5 +23,4 @@ class Car
         public string Make { get; set; }
         public string Model { get; set; }
     }
-    #endregion
 }