Merge pull request #398 from stgelaisalex/master

Marie-Lou changes

Author: JonathanMagnan

docs2/pages/documentations/audit.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-Entity Framework saves entities in a database but doesn't let you easily track changes, by example, a history of all modifications and their author in an audit table.
+Entity Framework saves entities in a database but doesn't let you easily track changes, for example, a history of all modifications and their author in an audit table.
 
 **EF+ Audit** easily tracks changes, exclude/include entity or property and auto save audit entries in the database.
 
@@ -377,7 +377,7 @@ ctx.SaveChanges(audit);
 
 ### Problem
 
-You need to format a value with a different string representation by example adding a dollar sign to the money value.
+You need to format a value with a different string representation, for example, adding a dollar sign to the money value.
 
 ### Solution
 
@@ -507,7 +507,7 @@ ctx.SaveChanges(audit);
 
 ### Problem
 
-You want to retrieve all AuditEntry for a specific item
+You want to retrieve all AuditEntry for a specific item.
 
 ### Solution
 
@@ -657,7 +657,7 @@ ctx.SaveChanges(audit);
 
 ## Audit + Entity Framework Extensions
 
-If you are using Entity Framework Extensions, is still possible to use the EF+ Audit features.
+If you are using Entity Framework Extensions, it is still possible to use the EF+ Audit features.
 
 However, it will only work with BulkSaveChanges.
 
@@ -718,15 +718,15 @@ public class CurrentContext : DbContext
 
 Why only my key is added when updating my entity?
 
-This issue often happen for MVC user. They create a new entity through HttpPost values and force the state to "Modified", the context is not aware of the original value and use the current value instead. So every property has the original value == current value and our auditing only log the key since all other values are equals.
+This issue often happens for MVC user. They create a new entity through HttpPost values and force the state to "Modified", the context is not aware of the original value and use the current value instead. So, every property has the original value == current value and our auditing only log the key since all other values are equals.
 
