diff --git a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
index 286daa1fd4..57d39b3f98 100644
--- a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
+++ b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
@@ -39,8 +39,8 @@
Loading entities with include can be executed __lazily__.
{CODE-TABS}
-{CODE-TAB:csharp:Lazy-load-with-include lazy_LoadWithInclude@ClientApi\Session\HowTo\Lazy.cs /}
-{CODE-TAB:csharp:The-document lazy_productClass@ClientApi\Session\HowTo\Lazy.cs /}
+{CODE-TAB:csharp:Lazy_load_with_include lazy_LoadWithInclude@ClientApi\Session\HowTo\Lazy.cs /}
+{CODE-TAB:csharp:The_document lazy_productClass@ClientApi\Session\HowTo\Lazy.cs /}
{CODE-TABS/}
{NOTE/}
@@ -70,7 +70,7 @@
{NOTE: }
__Run query__
-* A Query can be executing a __lazily__.
+* A Query can be executed __lazily__.
Learn more about running queries lazily in [lazy queries](../../../client-api/session/querying/how-to-perform-queries-lazily).
{CODE lazy_Query@ClientApi\Session\HowTo\Lazy.cs /}
diff --git a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.dotnet.markdown b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.dotnet.markdown
index 2e07288bfa..860cfac5f0 100644
--- a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.dotnet.markdown
+++ b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Stream Query Results
+# Stream Query Results
---
diff --git a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.java.markdown b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.java.markdown
index 53eccbcd73..cc85494ea9 100644
--- a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.java.markdown
+++ b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.java.markdown
@@ -1,4 +1,4 @@
-# How to Stream Query Results
+# Stream Query Results
Query results can be streamed using the `stream` method from the `advanced` session operations. The query can be issued using either a static index, or it can be a dynamic one where it will be handled by an auto index.
diff --git a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.js.markdown b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.js.markdown
index 323ea85261..3049c32436 100644
--- a/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.js.markdown
+++ b/Documentation/5.1/Raven.Documentation.Pages/client-api/session/querying/how-to-stream-query-results.js.markdown
@@ -1,4 +1,4 @@
-# How to Stream Query Results
+# Stream Query Results
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/.docs.json b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/.docs.json
index e86101a892..eda0d8b7c7 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/.docs.json
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/.docs.json
@@ -25,7 +25,7 @@
},
{
"Path": "perform-operations-lazily.markdown",
- "Name": "...perform operations lazily",
+ "Name": "...perform requests lazily",
"DiscussionId": "7a54c2fc-67ee-40e6-94b5-1266e990cf57",
"Mappings": [
{
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
index 38b1537c4d..a4243cd39e 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.dotnet.markdown
@@ -1,27 +1,42 @@
-# How to Perform Operations Lazily
-
+# Perform requests lazily
---
{NOTE: }
-* **Defining a lazy operation** allows deferring the execution of the operation until it is needed.
+* __Lazy request__:
+
+ * You can define a lazy request within a session (e.g. a lazy-query or a lazy-load request)
+ and defer its execution until actually needed.
+
+ * The lazy request definition is stored in the session and a `Lazy` instance is returned.
+ The request will be sent to the server and executed only when you access the value of this instance.
+
+* __Multiple lazy requests__:
+
+ * Multiple lazy requests can be defined within the same session.
-* Multiple pending lazy operations can be executed together, see below.
+ * When triggering the deferred execution (whether implicitly or explicitly),
+ ALL pending lazy requests held up by the session will be sent to the server in a single call.
+ This can help reduce the number of remote calls made to the server over the network.
* In this page:
- * [Operations that can be executed lazily](../../../client-api/session/how-to/perform-operations-lazily#operations-that-can-be-executed-lazily)
- * [Load entities](../../../client-api/session/how-to/perform-operations-lazily#loadEntities)
- * [Load entities with include](../../../client-api/session/how-to/perform-operations-lazily#loadWithInclude)
- * [Load entities starting with](../../../client-api/session/how-to/perform-operations-lazily#loadStartingWith)
- * [Conditional load](../../../client-api/session/how-to/perform-operations-lazily#conditionalLoad)
- * [Run query](../../../client-api/session/how-to/perform-operations-lazily#runQuery)
- * [Get revisions](../../../client-api/session/how-to/perform-operations-lazily#getRevisions)
- * [Get compare-exchange value](../../../client-api/session/how-to/perform-operations-lazily#getCompareExchange)
- * [Execute all pending lazy operations](../../../client-api/session/how-to/perform-operations-lazily#execute-all-pending-lazy-operations)
+ * [Requests that can be executed lazily:](../../../client-api/session/how-to/perform-operations-lazily#requests-that-can-be-executed-lazily)
+ * [Load entities](../../../client-api/session/how-to/perform-operations-lazily#loadEntities)
+ * [Load entities with include](../../../client-api/session/how-to/perform-operations-lazily#loadWithInclude)
+ * [Load entities starting with](../../../client-api/session/how-to/perform-operations-lazily#loadStartingWith)
+ * [Conditional load](../../../client-api/session/how-to/perform-operations-lazily#conditionalLoad)
+ * [Run query](../../../client-api/session/how-to/perform-operations-lazily#runQuery)
+ * [Get revisions](../../../client-api/session/how-to/perform-operations-lazily#getRevisions)
+ * [Get compare-exchange value](../../../client-api/session/how-to/perform-operations-lazily#getCompareExchange)
+ * [Multiple lazy requests](../../../client-api/session/how-to/perform-operations-lazily#multiple-lazy-requests)
+ * [Execute all requests - implicitly](../../../client-api/session/how-to/perform-operations-lazily#implicit)
+ * [Execute all requests - explicitly](../../../client-api/session/how-to/perform-operations-lazily#explicit)
{NOTE/}
-{PANEL: Operations that can be executed lazily}
+---
+
+{PANEL: Requests that can be executed lazily}
{NOTE: }
__Load entities__
@@ -39,8 +54,8 @@
Loading entities with include can be executed __lazily__.
{CODE-TABS}
-{CODE-TAB:csharp:Lazy-load-with-include lazy_LoadWithInclude@ClientApi\Session\HowTo\Lazy.cs /}
-{CODE-TAB:csharp:The-document lazy_productClass@ClientApi\Session\HowTo\Lazy.cs /}
+{CODE-TAB:csharp:Lazy_load_with_include lazy_LoadWithInclude@ClientApi\Session\HowTo\Lazy.cs /}
+{CODE-TAB:csharp:The_document lazy_productClass@ClientApi\Session\HowTo\Lazy.cs /}
{CODE-TABS/}
{NOTE/}
@@ -70,8 +85,8 @@
{NOTE: }
__Run query__
-* A Query can be executing a __lazily__.
- Learn more about running queries lazily in [lazy queries](../../../client-api/session/querying/how-to-perform-queries-lazily).
+* A Query can be executed __lazily__.
+ Find more lazy queries examples in [perform a lazy query](../../../client-api/session/querying/how-to-perform-queries-lazily).
{CODE lazy_Query@ClientApi\Session\HowTo\Lazy.cs /}
{NOTE/}
@@ -94,11 +109,21 @@
{PANEL/}
-{PANEL: Execute all pending lazy operations}
+{PANEL: Multiple lazy requests }
+
+{NOTE: }
+ __Execute all requests - implicitly__
+
+{CODE lazy_ExecuteAll_Implicit@ClientApi\Session\HowTo\Lazy.cs /}
-* Use `ExecuteAllPendingLazyOperations` to execute **all** pending lazy operations at once.
+{NOTE/}
-{CODE lazy_ExecuteAllPendingLazyOperations@ClientApi\Session\HowTo\Lazy.cs /}
+{NOTE: }
+ __Execute all requests - explicitly__
+
+{CODE lazy_ExecuteAll_Explicit@ClientApi\Session\HowTo\Lazy.cs /}
+
+{NOTE/}
{PANEL/}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.js.markdown
index 43231a2e86..89eef4eec8 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/how-to/perform-operations-lazily.js.markdown
@@ -1,26 +1,41 @@
-# How to Perform Operations Lazily
-
+# Perform requests lazily
---
{NOTE: }
-* **Defining a lazy operation** allows deferring the execution of the operation until it is needed.
+* __Lazy request__:
+
+ * You can define a lazy request within a session (e.g. a lazy-query or a lazy-load request)
+ and defer its execution until actually needed.
+
+ * The lazy request definition is stored in the session and a `Lazy` instance is returned.
+ The request will be sent to the server and executed only when you access the value of this instance.
+
+* __Multiple lazy requests__:
-* Multiple pending lazy operations can be executed together, see below.
+ * Multiple lazy requests can be defined within the same session.
+
+ * When triggering the deferred execution (whether implicitly or explicitly),
+ ALL pending lazy requests held up by the session will be sent to the server in a single call.
+ This can help reduce the number of remote calls made to the server over the network.
* In this page:
- * [Operations that can be executed lazily](../../../client-api/session/how-to/perform-operations-lazily#operations-that-can-be-executed-lazily)
- * [Load entities](../../../client-api/session/how-to/perform-operations-lazily#loadEntities)
- * [Load entities with include](../../../client-api/session/how-to/perform-operations-lazily#loadWithInclude)
- * [Load entities starting with](../../../client-api/session/how-to/perform-operations-lazily#loadStartingWith)
- * [Conditional load](../../../client-api/session/how-to/perform-operations-lazily#conditionalLoad)
- * [Run query](../../../client-api/session/how-to/perform-operations-lazily#runQuery)
- * [Get revisions](../../../client-api/session/how-to/perform-operations-lazily#getRevisions)
- * [Get compare-exchange value](../../../client-api/session/how-to/perform-operations-lazily#getCompareExchange)
- * [Execute all pending lazy operations](../../../client-api/session/how-to/perform-operations-lazily#execute-all-pending-lazy-operations)
+ * [Requests that can be executed lazily:](../../../client-api/session/how-to/perform-operations-lazily#requests-that-can-be-executed-lazily)
+ * [Load entities](../../../client-api/session/how-to/perform-operations-lazily#loadEntities)
+ * [Load entities with include](../../../client-api/session/how-to/perform-operations-lazily#loadWithInclude)
+ * [Load entities starting with](../../../client-api/session/how-to/perform-operations-lazily#loadStartingWith)
+ * [Conditional load](../../../client-api/session/how-to/perform-operations-lazily#conditionalLoad)
+ * [Run query](../../../client-api/session/how-to/perform-operations-lazily#runQuery)
+ * [Get revisions](../../../client-api/session/how-to/perform-operations-lazily#getRevisions)
+ * [Get compare-exchange value](../../../client-api/session/how-to/perform-operations-lazily#getCompareExchange)
+ * [Multiple lazy requests](../../../client-api/session/how-to/perform-operations-lazily#multiple-lazy-requests)
+ * [Execute all requests - implicitly](../../../client-api/session/how-to/perform-operations-lazily#implicit)
+ * [Execute all requests - explicitly](../../../client-api/session/how-to/perform-operations-lazily#explicit)
{NOTE/}
+---
+
{PANEL: Operations that can be executed lazily}
{NOTE: }
@@ -39,8 +54,8 @@
Loading entities with include can be executed __lazily__.
{CODE-TABS}
-{CODE-TAB:nodejs:Lazy-load-with-include lazy_loadWithInclude@ClientApi\Session\HowTo\lazy.js /}
-{CODE-TAB:nodejs:Sample-document lazy_productClass@ClientApi\Session\HowTo\lazy.js /}
+{CODE-TAB:nodejs:Lazy_load_with_include lazy_loadWithInclude@ClientApi\Session\HowTo\lazy.js /}
+{CODE-TAB:nodejs:The_document lazy_productClass@ClientApi\Session\HowTo\lazy.js /}
{CODE-TABS/}
{NOTE/}
@@ -70,7 +85,7 @@
{NOTE: }
__Run query__
-* A Query can be executing a __lazily__.
+* A Query can be executed __lazily__.
Learn more about running queries lazily in [lazy queries](../../../client-api/session/querying/how-to-perform-queries-lazily).
{CODE:nodejs lazy_query@ClientApi\Session\HowTo\lazy.js /}
@@ -94,11 +109,21 @@
{PANEL/}
-{PANEL: Execute all pending lazy operations}
+{PANEL: Multiple lazy requests }
-* Use `executeAllPendingLazyOperations` to execute **all** pending lazy operations at once.
+{NOTE: }
+ __Execute all requests - implicitly__
-{CODE:nodejs lazy_executeAllPendingLazyOperations@ClientApi\Session\HowTo\lazy.js /}
+{CODE:nodejs lazy_ExecuteAll_Implicit@ClientApi\Session\HowTo\lazy.js /}
+
+{NOTE/}
+
+{NOTE: }
+ __Execute all requests - explicitly__
+
+{CODE:nodejs lazy_ExecuteAll_Explicit@ClientApi\Session\HowTo\lazy.js /}
+
+{NOTE/}
{PANEL/}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.dotnet.markdown
index 06fd19e48d..8c78292901 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.dotnet.markdown
@@ -3,17 +3,19 @@
{NOTE: }
-There are several methods with many overloads that allow users to download documents
-from the database and convert them to entities. This article will cover the following
-methods:
-
-- [Load](../../client-api/session/loading-entities#load)
-- [Load with Includes](../../client-api/session/loading-entities#load-with-includes)
-- [Load - multiple entities](../../client-api/session/loading-entities#load---multiple-entities)
-- [LoadStartingWith](../../client-api/session/loading-entities#loadstartingwith)
-- [ConditionalLoad](../../client-api/session/loading-entities#conditionalload)
-- [Stream](../../client-api/session/loading-entities#stream)
-- [IsLoaded](../../client-api/session/loading-entities#isloaded)
+* There are several methods that allow users to load documents from the database and convert them to entities.
+
+* This article covers the following methods:
+
+ - [Load](../../client-api/session/loading-entities#load)
+ - [Load with Includes](../../client-api/session/loading-entities#load-with-includes)
+ - [Load - multiple entities](../../client-api/session/loading-entities#load---multiple-entities)
+ - [LoadStartingWith](../../client-api/session/loading-entities#loadstartingwith)
+ - [ConditionalLoad](../../client-api/session/loading-entities#conditionalload)
+ - [Stream](../../client-api/session/loading-entities#stream)
+ - [IsLoaded](../../client-api/session/loading-entities#isloaded)
+
+* For loading entities lazily see [perform requests lazily](../../client-api/session/how-to/perform-operations-lazily).
{NOTE/}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.js.markdown
index f1adf1170b..c0bd8b9ae0 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/loading-entities.js.markdown
@@ -1,14 +1,25 @@
# Session: Loading Entities
+---
-There are various methods with many overloads that allow users to download documents from a database and convert them to entities. This article will cover the following methods:
+{NOTE: }
-- [Load](../../client-api/session/loading-entities#load)
-- [Load with Includes](../../client-api/session/loading-entities#load-with-includes)
-- [Load - multiple entities](../../client-api/session/loading-entities#load---multiple-entities)
-- [LoadStartingWith](../../client-api/session/loading-entities#loadstartingwith)
-- [ConditionalLoad](../../client-api/session/loading-entities#conditionalload)
-- [IsLoaded](../../client-api/session/loading-entities#isloaded)
-- [Stream](../../client-api/session/loading-entities#stream)
+* There are several methods that allow users to load documents from the database and convert them to entities.
+
+* This article covers the following methods:
+
+ - [Load](../../client-api/session/loading-entities#load)
+ - [Load with Includes](../../client-api/session/loading-entities#load-with-includes)
+ - [Load - multiple entities](../../client-api/session/loading-entities#load---multiple-entities)
+ - [LoadStartingWith](../../client-api/session/loading-entities#loadstartingwith)
+ - [ConditionalLoad](../../client-api/session/loading-entities#conditionalload)
+ - [IsLoaded](../../client-api/session/loading-entities#isloaded)
+ - [Stream](../../client-api/session/loading-entities#stream)
+
+* For loading entities lazily see [perform requests lazily](../../client-api/session/how-to/perform-operations-lazily).
+
+{NOTE/}
+
+---
{PANEL:Load}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/.docs.json b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/.docs.json
index 6a77aac946..3a802ef4cb 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/.docs.json
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/.docs.json
@@ -28,7 +28,7 @@
},
{
"Path": "how-to-stream-query-results.markdown",
- "Name": "How to Stream Query Results",
+ "Name": "Stream Query Results",
"DiscussionId": "c96a370e-8d0d-4e8f-93b3-03a8105e8b0e",
"Mappings": [
{
@@ -39,7 +39,7 @@
},
{
"Path": "how-to-customize-query.markdown",
- "Name": "How to Customize Query",
+ "Name": "Customize Query",
"DiscussionId": "73dfb483-1fca-4fca-a1a4-15c7366b4775",
"Mappings": []
},
@@ -77,7 +77,7 @@
},
{
"Path": "how-to-make-a-spatial-query.markdown",
- "Name": "How to Make a Spatial Query",
+ "Name": "Make a Spatial Query",
"DiscussionId": "b62de172-77e9-4241-a525-9ba6cc027860",
"Mappings": [
{
@@ -98,13 +98,13 @@
},
{
"Path": "how-to-filter-by-field.markdown",
- "Name": "How to Filter by Field Presence",
+ "Name": "Filter by Field Presence",
"DiscussionId": "bda0ec07-d0f9-46a0-bab7-ca733f692533",
"Mappings": []
},
{
"Path": "how-to-filter-by-non-existing-field.markdown",
- "Name": "How to Filter by Non-Existing Field",
+ "Name": "Filter by Non-Existing Field",
"DiscussionId": "bda0ec07-d0f9-46a0-bab7-ca733f692533",
"Mappings": []
},
@@ -121,7 +121,7 @@
},
{
"Path": "how-to-perform-queries-lazily.markdown",
- "Name": "How to Perform Queries Lazily",
+ "Name": "Perform a Lazy Query",
"DiscussionId": "a359f844-7193-4228-98e0-81a07e561a8b",
"Mappings": [
{
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/.docs.json b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/.docs.json
index d8bb75f036..a5fb6200a7 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/.docs.json
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/.docs.json
@@ -1,13 +1,13 @@
[
{
"Path": "include-explanations.markdown",
- "Name": "How to Include Query Explanations",
+ "Name": "Include Query Explanations",
"DiscussionId": "2d056281-2f65-4180-a3e1-a6348ec2d230",
"Mappings": []
},
{
"Path": "query-timings.markdown",
- "Name": "How to Include Query Timings",
+ "Name": "Include Query Timings",
"DiscussionId": "873da629-f825-4378-bac9-87153227a41b",
"Mappings": []
}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.dotnet.markdown
index e29cebee0d..5bfb8fb0c8 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Include Query Explanations
+# Include Query Explanations
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.java.markdown
index 78adf19b51..60318af676 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.java.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.java.markdown
@@ -1,4 +1,4 @@
-# How to include Query Explanations
+# Include Query Explanations
`includeExplanations` allows to investigate details related to score assigned for each query result.
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.js.markdown
index 9f6553a845..5060da4738 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/include-explanations.js.markdown
@@ -1,4 +1,4 @@
-# How to Include Query Explanations
+# Include Query Explanations
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.dotnet.markdown
index faf8478d6f..02a1e6b981 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Include Query Timings
+# Include Query Timings
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.java.markdown
index bba65f189b..e67e994b1a 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.java.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.java.markdown
@@ -1,4 +1,4 @@
-# How to Include Query Timings
+# Include Query Timings
By default, detailed timings (duration of Lucene search, loading documents, transforming results) in queries are turned off, this is due to small overhead that calculation of such timings produces.
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.js.markdown
index bb8f132fbe..fc66c21a19 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/debugging/query-timings.js.markdown
@@ -1,4 +1,4 @@
-# How to Include Query Timings
+# Include Query Timings
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.dotnet.markdown
index 83255689e3..c2c12bc926 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Customize a Query
+# Customize Query
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.java.markdown
index 84cf9322c0..b7a0edc1d5 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.java.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.java.markdown
@@ -1,4 +1,5 @@
-# How to Customize a Query
+# Customize Query
+
---
{NOTE: }
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.js.markdown
index 2d1687a8f4..884dc7e417 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-customize-query.js.markdown
@@ -1,4 +1,4 @@
-# How to Customize a Query
+# Customize Query
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.dotnet.markdown
index 9b57a09754..2bc6731126 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Filter by Field Presence
+# Filter by Field Presence
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.java.markdown
index fef0aa198a..7bb8cb75a0 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.java.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.java.markdown
@@ -1,4 +1,4 @@
-# How to Filter by Field Presence
+# Filter by Field Presence
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.js.markdown
index 3b34eda220..0951cc24ee 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-field.js.markdown
@@ -1,4 +1,4 @@
-# How to Filter by Field Presence
+# Filter by Field Presence
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.dotnet.markdown
index 30bb3e0975..a5136accc9 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Filter by Non-Existing Field
+# Filter by Non-Existing Field
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.js.markdown
index ca217997e4..20afb8050c 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-filter-by-non-existing-field.js.markdown
@@ -1,4 +1,4 @@
-# How to Filter by Non-Existing Field
+# Filter by Non-Existing Field
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.dotnet.markdown
index 7bc9be332f..d3c8dda624 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.dotnet.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.dotnet.markdown
@@ -1,4 +1,4 @@
-# How to Make a Spatial Query
+# Make a Spatial Query
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.java.markdown
index 01203be755..a42ff03967 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.java.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.java.markdown
@@ -1,4 +1,4 @@
-# How to Make a Spatial Query
+# Make a Spatial Query
Spatial indexes can be queried using the `spatial` method which contains a full spectrum of spatial methods. The following article will cover these methods:
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.js.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.js.markdown
index 58ebd31daa..8a63067002 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.js.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-make-a-spatial-query.js.markdown
@@ -1,4 +1,4 @@
-# How to Make a Spatial Query
+# Make a Spatial Query
---
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.dotnet.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.dotnet.markdown
new file mode 100644
index 0000000000..315d092ea2
--- /dev/null
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.dotnet.markdown
@@ -0,0 +1,95 @@
+# Perform a Lazy Query
+
+---
+
+{NOTE: }
+
+* Query execution can be deferred.
+ You can __define a query as lazy__ and execute it later when query results are actually needed.
+
+* This article contains lazy queries examples.
+ __Prior to this article__, please refer to [perform requests lazily](../../../client-api/session/how-to/perform-operations-lazily) for general knowledge about
+ RavenDB's lazy behavior, and other request types that can be executed lazily within a session.
+
+* In this page:
+ * [Lazy query](../../../client-api/session/querying/how-to-perform-queries-lazily#lazy-query)
+ * [Lazy count query](../../../client-api/session/querying/how-to-perform-queries-lazily#lazy-count-query)
+ * [Lazy suggestions query](../../../client-api/session/querying/how-to-perform-queries-lazily#lazy-suggestions-query)
+ * [Lazy facets query](../../../client-api/session/querying/how-to-perform-queries-lazily#lazy-facets-query)
+ * [Syntax](../../../client-api/session/querying/how-to-perform-queries-lazily#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Lazy query}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Lazy_query lazy_1@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_query_async lazy_2@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_documentQuery lazy_3@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TABS/}
+
+* Learn more about queries in this [query overview](../../../client-api/session/querying/how-to-query).
+
+{PANEL/}
+
+{PANEL: Lazy count query}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Lazy_query lazy_4@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_query_async lazy_5@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_documentQuery lazy_6@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Lazy suggestions query}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Lazy_query lazy_7@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_query_async lazy_8@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_documentQuery lazy_9@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TABS/}
+
+* Learn more about suggestions in [query for suggestions](../../../client-api/session/querying/how-to-work-with-suggestions).
+
+{PANEL/}
+
+{PANEL: Lazy facets query}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Lazy_query lazy_10@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_query_async lazy_11@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Lazy_documentQuery lazy_12@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Facets_definition the_facets@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TAB:csharp:Index_definition the_index@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE-TABS/}
+
+* Learn more about facets in [perform faceted search](../../../client-api/session/querying/how-to-perform-a-faceted-search).
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE syntax_1@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE syntax_2@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE syntax_3@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+{CODE syntax_4@ClientApi\Session\Querying\HowToPerformQueriesLazily.cs /}
+
+| Parameters | Type | Description |
+|------------|-----------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|
+| __onEval__ | `Action>`
`Action>`
`Action>` | An action that will be performed on the query results
when the query is executed. |
+
+| Return Value | |
+|----------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------|
+| `Lazy>`
`Lazy`
`Lazy>`
`Lazy>` | A lazy instance that will evaluate the query only when needed. |
+
+{PANEL/}
+
+## Related Articles
+
+### Session
+
+- [Query overview](../../../client-api/session/querying/how-to-query)
+- [Perform requests lazily](../../../client-api/session/how-to/perform-operations-lazily)
diff --git a/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.java.markdown b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.java.markdown
new file mode 100644
index 0000000000..8ebb454aad
--- /dev/null
+++ b/Documentation/5.2/Raven.Documentation.Pages/client-api/session/querying/how-to-perform-queries-lazily.java.markdown
@@ -0,0 +1,70 @@
+# Perform a Lazy Query
+
+In some situations, query execution must be delayed. To cover such a scenario, `lazily` and many other query extensions have been introduced.
+
+{PANEL:Lazily}
+
+{CODE:java lazy_1@ClientApi\Session\Querying\HowToPerformQueriesLazily.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **onEval** | Consumer | An action that will be performed on the query results. |
+
+| Return Value | |
+| ------------- | ----- |
+| Lazy | Lazy query initializer returning query results. |
+
+### Example
+
+{CODE:java lazy_2@ClientApi\Session\Querying\HowToPerformQueriesLazily.java /}
+
+{PANEL/}
+
+{PANEL:Counts}
+
+{CODE:java lazy_4@ClientApi\Session\Querying\HowToPerformQueriesLazily.java /}
+
+| Return Value | |
+| ------------- | ----- |
+| Lazy | Lazy query initializer returning a count of matched documents. |
+
+### Example
+
+{CODE:java lazy_5@ClientApi\Session\Querying\HowToPerformQueriesLazily.java /}
+
+{PANEL/}
+
+{PANEL:Suggestions}
+
+{CODE:java lazy_6@ClientApi\Session\Querying\HowToPerformQueriesLazily.java /}
+
+| Return Value | |
+| ------------- | ----- |
+| Lazy