Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
Anderman authored and Nate McMaster committed Aug 18, 2016
1 parent 7f2af2e commit b7146ec
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/efcore-vs-ef6/features.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Feature Comparison
==================

The following information will help you chose between Entity Framework Core and Entity Framework 6.x.
The following information will help you choose between Entity Framework Core and Entity Framework 6.x.

.. contents:: `In this article:`
:depth: 2
Expand Down
4 changes: 2 additions & 2 deletions docs/miscellaneous/internals/services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ the construction step add specialized services for their database system.
Providing a custom internal service provider
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

``DbContextOptionsBuilder`` provides a API for giving a custom service provider
``DbContextOptionsBuilder`` provides an API for giving a custom service provider
to DbContext for EF to use internally. This API is ``DbContextOptions.UseInternalServiceProvider(IServiceProvider provider)``.

If an custom service provider is provided, DbContext will not use ``DbContextOptions`` to create its own
If a custom service provider is provided, DbContext will not use ``DbContextOptions`` to create its own
internal service provider. The custom service provider must already have provider-specific services added.

Database provider writers should provided methods such as AddEntityFrameworkSqlServer" or "AddEntityFrameworkSqlite" to simplify the process of creating a custom service container.
Expand Down
2 changes: 1 addition & 1 deletion docs/miscellaneous/internals/writing-a-provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ This configures **options** which it typically takes as arguments to method.

The ``UseX()`` extension method creates a provider-specific implementation of
``IDbContextOptionsExtension`` which is added to the collection of extensions
stored within ``DbContextOptions``. This is done by a call to the a hidden API
stored within ``DbContextOptions``. This is done by a call to the API
``IDbContextOptionsBuilderInfrastructure.AddOrUpdateExtension``.

.. includesamplefile:: Miscellaneous/Internals/WritingAProvider/EntityFrameworkCore.ProviderStarter/Extensions/MyProviderDbContextOptionsExtensions.cs
Expand Down
2 changes: 1 addition & 1 deletion docs/miscellaneous/logging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Create a logger
---------------

The first step is to create an implementation of ``ILoggerProvider`` and ``ILogger``.
* ``ILoggerProvider`` is the component that decides when to create instances of your logger(s). The provider may chose to create different loggers in different situations.
* ``ILoggerProvider`` is the component that decides when to create instances of your logger(s). The provider may choose to create different loggers in different situations.
* ``ILogger`` is the component that does the actual logging. It will be passed information from the framework when certain events occur.

Here is a simple implementation that logs a human readable representation of every event to a text file and the Console.
Expand Down
2 changes: 1 addition & 1 deletion docs/miscellaneous/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ The simplest way to enable testing with the InMemory provider is to modify your
:emphasize-lines: 6-8

.. note::
``DbContextOptions<TContext>`` tells the context all of it's settings, such as which database to connect to. This is the same object that is built by running the OnConfiguring method in your context.
``DbContextOptions<TContext>`` tells the context all of its settings, such as which database to connect to. This is the same object that is built by running the OnConfiguring method in your context.

Writing tests
-------------
Expand Down
2 changes: 1 addition & 1 deletion docs/modeling/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Creating a Model

Entity Framework uses a set of conventions to build a model based on the shape of your entity classes. You can specify additional configuration to supplement and/or override what was discovered by convention.

This article covers configuration that can be applied to a model targeting any data store and that which can be applied when targeting any relational database. Providers may also enable configuration that is specific to a particular data store. For documentation on provider specific configuration see the the :doc:`/providers/index` section.
This article covers configuration that can be applied to a model targeting any data store and that which can be applied when targeting any relational database. Providers may also enable configuration that is specific to a particular data store. For documentation on provider specific configuration see the :doc:`/providers/index` section.

In this section you can find information about conventions and configuration for the following:

Expand Down
2 changes: 1 addition & 1 deletion docs/modeling/max-length.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Configuring a maximum length provides a hint to the data store about the appropr
Conventions
-----------

By convention, it is left up to the database provider to chose an appropriate data type for properties. For properties that have a length, the database provider will generally chose a data type that allows for the longest length of data. For example, Microsoft SQL Server will use ``nvarchar(max)`` for ``string`` properties (or ``nvarchar(450)`` if the column is used as a key).
By convention, it is left up to the database provider to choose an appropriate data type for properties. For properties that have a length, the database provider will generally choose a data type that allows for the longest length of data. For example, Microsoft SQL Server will use ``nvarchar(max)`` for ``string`` properties (or ``nvarchar(450)`` if the column is used as a key).

Data Annotations
----------------
Expand Down
2 changes: 1 addition & 1 deletion docs/modeling/relational/default-schema.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The default schema is the database schema that objects will be created in if a s
Conventions
-----------

By convention, the database provider will chose the most appropriate 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).
By convention, the database provider will choose the most appropriate 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).

Data Annotations
----------------
Expand Down
2 changes: 1 addition & 1 deletion docs/modeling/relationships.rst
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ One to one relationships have a reference navigation property on both sides. The
:linenos:

.. note::
EF will chose one of the entities to be the dependent based on its ability to detect a foreign key property. If the wrong entity is chosen as the dependent you can use the Fluent API to correct this.
EF will choose one of the entities to be the dependent based on its ability to detect a foreign key property. If the wrong entity is chosen as the dependent you can use the Fluent API to correct this.

When configuring the relationship with the Fluent API, you use the ``HasOne`` and ``WithOne`` methods.

Expand Down
4 changes: 2 additions & 2 deletions docs/platforms/aspnetcore/existing-db.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ Remove inline context configuration
In ASP.NET Core, configuration is generally performed in **Startup.cs**. To conform to this pattern, we will move configuration of the database provider to **Startup.cs**.

* Open **Models\\BloggingContext.cs**
* Delete the lines of code highligted below
* Delete the lines of code highlighted below

.. includesamplefile:: Platforms/AspNetCore/AspNetCore.ExistingDb/Models/BloggingContextUnmodified.txt
:language: c#
:lines: 6-13
:emphasize-lines: 3-7
:linenos:

* Add the lines of code highligted below
* Add the lines of code highlighted below

.. includesamplefile:: Platforms/AspNetCore/AspNetCore.ExistingDb/Models/BloggingContext.cs
:language: c#
Expand Down
2 changes: 1 addition & 1 deletion docs/saving/concurrency.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ There are three sets of values available to help resolve a concurrency conflict.

To handle a concurrency conflict, catch a ``DbUpdateConcurrencyException`` during ``SaveChanges()``, use ``DbUpdateConcurrencyException.Entries`` to prepare a new set of changes for the affected entities, and then retry the ``SaveChanges()`` operation.

In the following example, ``Person.FirstName`` and ``Person.LastName`` are setup as concurrency token. There is a ``// TODO:`` comment in the location where you would include application specific logic to chose the value to be saved to the database.
In the following example, ``Person.FirstName`` and ``Person.LastName`` are setup as concurrency token. There is a ``// TODO:`` comment in the location where you would include application specific logic to choose the value to be saved to the database.

.. includesamplefile:: Saving/Saving/Concurrency/Sample.cs
:language: c#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void Add_writes_to_database()
service.Add("http://sample.com");
}

// User a seperate instance of the context to verify correct data was saved to database
// Use a separate instance of the context to verify correct data was saved to database
using (var context = new BloggingContext(options))
{
Assert.AreEqual(1, context.Blogs.Count());
Expand Down

0 comments on commit b7146ec

Please sign in to comment.