Merge relational and regular table docs

* Merged modeling/relational/tables and modeling/relational/default-schema
  into modeling/included-types and renamed to types-and-tables.
* Show DataAnnotation/FluentAPI as tabs

Part of #1669

entity-framework/core/modeling/types-and-tables.md

@@ -0,0 +1,160 @@
+---
+title: Types and Tables - EF Core
+author: rowanmiller
+ms.date: 10/27/2016
+ms.assetid: cbe6935e-2679-4b77-8914-a8d772240cf1
+uid: core/modeling/types-and-tables
+---
+# Types and Tables
+
+Including a type on your context means that it is included in EF's model; we usually refer to such a type as an *entity*. EF can read and write entity instances from/to the database, and if you're using a relational database, EF can create tables for your entities via migrations.
+
+## Conventions
+
+By convention, types that are exposed in DbSet properties on your context are included in your model as entities. Types that are specified in the `OnModelCreating` method are also included, as are any types that are found by recursively exploring the navigation properties of other discovered types. When using a relational database, each type will be mapped to a table with the same name as the DbSet property that exposes the entity; if no DbSet is included for the given entity, the class name is used.
+
+In the code sample below, all types are included and their corresponding database tables are named as follows:
+
+* `Blog` is included because it's exposed in a DbSet property on the context. Its database table takes its name from the DbSet property, `Blogs`.
+* `Post` is included because it's discovered via the `Blog.Posts` navigation property. As it has no DbSet property, its table will be named `Post`, based on its type.
+* `AuditEntry` because it is mentioned in `OnModelCreating`. Like `Post`, its table is named based on its type, `AuditEntry`.
+
+<!-- [!code-csharp[Main](samples/core/Modeling/Conventions/Samples/IncludedTypes.cs?highlight=3,7,16)] -->
+``` csharp
+class MyContext : DbContext
+{
+    public DbSet<Blog> Blogs { get; set; }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<AuditEntry>();
+    }
+}
+
+public class Blog
+{
+    public int BlogId { get; set; }
+    public string Url { get; set; }
+
+    public List<Post> Posts { get; set; }
+}
+
+public class Post
+{
+    public int PostId { get; set; }
+    public string Title { get; set; }
+    public string Content { get; set; }
+
+    public Blog Blog { get; set; }
+}
+
+public class AuditEntry
+{
+    public int AuditEntryId { get; set; }
+    public string Username { get; set; }
+    public string Action { get; set; }
+}
+```
+
+## Excluding types from the model
+
+If you don't want a type to be included in the model, you can exclude it:
+
+# [Data Annotations](#tab/data-annotations)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/DataAnnotations/Samples/IgnoreType.cs?highlight=20)] -->
+``` csharp
+[NotMapped]
+public class BlogMetadata
+{
+    public DateTime LoadedFromDatabase { get; set; }
+}
+```
+
+# [Fluent API](#tab/fluent-api)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/Samples/IgnoreType.cs?highlight=12)] -->
+``` csharp
+protected override void OnModelCreating(ModelBuilder modelBuilder)
+{
+    modelBuilder.Ignore<BlogMetadata>();
+}
+```
+
+***
+
+## Configuring the table name
+
+When using a relational database, you can override the table name configured by convention:
+
+# [Data Annotations](#tab/data-annotations)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/DataAnnotations/Samples/Relational/Table.cs?highlight=11)] -->
+``` csharp
+using System.ComponentModel.DataAnnotations.Schema;
+
+[Table("blogs")]
+public class Blog
+{
+    public int BlogId { get; set; }
+    public string Url { get; set; }
+}
+```
+
+# [Fluent API](#tab/fluent-api)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/Samples/Relational/Table.cs?highlight=11-12)] -->
+``` csharp
+protected override void OnModelCreating(ModelBuilder modelBuilder)
+{
+    modelBuilder.Entity<Blog>()
+        .ToTable("blogs");
+}
+```
+
+***
+
+## Configuring the table schema
+
+When using a relational database, tables are by default created in your database's default schema. For example, Microsoft SQL Server will use the `dbo` schema and SQLite will not use a schema (since schemas are not supported in SQLite).
+
+You can configure tables to be created in a specific schema as follows:
+
+# [Data Annotations](#tab/data-annotations)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/DataAnnotations/Samples/Relational/TableAndSchema.cs?highlight=11-12)] -->
+``` csharp
+using System.ComponentModel.DataAnnotations.Schema;
+
+[Table("blogs", Schema = "blogging")]
+public class Blog
+{
+    public int BlogId { get; set; }
+    public string Url { get; set; }
+}
+```
+
+# [Fluent API](#tab/fluent-api)
+
+<!-- [!code-csharp[Main](../../../samples/core/Modeling/FluentAPI/Samples/Relational/TableAndSchema.cs?highlight=11-12)] -->
+``` csharp
+protected override void OnModelCreating(ModelBuilder modelBuilder)
+{
+    modelBuilder.Entity<Blog>()
+        .ToTable("blogs", schema: "blogging");
+}
+```
+
+***
+
+To avoid specifying the schema for every table, you can also define the default schema at the model level with the fluent API:
+
+<!-- [!code-csharp[Main](samples/core/relational/Modeling/FluentAPI/Samples/Relational/DefaultSchema.cs?highlight=7)] -->
+``` csharp
+protected override void OnModelCreating(ModelBuilder modelBuilder)
+{
+    modelBuilder.HasDefaultSchema("blogging");
+}
+```
+
+Note that setting the default schema will also affect other database tables, e.g. sequences.

entity-framework/toc.md

@@ -50,7 +50,7 @@
 #### [Configuring a DbContext](core/miscellaneous/configuring-dbcontext.md)
 
 ### [Creating a Model](core/modeling/index.md)
-#### [Including & Excluding Types](core/modeling/included-types.md)
+#### [Types and Tables](core/modeling/types-and-tables.md)
 #### [Including & Excluding Properties](core/modeling/included-properties.md)
 #### [Keys (primary)](core/modeling/keys.md)
 #### [Generated Values](core/modeling/generated-properties.md)
@@ -72,11 +72,9 @@
 #### [Alternating models with same DbContext](core/modeling/dynamic-model.md)
 #### [Spatial Data (GIS)](core/modeling/spatial.md)
 #### [Relational Database Modeling](core/modeling/relational/index.md)
-##### [Table Mapping](core/modeling/relational/tables.md)
 ##### [Column Mapping](core/modeling/relational/columns.md)
 ##### [Data Types](core/modeling/relational/data-types.md)
 ##### [Primary Keys](core/modeling/relational/primary-keys.md)
-##### [Default Schema](core/modeling/relational/default-schema.md)
 ##### [Computed Columns](core/modeling/relational/computed-columns.md)
 ##### [Sequences](core/modeling/relational/sequences.md)
 ##### [Default Values](core/modeling/relational/default-values.md)

samples/core/Modeling/Conventions/Samples/IncludedTypes.cs → samples/core/Modeling/Conventions/Samples/TypesAndTables.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 
-namespace EFModeling.Conventions.Samples.IncludedTypes
+namespace EFModeling.Conventions.Samples.TypesAndTables
 {
     class MyContext : DbContext
     {