-We recommend to set the **IgnorePropertyUnchanged **to false to log every property.
+We recommend setting the **IgnorePropertyUnchanged **to false to log every property.
 
 Here is an example of this issue: [Issues #8](https://github.com/zzzprojects/EntityFramework-Plus/issues/8)
 
 ## Conclusion
 
-**Auditing** in Entity Framework could not be simpler, there are always some entities in an application where an audit table can be crucial to keep track of what's happening and you now have access to an easy to use library for these situations.
+**Auditing** in Entity Framework could not be simpler, there are always some entities in an application where an audit table can be crucial to keep track of what's happening, and you now have access to an easy to use library for these situations.
 
 Need help getting started? [[email protected]](mailto:[email protected])
 

docs2/pages/documentations/query-cache.md

@@ -94,7 +94,7 @@ Query Deferred supports all Queryable extension methods and overloads.
 
 Tagging the cache lets you expire later on all cached entries with a specific tag by calling the **ExpireTag** method.
 
-By example, the daily countries & states importation has been completed and you need to refresh from the database all queries related to the country table. You can now simply expire the tag **countries** to remove all related cached entries.
+For example, the daily countries & states importation has been completed and you need to refresh from the database all queries related to the country table. You can now simply expire the tag **countries** to remove all related cached entries.
 
 {% include template-example.html %} 
 ```csharp

docs2/pages/documentations/query-db-set-filter.md

@@ -25,7 +25,7 @@ To make both features live together, method in Query DbSetFilter has been rename
 
 Global filter can be used by any context.
 
-Global filter is normally preferred in most scenario over instance filter since the filter code is centralized in one method over being spread in multiple methods.
+Global filter is normally preferred in most scenarios over instance filter since the filter code is centralized in one method over being spread in multiple methods.
 
 {% include template-example.html %} 
 ```csharp

docs2/pages/documentations/query-filter.md

@@ -270,7 +270,7 @@ var list = ctx.Categories.ToList();
 
 ### Security Access
 
-Viewing sensible data requires often some permissions. By example, not everyone can see all posts in a forum.
+Viewing sensible data often requires some permissions. For example, not everyone can see all posts in a forum.
 
 *In this example, some posts are only available by role level.*
 
@@ -308,7 +308,7 @@ var list = ctx.Categories.ToList()
 
 ### Include Filtering
 
-Including related entities can be useful. By example, every time you load a post, you want to include all active comments related.
+Including related entities can be useful. For example, every time you load a post, you want to include all active comments related.
 
 **Require:** EF+ Query Include
 
@@ -361,7 +361,7 @@ using (var ctx = new EntityContext())
 
 #### Context Filter
 
-Since the QueryCacheManager is global, our library have some limitation with Filter by context (Global Filter doesn't have this issue since it apply the same logic to all query.
+Since the QueryCacheManager is global, our library have some limitations with Filter by context (Global Filter doesn't have this issue since it apply the same logic to all query.)
 
  - LazyLoading only work with GlobalFilter
  - context.Set only work with GlobalFilter (You can use the method SetFiltered instead)
@@ -383,7 +383,7 @@ For this kind of scenario, we recommend using instead: [EntityFramework.DynamicF
 
 #### Entity Framework Core - Limitations
 
-A **ForceCast** option has been added to support temporary inheritance, but some LINQ method will not be longer work in combination with ForceCast
+A **ForceCast** option has been added to support temporary inheritance, but some LINQ method will no longer be working in combination with ForceCast.
 
 {% include template-example.html %} 
 ```csharp
@@ -392,7 +392,7 @@ QueryFilterManager.ForceCast = true;
 
 ```
 
-Here is a list of known method that doesn't longer work with query filtered with the ForceCast options enabled:
+Here is a list of known method that no longer work with query filtered with the ForceCast options enabled:
 
  - Aggregate
  - Max

docs2/pages/documentations/query-future.md

@@ -2,11 +2,11 @@
 
 ## Introduction
 
-Every time an immediate method like **ToList** or **FirstOrDefault** is invoked on a query, a database round trip is made to retrieve data. While the most application doesn't have performance issues with making multiple round trips, batching multiple queries into one can be critical for some heavy traffic applications for scalability. Major ORM like NHibernate had this feature for a long time but, unfortunately for Entity Framework users, batching queries is only available through third party libraries.
+Every time an immediate method like **ToList** or **FirstOrDefault** is invoked on a query, a database round trip is made to retrieve data. While most applications don't have performance issues with making multiple round trips, batching multiple queries into one can be critical for some heavy traffic applications for scalability. Major ORM like NHibernate had this feature for a long time but, unfortunately for Entity Framework users, batching queries is only available through third party libraries.
 
 **EF+ Query Future** opens up all batching future queries features for Entity Framework users.
 
-To batch multiples queries, simply append **Future** or **FutureValue** method to the query. All future queries will be stored in a pending list, and when the first future query requires a database round trip, all queries will be resolved in the same SQL command.
+To batch multiple queries, simply append **Future** or **FutureValue** method to the query. All future queries will be stored in a pending list, and when the first future query requires a database round trip, all queries will be resolved in the same SQL command.
 
 {% include template-example.html %} 
 ```csharp
@@ -176,7 +176,7 @@ As we saw, EF+ Query Future follows a good architecture principle:
 
  - **Flexible:** Future, FutureValue and FutureValue deferred make it possible to use it in any kind of scenario.
  - **Maintainable:** The easy to use API, documentation and available source code allows new developers to quickly understand this feature.
- - **Scalable:** Query Future gets only better as the number of user/traffic grows by drastically reducing database round trips.
+ - **Scalable:** Query Future only gets better as the number of user/traffic grows by drastically reducing database round trips.
 
 Need help getting started? [[email protected]](mailto:[email protected])
 

docs2/pages/documentations/query-include-filter.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-With Entity Framework, "Include" method is often used to load related entities / child collections. However, the method doesn't let you use LINQ queryable methods like **Where** to filter entities to include which is a major drawback. Excluding soft deleted records or limiting the result is a frequent real life scenario which the "Include" method doesn't support.
+With Entity Framework, "Include" method is often used to load related entities / child collections. However, the method doesn't let you use LINQ queryable methods like **Where** to filter entities to include which is a major drawback. Excluding soft deleted records or limiting the result is a frequent real-life scenario which the "Include" method doesn't support.
 
 **EF+ Query IncludeFilter** lets you filter and perform LINQ queryable methods on related entities.
 
@@ -180,8 +180,8 @@ ctx.Posts.IncludeFilter(q => q.Comments.Take(1)).ToList();
 
 ## Conclusion
 
-Filtering included related entities is one of the most frequently asked questions in forums. **EF+ Query IncludeFilter** now make it possible without any learning curve required for a junior developer to understand what the method does.
+Filtering included related entities is one of the most frequently asked questions in forums. **EF+ Query IncludeFilter** now makes it possible without any learning curve required for a junior developer to understand what the method does.
 
 Need help getting started? [info@zzzprojects.com](mailto:info@zzzprojects.com)
 
-We welcome all comments, ideas and suggestions to improve our library.
+We welcome all comments, ideas and suggestions to improve our library.

docs2/pages/getting-started/overview.md

@@ -77,15 +77,15 @@ Filter query with predicate at global, instance or query level.
 
 Query Future allow to reduce database roundtrip by batching multiple queries in the same sql command.
 
-All future query are stored in a pending list. When the first future query require a database roundtrip, all query are resolved in the same sql command instead of making a database roundtrip for every sql command.
+All future queries are stored in a pending list. When the first future query requires a database roundtrip, all queries are resolved in the same sql command instead of making a database roundtrip for every sql command.
 
 ### Query IncludeFilter
 
 Entity Framework already support eager loading however the major drawback is you cannot control what will be included. There is no way to load only active item or load only the first 10 comments.
 
 ### Query IncludeOptimized
 
-Improve SQL generate by Include and filter child collections at the same times!
+Improves SQL generated by Include and filter child collections at the same time!
 
 [Learn more](/tutorial-query)