diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
index b42a07fa6c..8d276c383f 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
-  * __Default configuration__ - applies to all document collections.  
-  * __Collection-specific configurations__ - override the default settings for these collections.  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
   * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
 
-* The configuration passed to this operation will __REPLACE__ the current revisions configuration in the database.  
-  To __MODIFY__ existing configuration, fetch the current configuration from the database record first.  
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
 
 * After applying the configuration,  
   revisions are created and purged for a document whenever the document is created, modified, or deleted.  
@@ -32,7 +32,7 @@
 {PANEL: Replace configuration}
 
 * In this example, we create a new `RevisionsConfiguration` for the database.  
-  If revisions configuration already exists in the database - it will be __replaced__.
+  If revisions configuration already exists in the database - it will be **replaced**.
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync replace_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
@@ -43,7 +43,7 @@
 
 {PANEL: Modify configuration}
 
-* In this example, we fetch the existing revisions configuration from the database record and __modify__ it.   
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync modify_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
@@ -58,14 +58,14 @@
 
 | Parameter | Type | Description |
 | - | - | - |
-| __configuration__ | `RevisionsConfiguration` | The revisions configuration to apply |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
 
 {CODE:csharp syntax_2@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
 
 | Property | Type | Description |
 | - | - | - |
-| __Default__ | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `Collections`. |
-| __Collections__ | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+| **Default** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `Collections`. |
+| **Collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
 
 {CODE:csharp syntax_3@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
 
@@ -73,11 +73,11 @@
 
 | Property | Type | Description |
 | - | - | - |
-| __MinimumRevisionsToKeep__ | `long` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> __Default__ : `null` = no limit </li></ul> |
-| __MinimumRevisionAgeToKeep__ | `TimeSpan` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> __Default__ : `null` = no age limit</li><ul> |
-| __MaximumRevisionsToDeleteUponDocumentUpdate__ | `long` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> __Default__ : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
-| __PurgeOnDelete__ | `bool` | <ul><li>`false` ( __Default__ ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
-| __Disabled__ | `bool` | <ul><li>`false` ( __Default__ ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+| **MinimumRevisionsToKeep** | `long` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **MinimumRevisionAgeToKeep** | `TimeSpan` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **MaximumRevisionsToDeleteUponDocumentUpdate** | `long` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **PurgeOnDelete** | `bool` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **Disabled** | `bool` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
index b21e8bd0f5..4210dae096 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
-  * __Default configuration__ - applies to all document collections.  
-  * __Collection-specific configurations__ - override the default settings for these collections.  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
   * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
 
-* The configuration passed to this operation will __REPLACE__ the current revisions configuration in the database.  
-  To __MODIFY__ existing configuration, fetch the current configuration from the database record first.  
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
 
 * After applying the configuration,  
   revisions are created and purged for a document whenever the document is created, modified, or deleted.  
@@ -32,7 +32,7 @@
 {PANEL: Replace configuration}
 
 * In this example, we create a new `RevisionsConfiguration` for the database.  
-  If revisions configuration already exists in the database - it will be __replaced__.
+  If revisions configuration already exists in the database - it will be **replaced**.
 
 {CODE:nodejs replace_configuration@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -40,7 +40,7 @@
 
 {PANEL: Modify configuration}
 
-* In this example, we fetch the existing revisions configuration from the database record and __modify__ it.   
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
 
 {CODE:nodejs modify_configuration@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -52,14 +52,14 @@
 
 | Parameter | Type | Description |
 | - | - | - |
-| __configuration__ | `RevisionsConfiguration` | The revisions configuration to apply |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
 
 {CODE:nodejs syntax_2@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
 | Property | Type | Description |
 | - | - | - |
-| __defaultConfig__ | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
-| __collections__ | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+| **defaultConfig** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
+| **collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
 
 {CODE:nodejs syntax_3@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -67,11 +67,11 @@
 
 | Property | Type | Description |
 | - | - | - |
-| __minimumRevisionsToKeep__ | `number` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> __Default__ : `null` = no limit </li></ul> |
-| __minimumRevisionAgeToKeep__ | `string` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> __Default__ : `null` = no age limit</li><ul> |
-| __maximumRevisionsToDeleteUponDocumentUpdate__ | `number` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> __Default__ : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
-| __purgeOnDelete__ | `boolean` | <ul><li>`false` ( __Default__ ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
-| __disabled__ | `boolean` | <ul><li>`false` ( __Default__ ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+| **minimumRevisionsToKeep** | `number` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **minimumRevisionAgeToKeep** | `string` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **maximumRevisionsToDeleteUponDocumentUpdate** | `number` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **purgeOnDelete** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **disabled** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
index 47c0f0c537..b1ddaeb96e 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
@@ -4,7 +4,7 @@
 
 {NOTE: }
 
-* By default, RavenDB creates __revisions for conflict documents__ for all collections  
+* By default, RavenDB creates **revisions for conflict documents** for all collections  
   when conflicts occur and when they are resolved.  
 
 * Use `ConfigureRevisionsForConflictsOperation` to disable the feature or modify the configuration. 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
index abb3411225..5dbaf2dd7b 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
@@ -4,7 +4,7 @@
 
 {NOTE: }
 
-* By default, RavenDB creates __revisions for conflict documents__ for all collections  
+* By default, RavenDB creates **revisions for conflict documents** for all collections  
   when conflicts occur and when they are resolved.  
 
 * Use `ConfigureRevisionsForConflictsOperation` to disable the feature or modify the configuration. 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
index bcc97304e9..aefdc24898 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
@@ -6,9 +6,9 @@
 
 * For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).  
 
-* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the __Client API__.  
+* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.  
 
-* From the __Client API__, revisions can be configured and managed by:  
+* From the **Client API**, revisions can be configured and managed by:  
     * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
     * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
 
@@ -26,29 +26,29 @@
 
 {PANEL: Revisions Session methods}
 
-* __Get revisions__:  
+* **Get revisions**:  
 
   * [GetFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
   * [GetMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
   * [Get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
-  * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about __lazy versions__ of `GetFor`, `GetMetadataFor`, and `Get`.
+  * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `GetFor`, `GetMetadataFor`, and `Get`.
 
 ---
 
-* __Include revisions__:  
+* **Include revisions**:  
 
   * [IncludeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `Session.Load` or `Session.Query`.  
   * [RawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
 
 ---
 
-* __Count revisions__:  
+* **Count revisions**:  
 
   * [GetCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.  
 
 ---
 
-* __Force revision creation__:
+* **Force revision creation**:
 
     * [ForceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
index 80fcfa270e..3df166adb6 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
@@ -6,9 +6,9 @@
 
 * For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).
 
-* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the __Client API__.
+* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.
 
-* From the __Client API__, revisions can be configured and managed by:
+* From the **Client API**, revisions can be configured and managed by:
     * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)
     * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)
 
@@ -26,29 +26,29 @@
 
 {PANEL: Revisions Session methods}
 
-* __Get revisions__:
+* **Get revisions**:
 
     * [getFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
     * [getMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
     * [get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
-    * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about __lazy versions__ of `getFor`, `getMetadataFor`, and `get`.
+    * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `getFor`, `getMetadataFor`, and `get`.
 
 ---
 
-* __Include revisions__:
+* **Include revisions**:
 
     * [includeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `session.load` or `session.query`.
     * [rawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
 
 ---
 
-* __Count revisions__:
+* **Count revisions**:
 
     * [getCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.
 
 ---
 
-* __Force revision creation__:
+* **Force revision creation**:
 
     * [forceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
index bd8284a56f..918cfd3144 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
@@ -5,18 +5,18 @@
 {NOTE: }
 
 * Document revisions can be [included](../../../../client-api/how-to/handle-document-relationships#includes) in results when:  
-  * __Making a query__ (`Session.Query` / `Session.Advanced.RawQuery`)
-  * __Loading a document__ (`Session.Load`) from the server  
+  * **Making a query** (`Session.Query` / `Session.Advanced.RawQuery`)
+  * **Loading a document** (`Session.Load`) from the server  
 
 * The revisions to include can be specified by:
-  * __Creation time__
-  * __Change vector__
+  * **Creation time**
+  * **Change vector**
 
 * In this page:
   * [Overview:](../../../../document-extensions/revisions/client-api/session/including#overview)
-      * [Why include revisions](../../../../document-extensions/revisions/client-api/session/including#why-include)
-      * [Including by creation time](../../../../document-extensions/revisions/client-api/session/including#include-by-time)
-      * [Including by change vector](../../../../document-extensions/revisions/client-api/session/including#include-by-change-vector)
+      * [Why include revisions](../../../../document-extensions/revisions/client-api/session/including#why-include-revisions)
+      * [Including by creation time](../../../../document-extensions/revisions/client-api/session/including#including-by-creation-time)
+      * [Including by change vector](../../../../document-extensions/revisions/client-api/session/including#including-by-change-vector)
   * [Include revisions:](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-loading-document)  
       * [When Loading document](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-loading-document)
       * [When making a Query](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-making-a-query)
@@ -30,11 +30,7 @@
 
 {PANEL: Overview}
 
-{NOTE: }
-
-<a id="why-include" /> __Why include revisions__:
-
----
+#### Why include revisions:
 
 * Including revisions may be useful, for example, when an auditing application loads or queries for a document.  
   The document's past revisions can be included with the document to make the document's history available for instant inspection.  
@@ -43,30 +39,22 @@
   [Getting](../../../../document-extensions/revisions/client-api/session/loading) a revision that was included with the document will retrieve it directly from the session.  
   This also holds true when attempting to include revisions but none are found.
 
-{NOTE/}
-
-{NOTE: }
-
-<a id="include-by-time" /> __Including by Creation Time__:
-
 ---
 
+#### Including by Creation Time:
+
 * You can include a single revision by specifying its creation time, see examples below.
 
 * You can pass local time or UTC, either way the server will  convert it to UTC.  
 
-* __If the provided time matches__ the creation time of a document revision, this revision will be included.
-
-* __If no exact match is found__, then the first revision that precedes the specified time will be returned.
+* **If the provided time matches** the creation time of a document revision, this revision will be included.
 
-{NOTE/}
-
-{NOTE: }
-
-<a id="include-by-change-vector" /> __Including by Change Vector__:
+* **If no exact match is found**, then the first revision that precedes the specified time will be returned.
 
 ---
 
+#### Including by Change Vector:
+
 * Each time a document is modified, its [Change Vector](../../../../server/clustering/replication/change-vector) is updated.  
 
 * When a revision is created,  
@@ -77,7 +65,7 @@
   * When modifying the document, store its updated change vector in a property in the document.  
     Can be done by [patching](../../../../document-extensions/revisions/client-api/session/including#patching-the-revision-change-vector) the document from the Client API or from the Studio.  
   
-  * Specify the __path__ to this property when including the revisions, see examples below.  
+  * Specify the **path** to this property when including the revisions, see examples below.  
   
   * e.g.:  
     Each time an employee's contract document is modified (e.g. when their salary is raised),  
@@ -85,13 +73,11 @@
     Whenever the time comes to re-evaluate an employee's terms and their contract is loaded,  
     its past revisions can be easily included with it by their change vectors.
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Include revisions when Loading document}
 
-__Include a revision by Time__
+#### Include a revision by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_1@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -100,7 +86,7 @@ __Include a revision by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_2@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -114,7 +100,7 @@ __Include revisions by Change Vector__
 
 {PANEL: Include revisions when making a Query}
 
-__Include revisions by Time__
+#### Include revisions by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_3@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -123,7 +109,7 @@ __Include revisions by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_4@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -145,7 +131,7 @@ __Include revisions by Change Vector__
 
 ---
 
-__Include revisions by Time__
+#### Include revisions by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_5@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -154,7 +140,7 @@ __Include revisions by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_6@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -171,13 +157,13 @@ __Include revisions by Change Vector__
 
 | Parameters | Type | Description |
 | - | - | - |
-| __before__ | `DateTime` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
-| __path__ | `Expression<Func<T, string>>` | <ul><li>The path to the document property that contains<br> __a single change vector__ of the revision to be included.</li></ul> |
-| __path__ | `Expression<Func<T, IEnumerable<string>>>` | <ul><li>The path to the document property that contains<br> __an array of change vectors__ of the revisions to be included.</li></ul> |
+| **before** | `DateTime` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
+| **path** | `Expression<Func<T, string>>` | <ul><li>The path to the document property that contains<br> **a single change vector** of the revision to be included.</li></ul> |
+| **path** | `Expression<Func<T, IEnumerable<string>>>` | <ul><li>The path to the document property that contains<br> **an array of change vectors** of the revisions to be included.</li></ul> |
 
 | Return value | |
 | - | - |
-| `TBuilder` | <ul><li>When __loading__ a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When __querying__ for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
+| `TBuilder` | <ul><li>When **loading** a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When **querying** for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
index 9ab721439f..8cde3d50ab 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Document revisions can be included in results when:
-    * __Making a query__ (`session.query` / `session.advanced.rawQuery`)
-    * __Loading a document__ (`session.load`) from the server
+    * **Making a query** (`session.query` / `session.advanced.rawQuery`)
+    * **Loading a document** (`session.load`) from the server
 
 * The revisions to include can be specified by:
-    * __Creation time__
-    * __Change vector__
+    * **Creation time**
+    * **Change vector**
 
 * In this page:
   * [Overview:](../../../../document-extensions/revisions/client-api/session/including#overview)
@@ -32,7 +32,7 @@
 
 {NOTE: }
 
-<a id="why-include" /> __Why include revisions__:
+<a id="why-include" /> **Why include revisions**:
 
 ---
 
@@ -47,7 +47,7 @@
 
 {NOTE: }
 
-<a id="include-by-time" /> __Including by Creation Time__:
+<a id="include-by-time" /> **Including by Creation Time**:
 
 ---
 
@@ -55,15 +55,15 @@
 
 * You can pass local time or UTC, either way the server will  convert it to UTC.  
 
-* __If the provided time matches__ the creation time of a document revision, this revision will be included.
+* **If the provided time matches** the creation time of a document revision, this revision will be included.
 
-* __If no exact match is found__, then the first revision that precedes the specified time will be returned.
+* **If no exact match is found**, then the first revision that precedes the specified time will be returned.
 
 {NOTE/}
 
 {NOTE: }
 
-<a id="include-by-change-vector" /> __Including by Change Vector__:
+<a id="include-by-change-vector" /> **Including by Change Vector**:
 
 ---
 
@@ -77,7 +77,7 @@
   * When modifying the document, store its updated change vector in a property in the document.  
     Can be done by [patching](../../../../document-extensions/revisions/client-api/session/including#patching-the-revision-change-vector) the document from the Client API or from the Studio.
 
-  * Specify the __path__ to this property when including the revisions, see examples below.  
+  * Specify the **path** to this property when including the revisions, see examples below.  
   
   * e.g.:  
     Each time an employee's contract document is modified (e.g. when their salary is raised),  
@@ -91,13 +91,13 @@
 
 {PANEL: Include revisions when Loading document}
 
-__Include a revision by Time__
+**Include a revision by Time**
 
 {CODE:nodejs include_1@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_2@document-extensions\revisions\client-api\session\including.js /}
 
@@ -108,13 +108,13 @@ __Include revisions by Change Vector__
 
 {PANEL: Include revisions when making a Query}
 
-__Include revisions by Time__
+**Include revisions by Time**
 
 {CODE:nodejs include_3@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_4@document-extensions\revisions\client-api\session\including.js /}
 
@@ -133,13 +133,13 @@ __Include revisions by Change Vector__
 
 ---
 
-__Include revisions by Time__
+**Include revisions by Time**
 
 {CODE:nodejs include_5@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_6@document-extensions\revisions\client-api\session\including.js /}
 
@@ -153,12 +153,12 @@ __Include revisions by Change Vector__
 
 | Parameters | Type | Description |
 | - | - | - |
-| __before__ | `string` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
-| __path__ | `string` | <ul><li>The path to the document property that contains <br> __a single change vector__ or __an array of change vectors__ <br>of the revisions to be included.</li></ul> |
+| **before** | `string` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
+| **path** | `string` | <ul><li>The path to the document property that contains <br> **a single change vector** or **an array of change vectors** <br>of the revisions to be included.</li></ul> |
 
 | Return value | |
 | - | - |
-| `object` | <ul><li>When __loading__ a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When __querying__ for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
+| `object` | <ul><li>When **loading** a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When **querying** for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
index 10dffab20f..d7d9e2d5f9 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
@@ -4,21 +4,16 @@
 
 {NOTE: }
 
-* Using the Advanced Session methods you can __retrieve revisions and their metadata__  
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
   from the database for the specified document.  
 
 * These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).   
   
 * In this page:  
-  
-  * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
-
-  * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
-
-  * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
-  
-  * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
-
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
 
 {NOTE/}
 
@@ -30,14 +25,14 @@
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_1_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -55,14 +50,14 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_2_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -80,7 +75,7 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
@@ -89,7 +84,7 @@ __Example__:
 
 ---
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -106,14 +101,14 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_4_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_4_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_4@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
index 89bb8e27ab..519a6e2117 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
@@ -4,20 +4,16 @@
 
 {NOTE: }
 
-* Using the Advanced Session methods you can __retrieve revisions and their metadata__  
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
   from the database for the specified document.  
 
 * These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).
 
-* In this page:
-
-    * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
-
-    * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
-
-    * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
-   
-    * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
 
 {NOTE/}
 
@@ -29,11 +25,11 @@
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_1@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_1@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -56,11 +52,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_2@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_2@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -83,11 +79,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_3@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_3@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -108,11 +104,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_4@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_4@document-extensions\revisions\client-api\session\loading.js /}
 
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
index 6e7c6dd926..84dabbb6bc 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
@@ -24,28 +24,24 @@
 
 {PANEL: Revisions and Counters}
 
-{NOTE: }
-
-__Revisions creation__  
+### Revisions creation:
 
 * A document revision will be created when:   
-  * A new counter is __created__ on the document.  
-  * A counter is __deleted__ from the document.
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
     
 * A revision will Not be created upon modifying the value of an existing [counter](../../document-extensions/counters/overview).
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Stored data__  
+### Stored data:
 
 * A revision that is created for a document that contains counters  
-  will have the `@counters-snapshot` property in its __metadata__.  
+  will have the `@counters-snapshot` property in its **metadata**.  
  
 * This property holds the counters' names and values at the time when the revision was created. 
 
-* The counter's value stored in the  revision's metadata is the __accumulated value__ from all nodes.  
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
   It does not specify the value of the counter on each individual node.
 
 * Sample revision metadata:  
@@ -62,54 +58,44 @@ __Stored data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
-
-__Reverted data__  
+---
 
-* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
-  the counters from the revision are restored to functionality along with their values.  
+### Reverted data:
 
-{NOTE/}
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+the counters from the revision are restored to functionality along with their values.  
 
-{NOTE: }
+---
 
-__Extract counters data from revisions__  
+### Extract counters data from revisions:
 
-* Use [GetMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
-  and then extract the counters' data.  
+Use [GetMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
+and then extract the counters' data.  
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync extract_counters@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
 {CODE-TAB:csharp:Async extract_counters_async@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
 {CODE-TABS/}
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Time Series}
 
-{NOTE: }
-
-__Revisions Creation__
+### Revisions Creation:
 
 * A document revision will be created when:  
-    * A new time series is __created__ on the document.  
-    * A time series is __deleted__ from the document.  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
       (A time series is deleted from a document when all its entries are deleted)
 
 * A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Stored Data__
+### Stored Data:
 
 * A revision that is created for a document that contains time series  
-  will have the `@timeseries-snapshot` property in its __metadata__.  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
 
 * This property does Not hold the time series values data,  
   it only contains the following information for the time when the revision was created:
@@ -141,47 +127,40 @@ __Stored Data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Reverted Data__
+### Reverted Data:
 
 When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
 
-* If the current document __contains__ a time series name as in the revision:
+* If the current document **contains** a time series name as in the revision:
     * The reverted document will keep the time series entries & values as it was in the current document.
     * Time series entries and values from the revision are Not restored.
 
-* If the current document __doesn't contain__ a time series name as in the revision,  
+* If the current document **doesn't contain** a time series name as in the revision,  
   or if the document itself was deleted:  
   * The reverted document will have the time series from the revision  
   * However, the entries count will be 0  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Attachments}
 
-{NOTE: }
-
-__Revisions Creation__
+### Revisions Creation:
 
-* A document revision will be created when:  
-    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is __added__ to the document.  
-    * An attachment is __deleted__ from the document.   
+A document revision will be created when:  
 
-{NOTE/}
+  * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+  * An attachment is **deleted** from the document.   
 
-{NOTE: }
+---
 
-__Stored Data__
+### Stored Data:
 
 * A revision that is created for a document with attachments  
-  will have the `@attachments` property in its __metadata__.
+  will have the `@attachments` property in its **metadata**.
 
-* This property does Not hold the actual attachments, as the files are stored in __separate storage__.  
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
   The property only contains the following information for each attachment the document had when the revision was created:  
   * Attachment file name
   * File content type
@@ -210,74 +189,52 @@ __Stored Data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
-
-__Reverted Data__
+---
 
-* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
-  the attachments are restored to their state when the revision was created.
+### Reverted Data:
 
-{NOTE/}
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+the attachments are restored to their state when the revision was created.
 
 {PANEL/}
 
 {PANEL: Revisions and Replication}
 
-{NOTE: }
-
 * Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
 
 * The revisions will be replicated by all replication types:
-  * [Internal replication](../../server/clustering/replication/replication#internal-replication)
-  * [External replication](../../server/clustering/replication/replication#external-replication)
-  * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+   * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+   * [External replication](../../server/clustering/replication/replication#external-replication)
+   * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
 
 * Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and ETL}
 
-{NOTE: }
-
 * An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
 
 * However, if revisions are enabled on the destination database,  
   whenever the ETL process sends a modified document and the target document is overwritten,  
   a new revision will be created for the document in the target database as expected.  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Backup}
 
-{NOTE: }
-
-* Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
-
-{NOTE/}
+Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
 
 {PANEL/}
 
 {PANEL: Revisions and Data Subscriptions}
 
-{NOTE: }
-
 * Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions Import and Export}
 
-{NOTE: }
-
 * Revisions can be imported and exported with a `.ravendbdump` file:
     * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
     * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
@@ -286,8 +243,6 @@ __Reverted Data__
 
   ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
 
-{NOTE/}
-
 {PANEL/}
 
 ## Related Articles
diff --git a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
index a9053ee6bc..5bb7705f0c 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
@@ -26,11 +26,11 @@
 
 {NOTE: }
 
-__Revisions creation__  
+**Revisions creation**  
 
 * A document revision will be created when:   
-  * A new counter is __created__ on the document.  
-  * A counter is __deleted__ from the document.
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
     
 * A revision will Not be created upon modifying the value of an existing counter.
 
@@ -38,14 +38,14 @@ __Revisions creation__
 
 {NOTE: }
 
-__Stored data__  
+**Stored data**  
 
 * A revision that is created for a document that contains counters  
-  will have the `@counters-snapshot` property in its __metadata__.  
+  will have the `@counters-snapshot` property in its **metadata**.  
  
 * This property holds the counters' names and values at the time when the revision was created. 
 
-* The counter's value stored in the  revision's metadata is the __accumulated value__ from all nodes.  
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
   It does not specify the value of the counter on each individual node.
 
 * Sample revision metadata:  
@@ -66,7 +66,7 @@ __Stored data__
 
 {NOTE: }
 
-__Reverted data__  
+**Reverted data**  
 
 * When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
   the counters from the revision are restored to functionality along with their values.  
@@ -75,7 +75,7 @@ __Reverted data__
 
 {NOTE: }
 
-__Extract counters data from revisions__  
+**Extract counters data from revisions**  
 
 * Use [getMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
   and then extract the counters' data.  
@@ -90,11 +90,11 @@ __Extract counters data from revisions__
 
 {NOTE: }
 
-__Revisions Creation__
+**Revisions Creation**
 
 * A document revision will be created when:  
-    * A new time series is __created__ on the document.  
-    * A time series is __deleted__ from the document.  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
       (A time series is deleted from a document when all its entries are deleted)
 
 * A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
@@ -103,10 +103,10 @@ __Revisions Creation__
 
 {NOTE: }
 
-__Stored Data__
+**Stored Data**
 
 * A revision that is created for a document that contains time series  
-  will have the `@timeseries-snapshot` property in its __metadata__.  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
 
 * This property does Not hold the time series values data,  
   it only contains the following information for the time when the revision was created:
@@ -142,15 +142,15 @@ __Stored Data__
 
 {NOTE: }
 
-__Reverted Data__
+**Reverted Data**
 
 When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
 
-* If the current document __contains__ a time series name as in the revision:
+* If the current document **contains** a time series name as in the revision:
     * The reverted document will keep the time series entries & values as it was in the current document.
     * Time series entries and values from the revision are Not restored.
 
-* If the current document __doesn't contain__ a time series name as in the revision,  
+* If the current document **doesn't contain** a time series name as in the revision,  
   or if the document itself was deleted:  
   * The reverted document will have the time series from the revision  
   * However, the entries count will be 0  
@@ -163,22 +163,22 @@ When a document is [reverted](../../document-extensions/revisions/revert-revisio
 
 {NOTE: }
 
-__Revisions Creation__
+**Revisions Creation**
 
 * A document revision will be created when:  
-    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is __added__ to the document.  
-    * An attachment is __deleted__ from the document.   
+    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+    * An attachment is **deleted** from the document.   
 
 {NOTE/}
 
 {NOTE: }
 
-__Stored Data__
+**Stored Data**
 
 * A revision that is created for a document with attachments  
-  will have the `@attachments` property in its __metadata__.
+  will have the `@attachments` property in its **metadata**.
 
-* This property does Not hold the actual attachments, as the files are stored in __separate storage__.  
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
   The property only contains the following information for each attachment the document had when the revision was created:  
   * Attachment file name
   * File content type
@@ -211,7 +211,7 @@ __Stored Data__
 
 {NOTE: }
 
-__Reverted Data__
+**Reverted Data**
 
 * When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
   the attachments are restored to their state when the revision was created.
diff --git a/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.dotnet.markdown
new file mode 100644
index 0000000000..5911032047
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.dotnet.markdown
@@ -0,0 +1,30 @@
+# Session: How to Customize ID Generation for Entities
+---
+
+{NOTE: }
+
+RavenDB provides sveral ways to create document IDs.  
+
+- To get familiar with basic built-in ID generation strategies 
+  before starting to customize entity identifiers, please see:  
+  [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)  
+
+- To learn about conventions related to ID customization, please see 
+  the following articles, presentnig conventions that can be applied 
+  to all entity types or to a particular type.  
+   - [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)  
+   - [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)  
+
+{NOTE/}
+
+## Related articles
+
+### Document Identifiers
+
+- [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)
+- [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)
+- [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)
+
+### Knowledge Base
+
+- [Document Identifier Generation](../../../server/kb/document-identifier-generation)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown
new file mode 100644
index 0000000000..5911032047
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown
@@ -0,0 +1,30 @@
+# Session: How to Customize ID Generation for Entities
+---
+
+{NOTE: }
+
+RavenDB provides sveral ways to create document IDs.  
+
+- To get familiar with basic built-in ID generation strategies 
+  before starting to customize entity identifiers, please see:  
+  [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)  
+
+- To learn about conventions related to ID customization, please see 
+  the following articles, presentnig conventions that can be applied 
+  to all entity types or to a particular type.  
+   - [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)  
+   - [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)  
+
+{NOTE/}
+
+## Related articles
+
+### Document Identifiers
+
+- [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)
+- [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)
+- [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)
+
+### Knowledge Base
+
+- [Document Identifier Generation](../../../server/kb/document-identifier-generation)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
new file mode 100644
index 0000000000..8d276c383f
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
@@ -0,0 +1,107 @@
+# Configure Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
+  * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
+
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
+
+* After applying the configuration,  
+  revisions are created and purged for a document whenever the document is created, modified, or deleted.  
+
+* To create a revision when there is no configuration defined (or enabled) see: [force revision creation](../../../../document-extensions/revisions/overview#force-revision-creation)
+
+* By default, the operation will be applied to the [default database](../../../../client-api/setting-up-default-database).  
+  To operate on a different database see [switch operations to different database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database).  
+
+* In this page:  
+  * [Replace configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#replace-configuration)  
+  * [Modify configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#modify-configuration)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/configure-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Replace configuration}
+
+* In this example, we create a new `RevisionsConfiguration` for the database.  
+  If revisions configuration already exists in the database - it will be **replaced**.
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync replace_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+{CODE-TAB:csharp:Async replace_configuration_async@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Modify configuration}
+
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync modify_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+{CODE-TAB:csharp:Async modify_configuration_async@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:csharp syntax_1@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
+
+{CODE:csharp syntax_2@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+
+| Property | Type | Description |
+| - | - | - |
+| **Default** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `Collections`. |
+| **Collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+
+{CODE:csharp syntax_3@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
+
+<a id="revisions-collection-configuration-object" />
+
+| Property | Type | Description |
+| - | - | - |
+| **MinimumRevisionsToKeep** | `long` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **MinimumRevisionAgeToKeep** | `TimeSpan` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **MaximumRevisionsToDeleteUponDocumentUpdate** | `long` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **PurgeOnDelete** | `bool` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **Disabled** | `bool` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+* [What Is a Collection](../../../../client-api/faq/what-is-a-collection)
+* [What Are Operations](../../../../client-api/operations/what-are-operations)
+* [Switch Operation Database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database)
+* [Setting Up a Default Database](../../../../client-api/setting-up-default-database)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
+* [Manage Database Group](../../../../studio/database/settings/manage-database-group)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.java.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.java.markdown
new file mode 100644
index 0000000000..d0975175b6
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.java.markdown
@@ -0,0 +1,155 @@
+# Configure Revisions Operation
+
+---
+
+{NOTE: }
+
+* [Revisions](../../../../document-extensions/revisions/overview) are snapshots of documents that 
+  are taken automatically each time a document is updated or deleted.  
+
+* Revisions can be stored indefinitely, or they can be deleted when certain conditions are met. These conditions can be set 
+  using the Configure Revisions Operation.  
+
+* In this page:  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/configure-revisions#syntax)  
+      * [RevisionsCollectionConfiguration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#revisionscollectionconfiguration)  
+      * [RevisionsConfiguration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#revisionsconfiguration)  
+      * [ConfigureRevisionsOperation](../../../../document-extensions/revisions/client-api/operations/configure-revisions#configurerevisionsoperation)  
+  * [Example](../../../../document-extensions/revisions/client-api/operations/configure-revisions#example)  
+
+{NOTE/}
+
+---
+
+{PANEL: Syntax}
+
+The ConfigureRevisionsOperation modifies the revisions settings for a particular [database](../../../../studio/database/settings/manage-database-group). 
+Within that database, each [collection](../../../../client-api/faq/what-is-a-collection) can have its own separate revisions 
+settings.  
+
+To configure the revisions settings for a database and/or the collections in that database, follow these steps:  
+
+[1.](../../../../document-extensions/revisions/client-api/operations/configure-revisions#revisionscollectionconfiguration) 
+Create a RevisionsCollectionConfiguration` object for each desired collection.  
+
+[2.](../../../../document-extensions/revisions/client-api/operations/configure-revisions#revisionsconfiguration) 
+Put those `RevisionsCollectionConfiguration` objects in a `RevisionsConfiguration` object.  
+
+[3.](../../../../document-extensions/revisions/client-api/operations/configure-revisions#configurerevisionsoperation) 
+Send that RevisionsConfiguration` to the server.  
+
+---
+
+### RevisionsCollectionConfiguration
+
+This object contains the four revisions settings for a particular collection:  
+
+{CODE-BLOCK: java}
+public class RevisionsCollectionConfiguration
+{
+    private boolean disabled;
+    private Duration minimumRevisionAgeToKeep;
+    private Long minimumRevisionsToKeep;
+    private boolean purgeOnDelete;
+}
+{CODE-BLOCK/}
+
+| Configuration Option | Description | Default |
+| - | - | - |
+| **minimumRevisionsToKeep** | The minimum number of revisions to keep per document | `null` - unlimited |
+| **minimumRevisionAgeToKeep** | The minimum amount of time to keep each revision. [Format of `Duration`](https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html). | `null` - unlimited |
+| **disabled** | Indicates whether to completely disable revisions for documents in this collection | `false` |
+| **purgeOnDelete** | When a document is deleted, this indicates whether all of its revisions should be deleted as well | `false` |
+
+A revision is only deleted if both the `minimumRevisionsToKeep` for that document is exceeded, **and** the revision is 
+older than the `minimumRevisionAgeToKeep` limit. The oldest revisions are deleted first.  
+
+* By default both these options are set to `null`, meaning that an unlimited number of revisions will be saved 
+indefinitely.  
+
+* If only `minimumRevisionsToKeep` is null, revisions will be deleted only when they are older than 
+`minimumRevisionAgeToKeep`.  
+
+* If only `minimumRevisionAgeToKeep` is null, revisions will be deleted each time there are more revisions than 
+`minimumRevisionsToKeep`.  
+
+These deletions will only take place _when a new revision is added_ to a document. Until a new revision is added, that 
+document's revisions can exceed these limits.  
+
+---
+
+### RevisionsConfiguration
+
+This object contains a `Map` of revision configurations for each collection in the database, plus an optional default 
+configuration.  
+
+{CODE-BLOCK: java}
+public class RevisionsConfiguration
+{
+     private Map<String, RevisionsCollectionConfiguration> collections;
+     private RevisionsCollectionConfiguration defaultConfig;
+}
+{CODE-BLOCK/}
+
+| Property | Description | Default |
+| - | - | - |
+| **collections** | A map in which the keys are collection names, and the values are the corresponding configurations | `null` |
+| **defaultConfig** | An optional default configuration that applies to any collection not listed in `collections` | `null` |
+
+Note that when this object is sent to the server, it overrides the configurations for **all** collections, including all existing 
+configurations currently on the server. If a collection is not listed in `collections` and `defaultConfig` has not been set, the 
+default values listed in the table [above](../../../../document-extensions/revisions/client-api/operations/configure-revisions#revisionscollectionconfiguration) 
+are applied.  
+
+---
+
+### ConfigureRevisionsOperation
+
+Lastly, the operation itself sends the `RevisionsConfiguration` to the server, overriding **all** existing collection configurations. 
+You'll want to store these configurations on the client-side so they don't have to be created from scratch each time you want to 
+modify them.  
+
+{CODE-BLOCK: java}
+public ConfigureRevisionsOperation(RevisionsConfiguration configuration);
+{CODE-BLOCK/}
+
+| Parameter | Description |
+| - | - |
+| **configuration** | The new revision settings for a particular database |
+
+{PANEL/}
+
+{PANEL: Example}
+
+The following code sample updates the settings of the Document Store's [default database](../../../../client-api/setting-up-default-database) 
+- which in this case is a database named "Northwind". To update the configuration of different database, use the 
+[`forDatabase()` method](../../../../client-api/operations/how-to/switch-operations-to-a-different-database).
+
+{CODE:java operation@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.java /}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+* [What Is a Collection](../../../../client-api/faq/what-is-a-collection)
+* [What Are Operations](../../../../client-api/operations/what-are-operations)
+* [Switch Operation Database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database)
+* [Setting Up a Default Database](../../../../client-api/setting-up-default-database)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
+* [Manage Database Group](../../../../studio/database/settings/manage-database-group)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
new file mode 100644
index 0000000000..52da103262
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
@@ -0,0 +1,101 @@
+# Configure Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
+  * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
+
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
+
+* After applying the configuration,  
+  revisions are created and purged for a document whenever the document is created, modified, or deleted.  
+
+* To create a revision when there is no configuration defined (or enabled) see: [force revision creation](../../../../document-extensions/revisions/overview#force-revision-creation)
+
+* By default, the operation will be applied to the [default database](../../../../client-api/setting-up-default-database).  
+  To operate on a different database see [switch operations to different database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database).  
+
+* In this page:  
+  * [Replace configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#replace-configuration)  
+  * [Modify configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#modify-configuration)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/configure-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Replace configuration}
+
+* In this example, we create a new `RevisionsConfiguration` for the database.  
+  If revisions configuration already exists in the database - it will be **replaced**.
+
+{CODE:nodejs replace_configuration@documentExtensions\revisions\client-api\operations\configureRevisions.js /}
+
+{PANEL/}
+
+{PANEL: Modify configuration}
+
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
+
+{CODE:nodejs modify_configuration@documentExtensions\revisions\client-api\operations\configureRevisions.js /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:nodejs syntax_1@documentExtensions\revisions\client-api\operations\configureRevisions.js /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
+
+{CODE:nodejs syntax_2@documentExtensions\revisions\client-api\operations\configureRevisions.js /}
+
+| Property | Type | Description |
+| - | - | - |
+| **defaultConfig** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
+| **collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+
+{CODE:nodejs syntax_3@documentExtensions\revisions\client-api\operations\configureRevisions.js /}
+
+<a id="revisions-collection-configuration-object" />
+
+| Property | Type | Description |
+| - | - | - |
+| **minimumRevisionsToKeep** | `number` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **minimumRevisionAgeToKeep** | `string` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **maximumRevisionsToDeleteUponDocumentUpdate** | `number` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **purgeOnDelete** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **disabled** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+* [What Is a Collection](../../../../client-api/faq/what-is-a-collection)
+* [What Are Operations](../../../../client-api/operations/what-are-operations)
+* [Switch Operation Database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database)
+* [Setting Up a Default Database](../../../../client-api/setting-up-default-database)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
+* [Manage Database Group](../../../../studio/database/settings/manage-database-group)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown
new file mode 100644
index 0000000000..b3644c0e1f
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown
@@ -0,0 +1,99 @@
+# Configure Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
+  * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
+
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
+
+* After applying the configuration,  
+  revisions are created and purged for a document whenever the document is created, modified, or deleted.  
+
+* To create a revision when there is no configuration defined (or enabled) see: [force revision creation](../../../../document-extensions/revisions/overview#force-revision-creation)
+
+* By default, the operation will be applied to the [default database](../../../../client-api/setting-up-default-database).  
+  To operate on a different database see [switch operations to different database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database).  
+
+* In this page:  
+  * [Replace configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#replace-configuration)  
+  * [Modify configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#modify-configuration)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/configure-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Replace configuration}
+
+In this example, we create a new `RevisionsConfiguration` for the database.  
+If revisions configuration already exists in the database - it will be **replaced**.
+{CODE:python replace_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Modify configuration}
+
+In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
+{CODE:python modify_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:python syntax_1@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
+
+{CODE:python syntax_2@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+| Property | Type | Description |
+| - | - | - |
+| **default_config** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
+| **collections** | `Dict[str, RevisionsCollectionConfiguration]` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+
+{CODE:python syntax_3@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+<a id="revisions-collection-configuration-object" />
+
+| Property | Type | Description |
+| - | - | - |
+| **minimum_revisions_to_keep** | `int` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `None` = no limit </li></ul> |
+| **minimum_revisions_age_to_keep** | `timedelta` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `None` = no age limit</li><ul> |
+| **disabled** | `bool` | <ul><li>`fFalse` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`True` - No revisions will be created or purged.</li></ul> |
+| **purge_on_delete** | `bool` | <ul><li>`False` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`True` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **maximum_revisions_to_delete_upon_document_creation** | `int` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `None` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+* [What Is a Collection](../../../../client-api/faq/what-is-a-collection)
+* [What Are Operations](../../../../client-api/operations/what-are-operations)
+* [Switch Operation Database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database)
+* [Setting Up a Default Database](../../../../client-api/setting-up-default-database)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
+* [Manage Database Group](../../../../studio/database/settings/manage-database-group)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.dotnet.markdown
new file mode 100644
index 0000000000..f5b786693c
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.dotnet.markdown
@@ -0,0 +1,111 @@
+# Get Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `GetRevisionsOperation` to GET the document's revisions.
+
+* To only COUNT the number of revisions without getting them, use the [GetCountFor](../../../../document-extensions/revisions/client-api/session/counting) session method.
+
+* In this page:  
+  * [Get all revisions](../../../../document-extensions/revisions/client-api/operations/get-revisions#get-all-revisions)  
+  * [Paging results](../../../../document-extensions/revisions/client-api/operations/get-revisions#paging-results)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/get-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync getAllRevisions@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TAB:csharp:Async getAllRevisions_async@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Paging results}
+
+* Get and process revisions, one page at a time:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync getRevisionsWithPaging@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TAB:csharp:Async getRevisionsWithPaging_async@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TABS/}
+
+* The document ID, start & page size can be wrapped in a `Parameter` object:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync getRevisionsWithPagingParams@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TAB:csharp:Async getRevisionsWithPagingParams_async@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+Available overloads:
+
+{CODE-BLOCK: csharp}
+
+// Get all revisions for the specified document:
+public GetRevisionsOperation(string id);
+
+// Page revisions:
+public GetRevisionsOperation(string id, int start, int pageSize);
+public GetRevisionsOperation(Parameters parameters)
+
+{CODE-BLOCK/}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | `string` | Document ID for which to get revisions |
+| **start** | `int` | Revision number to start from |
+| **pageSize** | `int` | Number of revisions to get |
+| **parameters** | `Parameters` | An object that wraps `Id`, `Start`, and `PageSize` (see below) |
+
+{CODE-BLOCK: csharp}
+public class Parameters
+{
+    public string Id { get; set; }     // Document ID for which to get revisions
+    public int? Start { get; set; }    // Revision number to start from
+    public int? PageSize { get; set; } // Number of revisions to get
+}
+{CODE-BLOCK/}
+
+| Return value of `store.Operations.Send(getRevisionsOp)` | |
+| - | - |
+| `RevisionsResult<T>` | Object with revisions results |
+
+
+{CODE-BLOCK: csharp}
+public class RevisionsResult<T>
+{  
+  public List<T> Results { get; set; }  // The retrieved revisions
+  public int TotalResults { get; set; } // Total number of revisions that exist for the document
+}
+{CODE-BLOCK/}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.js.markdown
new file mode 100644
index 0000000000..269346cb87
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.js.markdown
@@ -0,0 +1,71 @@
+# Get Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `GetRevisionsOperation` to GET the document's revisions.
+
+* To only COUNT the number of revisions without getting them, use the [getCountFor](../../../../document-extensions/revisions/client-api/session/counting) session method.
+
+* In this page:  
+  * [Get all revisions](../../../../document-extensions/revisions/client-api/operations/get-revisions#get-all-revisions)  
+  * [Paging results](../../../../document-extensions/revisions/client-api/operations/get-revisions#paging-results)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/get-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+{CODE:nodejs getAllRevisions@documentExtensions\revisions\client-api\operations\getRevisions.js /}
+
+{PANEL/}
+
+{PANEL: Paging results}
+
+* Get and process revisions, one page at a time:
+
+{CODE:nodejs getRevisionsWithPaging@documentExtensions\revisions\client-api\operations\getRevisions.js /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:nodejs syntax_1@documentExtensions\revisions\client-api\operations\getRevisions.js /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | `string` | Document ID for which to get revisions |
+| **parameters** | `object` | An object that wraps `start` and `pageSize` (see below) |
+
+{CODE:nodejs syntax_2@documentExtensions\revisions\client-api\operations\getRevisions.js /}
+
+| Return value of `store.operations.send(getRevisionsOp)` | |
+| - | - |
+| `RevisionsResult` | Object with revisions results |
+
+{CODE:nodejs syntax_3@documentExtensions\revisions\client-api\operations\getRevisions.js /}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown
new file mode 100644
index 0000000000..e2e17a5e65
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown
@@ -0,0 +1,65 @@
+# Get Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `GetRevisionsOperation` to GET the document's revisions.
+
+* To only COUNT the number of revisions without getting them, use the [get_count_for](../../../../document-extensions/revisions/client-api/session/counting) session method.
+
+* In this page:  
+  * [Get all revisions](../../../../document-extensions/revisions/client-api/operations/get-revisions#get-all-revisions)  
+  * [Paging results](../../../../document-extensions/revisions/client-api/operations/get-revisions#paging-results)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/get-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+{CODE:python getAllRevisions@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Paging results}
+
+* Get and process revisions, one page at a time:
+  {CODE:python getRevisionsWithPaging@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+* The document ID, start & page size can be wrapped in a `Parameters` object:
+  {CODE:python getRevisionsWithPagingParams@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | `str` | ID of the document to get revisions for |
+| **start** | `int` | Revision number to start from |
+| **page_size** | `int` | Number of revisions to get |
+| **parameters** | `Parameters` | An object that wraps `id`, `start`, and `page_size` |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
new file mode 100644
index 0000000000..150528901f
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
@@ -0,0 +1,68 @@
+# Revisions Client API Overview
+
+---
+
+{NOTE: }
+
+* For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).  
+
+* Document revisions can be managed using [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.  
+
+* From the **Client API**, revisions can be configured and managed by:  
+    * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
+    * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Store Operations}
+
+* [ConfigureRevisionsOperation](../../../document-extensions/revisions/client-api/operations/configure-revisions) - apply a revision configuration
+* [ConfigureRevisionsForConflictsOperation](../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration) - manage conflicting documents revisions
+* [GetRevisionsOperation](../../../document-extensions/revisions/client-api/operations/get-revisions) - get revisions
+
+{PANEL/}
+
+{PANEL: Revisions Session methods}
+
+* **Get revisions**:  
+
+  * [GetFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
+  * [GetMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
+  * [Get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
+  * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `GetFor`, `GetMetadataFor`, and `Get`.
+
+---
+
+* **Include revisions**:  
+
+  * [IncludeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `Session.Load` or `Session.Query`.  
+  * [RawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
+
+---
+
+* **Count revisions**:  
+
+  * [GetCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.  
+
+---
+
+* **Force revision creation**:
+
+    * [ForceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.java.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.java.markdown
new file mode 100644
index 0000000000..a9022b7278
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.java.markdown
@@ -0,0 +1,64 @@
+# Revisions API Overview
+
+---
+
+{NOTE: }
+
+* The Revisions client API includes a set of session methods and store operations 
+  that you can use to [configure](../../../document-extensions/revisions/overview#revisions-configuration), 
+  manage and use document revisions.  
+* Learn about revisions here: [Docuument Revisions Overview](../../../document-extensions/revisions/overview)  
+
+* In this page:  
+  * [Revisions Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
+  * [Revisions Session methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Store Operations}
+
+* [Creating a Revisions Configuration](../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+   * [ConfigureRevisionsOperation](../../../document-extensions/revisions/client-api/operations/configure-revisions#section)  
+     Use this operation to apply a 
+     [Revisions configuration](../../../document-extensions/revisions/overview#revisions-configuration) 
+     to your database.  
+* [Getting and Counting Revisions](../../../document-extensions/revisions/client-api/operations/get-revisions)  
+   * [GetRevisionsOperation](../../../document-extensions/revisions/client-api/operations/get-revisions#getrevisionsoperation)  
+     Use this operation to Get and Count Revisions.  
+
+{PANEL/}
+
+{PANEL: Revisions Session methods}
+
+* [Loading revisions and their metadata](../../../document-extensions/revisions/client-api/session/loading)  
+   * [GetFor](../../../document-extensions/revisions/client-api/session/loading#getfor)  
+     Use this method to retrieve all the revisions that are kept for a specified document.  
+   * [GetMetadataFor](../../../document-extensions/revisions/client-api/session/loading#getmetadatafor)  
+     Use this method to retrieve metadata for all revisions kept for a specified document.  
+   * [Get](../../../document-extensions/revisions/client-api/session/loading#get)  
+     Use this method to retrieve revisions by change vector or creation time.  
+* [Counting Revisions](../../../document-extensions/revisions/client-api/session/counting)  
+   * [GetCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor)  
+     Use this method to count the revisions kept for a document.  
+* [Including revisions](../../../document-extensions/revisions/client-api/session/including)  
+   * [IncludeRevisions](../../../document-extensions/revisions/client-api/session/including#section)  
+     Use this method to include document revisions when retrieving documents via `Session.Load` or `Session.Query`.  
+   * [RawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery)  
+     Learn here how to include revisions with documents retrieved via raw queries.  
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
new file mode 100644
index 0000000000..57c6fb77e7
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
@@ -0,0 +1,68 @@
+# Revisions Client API Overview
+
+---
+
+{NOTE: }
+
+* For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).
+
+* Document revisions can be managed using [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.
+
+* From the **Client API**, revisions can be configured and managed by:
+    * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)
+    * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Store Operations}
+
+* [ConfigureRevisionsOperation](../../../document-extensions/revisions/client-api/operations/configure-revisions) - apply a revision configuration
+* [ConfigureRevisionsForConflictsOperation](../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration) - manage conflicting documents revisions
+* [GetRevisionsOperation](../../../document-extensions/revisions/client-api/operations/get-revisions) - get revisions
+
+{PANEL/}
+
+{PANEL: Revisions Session methods}
+
+* **Get revisions**:
+
+    * [getFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
+    * [getMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
+    * [get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
+    * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `getFor`, `getMetadataFor`, and `get`.
+
+---
+
+* **Include revisions**:
+
+    * [includeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `session.load` or `session.query`.
+    * [rawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
+
+---
+
+* **Count revisions**:
+
+    * [getCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.
+
+---
+
+* **Force revision creation**:
+
+    * [forceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../document-extensions/revisions/overview)
+* [Revert Revisions](../../../document-extensions/revisions/revert-revisions)
+* [Revisions and Other Features](../../../document-extensions/revisions/revisions-and-other-features)
+
+### Studio
+
+* [Settings: Document Revisions](../../../studio/database/settings/document-revisions)
+* [Document Extensions: Revisions](../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown
new file mode 100644
index 0000000000..3252ef44bf
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown
@@ -0,0 +1,66 @@
+# Revisions Client API Overview
+
+---
+
+{NOTE: }
+
+* For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).  
+
+* Document revisions can be managed using [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.  
+
+* Find below a list of methods that revisions can be configured and managed by.  
+    * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
+    * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions `store` Operations}
+
+* [ConfigureRevisionsOperation](../../../document-extensions/revisions/client-api/operations/configure-revisions) - apply a revision configuration
+* [GetRevisionsOperation](../../../document-extensions/revisions/client-api/operations/get-revisions) - get revisions
+
+{PANEL/}
+
+{PANEL: Revisions `session` methods}
+
+#### Get revisions:  
+
+* Use [get_for](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) 
+  to retrieve **all** revisions kept for a document.  
+* Use [get_metadata_for](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) 
+  to retrieve **metadata** for all revisions kept for a document.  
+* Use [get_by_before_date ](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) 
+  to retrieve revisions by **change vector** or **creation time**.  
+* Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) 
+  about **lazy versions** of `get_for`, `get_metadata_for`, and `get_by_before_date`.  
+
+---
+
+#### Count revisions:  
+
+Use [get_count_for](../../../document-extensions/revisions/client-api/session/counting#getcountfor) 
+to get the number of revisions kept for a document.  
+
+---
+
+#### Force revision creation:
+
+Read [here](../../../document-extensions/revisions/overview#force-revision-creation-via-api) 
+about creating a revision even if revision configuration is disabled.  
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.dotnet.markdown
new file mode 100644
index 0000000000..89a12d9f5d
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.dotnet.markdown
@@ -0,0 +1,58 @@
+# Count Revisions
+
+---
+
+{NOTE: }
+
+* You can get the number of revisions a document has by using the advance session method `GetCountFor`.
+
+* In this page:  
+   * [Get revisions count](../../../../document-extensions/revisions/client-api/session/counting#get-revisions-count)
+   * [syntax](../../../../document-extensions/revisions/client-api/session/counting#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Get revisions count}
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync getCount@DocumentExtensions\Revisions\ClientAPI\Session\Counting.cs /}
+{CODE-TAB:csharp:Async getCount_async@DocumentExtensions\Revisions\ClientAPI\Session\Counting.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE syntax@DocumentExtensions\Revisions\ClientAPI\Session\Counting.cs /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | string | Document ID for which revisions are counted |
+
+| Return value | |
+| - | - |
+| `long` | The number of revisions for the specified document |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.js.markdown
new file mode 100644
index 0000000000..523de27c6b
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.js.markdown
@@ -0,0 +1,55 @@
+# Count Revisions
+
+---
+
+{NOTE: }
+
+* You can get the number of revisions a document has by using the advance session method `getCountFor`.
+
+* In this page:  
+   * [Get revisions count](../../../../document-extensions/revisions/client-api/session/counting#get-revisions-count)
+   * [syntax](../../../../document-extensions/revisions/client-api/session/counting#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Get revisions count}
+
+{CODE:nodejs getCount@documentExtensions\revisions\client-api\session\getCount.js /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:nodejs syntax@documentExtensions\revisions\client-api\session\getCount.js /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | string | Document ID for which revisions are counted |
+
+| Return value | |
+| - | - |
+| `Promise` | A `Promise` resolving to the number of revisions for the specified document |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown
new file mode 100644
index 0000000000..dda9c8405c
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown
@@ -0,0 +1,55 @@
+# Count Revisions
+
+---
+
+{NOTE: }
+
+* You can get the number of revisions a document has by using the session `advanced` method `get_count_for`.
+
+* In this page:  
+   * [Get revisions count](../../../../document-extensions/revisions/client-api/session/counting#get-revisions-count)
+   * [syntax](../../../../document-extensions/revisions/client-api/session/counting#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Get revisions count}
+
+{CODE:python getCount@DocumentExtensions\Revisions\ClientAPI\Session\Counting.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:python syntax@DocumentExtensions\Revisions\ClientAPI\Session\Counting.py /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id_** | `str` | The ID of the document that revisions are counted for |
+
+| Return value | |
+| - | - |
+| `int` | The number of revisions for the specified document |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
new file mode 100644
index 0000000000..d7d9e2d5f9
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
@@ -0,0 +1,140 @@
+# Get Revisions
+
+---
+
+{NOTE: }
+
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
+  from the database for the specified document.  
+
+* These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).   
+  
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+* Use `GetFor` to retrieve all of the revisions currently kept for the specified document.
+
+---
+
+**Example**:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TAB:csharp:Async example_1_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TABS/}
+
+**Syntax**:
+
+{CODE syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+
+| Parameters | Type | Description |
+| - | - |- |
+| **id** | `string` | Document ID for which to retrieve revisions |
+| **start** | `int` | First revision to retrieve, used for paging |
+| **pageSize** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions metadata}
+
+* Use `GetMetadataFor` to retrieve the metadata for all the revisions currently kept for the specified document.
+
+---
+
+**Example**:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TAB:csharp:Async example_2_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TABS/}
+
+**Syntax**:
+
+{CODE syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+
+| Parameters | Type | Description |
+| - | - |- |
+| **id** | `string` | Document ID for which to retrieve revisions' metadata |
+| **start** | `int` | First revision to retrieve metadata for, used for paging |
+| **pageSize** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions by creation time}
+
+* Use `Get` to retrieve a revision by its **creation time**.
+
+---
+
+**Example**:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TAB:csharp:Async example_3_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TABS/}
+
+---
+
+**Syntax**:
+
+{CODE syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | `string` | Document ID for which to retrieve the revision by creation time |
+| **date** | `DateTime ` | The revision's creation time |
+
+{PANEL/}
+
+{PANEL: Get revisions by change vector}
+
+* Use `Get` to retrieve a revision or multiple revisions by their **change vectors**.  
+
+---
+
+**Example**:
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync example_4_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TAB:csharp:Async example_4_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+{CODE-TABS/}
+
+**Syntax**:
+
+{CODE syntax_4@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **changeVector** | `string` | The revision's change vector |
+| **changeVectors** | `IEnumerable<string>` | Change vectors of multiple revisions |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.java.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.java.markdown
new file mode 100644
index 0000000000..271fcb4115
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.java.markdown
@@ -0,0 +1,82 @@
+# Get Revisions
+
+There are a few methods that allow you to retrieve revisions from a database:   
+
+- **session.advanced().revisions().getFor** 
+    - can be used to return all previous revisions for a specified document   
+- **session.advanced().revisions().getMetadataFor**
+    - can be used to return metadata of all previous revisions for a specified document  
+- **session.advanced().revisions().get**
+    - can be used to retrieve a revision(s) using a change vector(s)  
+
+{PANEL:getFor}
+
+### Syntax
+
+{CODE:java syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **id** | String | document ID for which the revisions will be returned for |
+| **start** | int | used for paging |
+| **pageSize** | int | used for paging |
+
+### Example
+
+{CODE:java example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+{PANEL/}
+
+{PANEL:getMetadataFor}
+
+### Syntax
+
+{CODE:java syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **id** | String | document ID for which the revisions will be returned for |
+| **start** | int | used for paging |
+| **pageSize** | int | used for paging |
+
+### Example
+
+{CODE:java example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+{PANEL/}
+
+{PANEL:get}
+
+### Syntax
+
+{CODE:java syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+| Parameters | | |
+| ------------- | ------------- | ----- |
+| **changeVector** or **changeVectors**| `String` or `String[]` | one or many revision change vectors |
+
+### Example
+
+{CODE:java example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.java /}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
new file mode 100644
index 0000000000..b968093757
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
@@ -0,0 +1,144 @@
+# Get Revisions
+
+---
+
+{NOTE: }
+
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
+  from the database for the specified document.  
+
+* These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).
+
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+* Use `getFor` to retrieve all of the revisions currently kept for the specified document.
+
+---
+
+**Example**:
+
+{CODE:nodejs example_1@documentExtensions\revisions\client-api\session\loading.js /}
+
+**Syntax**:
+
+{CODE:nodejs syntax_1@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Parameters | Type | Description |
+| - | - |- |
+| **id** | string | Document ID for which to retrieve revisions |
+| **options** | options object | Used for paging |
+
+{CODE:nodejs syntax_5@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Return value | |
+| - | - |
+| `Promise` | A `Promise` resolving to the document's revisions. <br>Revisions will be ordered by most recent revision first. |
+
+{PANEL/}
+
+{PANEL: Get revisions metadata}
+
+* Use `getMetadataFor` to retrieve the metadata for all the revisions currently kept for the specified document.
+
+---
+
+**Example**:
+
+{CODE:nodejs example_2@documentExtensions\revisions\client-api\session\loading.js /}
+
+**Syntax**:
+
+{CODE:nodejs syntax_2@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Parameters | Type | Description |
+| - | - |- |
+| **id** | string | Document ID for which to retrieve revisions' metadata |
+| **options** | options object | Used for paging |
+
+{CODE:nodejs syntax_5@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Return value | |
+| - | - |
+| `Promise` | A `Promise` resolving to a list of the revisions metadata. |
+
+{PANEL/}
+
+{PANEL: Get revisions by creation time}
+
+* Use `get` to retrieve a revision by its **creation time**.
+
+---
+
+**Example**:
+
+{CODE:nodejs example_3@documentExtensions\revisions\client-api\session\loading.js /}
+
+**Syntax**:
+
+{CODE:nodejs syntax_3@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | string | Document ID for which to retrieve the revision by creation time |
+| **date** | string | The revision's creation time |
+
+| Return value | |
+| - | - |
+| `Promise` | A `Promise` resolving to the revision.<br>If no revision was created at the specified time, then the first revision that precedes it will be returned. |
+
+{PANEL/}
+
+{PANEL: Get revisions by change vector}
+
+* Use `get` to retrieve a revision or multiple revisions by their **change vectors**.
+
+---
+
+**Example**:
+
+{CODE:nodejs example_4@documentExtensions\revisions\client-api\session\loading.js /}
+
+**Syntax**:
+
+{CODE:nodejs syntax_4@documentExtensions\revisions\client-api\session\loading.js /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **changeVector** | string | The revision's change vector |
+| **changeVectors** | string[] | Change vectors of multiple revisions |
+
+| Return value | |
+| - | - |
+| `Promise` | A `Promise` resolving to the matching revision(s). |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown
new file mode 100644
index 0000000000..6809e2cc8d
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown
@@ -0,0 +1,110 @@
+# Get Revisions
+
+---
+
+{NOTE: }
+
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
+  from the database for the specified document.  
+
+* These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).   
+  
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+Use `get_for` to retrieve all of the revisions currently kept for the specified document.
+
+* **Example**:
+  {CODE:python example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameters | Type | Description |
+     | - | - |- |
+     | **id_** | `str` | Document ID for which to retrieve revisions |
+     | **object_type** | `Type[_T]` | The type of the object whose revisions we want to retrieve |
+     | **start** | `int` | First revision to retrieve, used for paging |
+     | **page_size** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions metadata}
+
+Use `get_metadata_for` to retrieve the metadata for all the revisions currently kept for the specified document.
+
+* **Example**:
+  {CODE:python example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameters | Type | Description |
+     | - | - |- |
+     | **id_** | `str` | Document ID for which to retrieve revisions' metadata |
+     | **start** | `int` | First revision to retrieve metadata for, used for paging |
+     | **page_size** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions by creation time}
+
+Use `get_by_before_date` to retrieve a revision by its **creation time**.
+
+* **Example**:
+  {CODE:python example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameter | Type | Description |
+     | - | - | - |
+     | **id_** | `str` | The ID of the document whose revisions we want to retrieve by creation time |
+     | **before_date** | `datetime.datetime` | Revision creation time |
+     | **object_type** | `Type[_T]` | The type of the object whose revisions we want to retrieve |
+
+
+{PANEL/}
+
+{PANEL: Get revisions by change vector}
+
+To retrieve a revision or multiple revisions by **change vectors**, get the 
+change vector using `get_metadata_for` and the revisions using `get_by_change_vector`.  
+
+* **Example**:
+  {CODE:python example_4_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_4@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameter | Type | Description |
+     | - | - | - |
+     | **change_vectors** | `List[str]` | A list of change vector strings |
+     | **object_type** | `Type[_T]` | The types of the objects whose revisions we want to retrieve |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/StudioRefresh.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/StudioRefresh.png
new file mode 100644
index 0000000000..77a01dc7be
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/StudioRefresh.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.png
new file mode 100644
index 0000000000..8487a3c648
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.snag
new file mode 100644
index 0000000000..65ab826c7d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/import-from-live-server.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.png
new file mode 100644
index 0000000000..1cd751f2b5
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.snag
new file mode 100644
index 0000000000..08aae6f7e3
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revert-revisions-scenario.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions.png
new file mode 100644
index 0000000000..8347b8ed6b
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.png
new file mode 100644
index 0000000000..d02fe2a4ec
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.snag
new file mode 100644
index 0000000000..46f8cece0b
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-document.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.png
new file mode 100644
index 0000000000..f725f5014b
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.snag
new file mode 100644
index 0000000000..0db6a56f31
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_create-revision-manually.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.png
new file mode 100644
index 0000000000..0a2d42bb63
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.snag
new file mode 100644
index 0000000000..8800f19ce5
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_document-created.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.png
new file mode 100644
index 0000000000..85c2278f2d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.snag
new file mode 100644
index 0000000000..3146832329
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_enable-revisions.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.png
new file mode 100644
index 0000000000..730a9505de
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.snag
new file mode 100644
index 0000000000..ac148466ff
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_modify-document.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.png
new file mode 100644
index 0000000000..263521c478
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.snag
new file mode 100644
index 0000000000..302e020ba9
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_restored.snag differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.png b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.png
new file mode 100644
index 0000000000..33d11b5a2d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.snag b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.snag
new file mode 100644
index 0000000000..a6793eaabf
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/images/revisions_revisions-bin.snag differ
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/overview.dotnet.markdown
similarity index 100%
rename from Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.markdown
rename to Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/overview.dotnet.markdown
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown
new file mode 100644
index 0000000000..190708ae4b
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown
@@ -0,0 +1,304 @@
+# Document Revisions Overview
+---
+
+{NOTE: }
+
+* **Document Revisions** are snapshots of documents and their extensions.  
+   * Revisions can be created for documents **automatically** when the documents 
+     are created, modified, or deleted.  
+   * Revisions can also be created for documents [manually](../../document-extensions/revisions/overview#force-revision-creation).  
+
+* Revisions will be automatically **created** and **purged** for a document 
+  only if the Revisions feature is enabled for the document's collection.  
+  To enable or disable the Revisions feature for collections, and to set 
+  limits for the number of revisions that can be kept per document, 
+  apply a [Revisions configuration](../../document-extensions/revisions/overview#revisions-configuration) 
+  to all and/or specific collections.  
+
+* The trail of revisions created for a document can be inspected to track the changes 
+  made in the document over time, and the document's live version can be reverted to any 
+  of its recorded revisions.  
+
+    {INFO: }
+    Tracking document revisions allows you, for example, to check how an employee's 
+    contract has changed over time, restore a single corrupted document without requiring 
+    a backup file, or conduct a full-scale audit of your data.  
+    {INFO/}
+
+* Revisions and their configuration can be managed via Client API methods or using Studio.  
+
+* In this page:  
+  * [Revisions Configuration](../../document-extensions/revisions/overview#revisions-configuration)  
+     * [Default Settings and Collection-Specific Configurations](../../document-extensions/revisions/overview#default-settings-and-collection-specific-configurations)  
+     * [Defining a Revisions Configuration](../../document-extensions/revisions/overview#defining-a-revisions-configuration)  
+     * [Revisions Configuration Options](../../document-extensions/revisions/overview#revisions-configuration-options)  
+     * [Revisions Configuration Execution](../../document-extensions/revisions/overview#revisions-configuration-execution)  
+     * [Enabling and Disabling Revisions for Existing Documents](../../document-extensions/revisions/overview#enabling-and-disabling-revisions-for-existing-documents)  
+  * [How it Works](../../document-extensions/revisions/overview#how-it-works)  
+  * [Revisions Storage](../../document-extensions/revisions/overview#revisions-storage)  
+  * [Force Revision Creation](../../document-extensions/revisions/overview#force-revision-creation)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Configuration}
+
+By default, the Revisions feature is **Disabled** for all collections: no revisions 
+are created or purged for any document.  
+You can change this behavior, and other Revisions settings, by applying 
+a Revisions Configuration to the database.  
+
+The Revisions configuration enables or disables the creation and purging 
+of revisions for documents, and optionally limits the number of revisions 
+kept per document.  
+
+The revision configurations are stored in the database record.  
+
+{NOTE: Conflict Revisions}
+Revisions created for **conflicting documents** are a special case, that is 
+not covered in this article.  
+
+* Conflict revisions are **Enabled** by default.  
+* Read about the conflict revisions API here: 
+  [Conflict Revisions Configuration](../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration)  
+* Read about managing conflict revisions via Studio here: 
+  [Editing the Conflicting Document Defaults](../../studio/database/settings/document-revisions#editing-the-conflicting-document-defaults)  
+
+{NOTE/}
+
+
+---
+
+#### Default Settings and Collection-Specific Configurations
+
+The Revisions configuration is comprised of **Default Settings** and/or 
+**Collection-specific configurations**.  
+
+* The **default settings** apply to all the documents that a collection-specific 
+  configuration is not defined for.  
+* **Collection-specific** configurations apply only to documents of the collections they are defined for,  
+  overriding the default settings for these collections.  
+  {NOTE: }
+  If you apply no default settings, Revisions will be **disabled** for any 
+  collection that a collection-specific configuration is not defined for.  
+  {NOTE/}
+
+---
+
+#### Defining a Revisions Configuration
+
+You can apply a Revisions configuration using Studio or the Client API.  
+
+* Via Studio:  
+   * Manage the Revisions configuration via Studio using the Studio Settings 
+     [Document Revisions](../../studio/database/settings/document-revisions) 
+     page.  
+   * Inspect and manage the revisions created for each document using Studio's 
+     Document View [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab).  
+* Via Client API:  
+  [Read here](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+  how to define and apply a Revisions configuration using the `ConfigureRevisionsOperation`
+  Store operation.  
+
+---
+
+#### Revisions Configuration Options
+
+A Revisions configuration defines -  
+
+* _Whether to Enable or Disable Revisions_.  
+   * If the Revisions feature is **Enabled** for a collection,  
+     creating, modifying, or deleting any document from this collection will trigger the automatic creation  
+     of a new document revision and optionally the Purging of existing revisions for 
+     the document.  
+   * If the Revisions feature is **Disabled** for a collection,  
+     RavenDB will **not** automatically Create or Purge revisions for documents of this collection.  
+* _Whether to Limit the number of revisions that can be kept per document_.  
+  RavenDB will only purge revisions if they exceed the limits you set.
+* [Learn more here](../../document-extensions/revisions/client-api/operations/configure-revisions#section-2) 
+  about the available configuration options.  
+
+---
+
+#### Revisions Configuration Execution
+
+Creating a Revisions configuration does **not** immediately trigger its execution.  
+Default and collection-specific configurations are executed when -  
+
+1. **Documents are Created, Modified, or Deleted**.  
+  When a document is created, modified, or deleted, the configuration (either 
+  default or collection-specific) that applies to its collection is examined.  
+  If the Revisions feature is enabled for this collection:  
+   * A revision of the document will be created.  
+   * Revisions will optionally be purged according to limits set in the configuration.  
+
+2. **[Enforce Configuration](../../studio/database/settings/document-revisions#enforce-configuration) is applied**.  
+  Enforcing Configuration applies the Revisions configuration immediately 
+  throughout the database, **purging** all the revisions that pend purging 
+  by default settings or collection-specific configurations and **deleting** 
+  all the revisions that no configuration applies to.  
+  {WARNING: }
+  
+  * Large databases and collections may contain numerous revisions pending 
+    purging that Enforcing Configuration will purge all at once.  
+    Be aware that this operation may require substantial server resources, 
+    and time it accordingly.  
+  * Revisions that were created over time that no configuration currently 
+    applies to will be deleted. Make sure your configuration includes the 
+    default settings and collection-specific configurations that will 
+    keep the revisions you want to keep intact.  
+  {WARNING/}
+
+---
+
+#### Enabling and Disabling Revisions for Existing Documents
+
+* When the Revisions feature is **Enabled** for a populated collection:  
+  The first revision will be created for an existing document the next 
+  time the document is modified (recording the document **after** its 
+  modification), or when the document is deleted.  
+
+* **Disabling Revisions** for a collection after revisions were created:  
+   * The creation of new revisions and the purging of existing revisions will stop.  
+   * Existing revisions will remain intact.  
+
+{PANEL/}
+
+{PANEL: How it Works}
+
+Let's play with revisions a little to get a taste of its advantages.  
+
+1. **Enable Revisions** so we can experiment with the feature.  
+   The Revisions feature can be enabled using [Studio](../../studio/database/settings/document-revisions) 
+   or the [ConfigureRevisionsOperation](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+   Store operation.  
+   
+     ![Enable Revisions for the Users Collection](images\revisions_enable-revisions.png "Enable Revisions for the Users Collection")
+
+2. **Create a new document in the `Users` collection**.  
+   We will follow the automatic creation of revisions for this document.  
+   You can create the document using [Studio](../../studio/database/documents/create-new-document#create-new-document) 
+   or the [session.Store](../../client-api/session/storing-entities#example) method.  
+   
+     ![Create a Document](images\revisions_create-document.png "Create a Document")
+
+3. **Use Studio to inspect the new document's [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab)**.  
+   Creating the document also created its first revision.  
+   
+     ![Revision for Document Creation](images\revisions_document-created.png "Revision for Document Creation")
+   
+     (Click the _See the current document_ button to return to the parent document view.)  
+
+4. **Modify and Save the document**.  
+   This will create a second revision.  
+   
+     ![Revision for Document Modification](images\revisions_modify-document.png "Revision for Document Modification")
+   
+5. **Delete the document**.  
+   Though you deleted the document, its **audit trail** is **not lost**: 
+   all revisions were moved to the [Revisions Bin](../../studio/database/document-extensions/revisions#revisions-bin),  
+   including a new revision (called "Delete-Revision"), created to indicate 
+   that the document was deleted.  
+
+      To see the "orphaned" revisions (whose parent document was deleted):  
+       * Open the Studio `Documents > Revisions Bin` section  
+       * Click the deleted document's ID 
+    
+      ![Revisions Bin](images\revisions_revisions-bin.png "Revisions Bin")
+
+6. **Restore the document**.  
+   To restore the document after deleting it from one of its revisions,  
+   create a document with the same ID as the document you deleted.  
+   The revisions of the deleted document will be **restored** from the 
+   revisions bin and added to the new document. Opening the document's 
+   Revisions tab will display the whole audit trail, including the 
+   delete-revision created when the old document was deleted and the 
+   revision created when the new document was created.  
+   
+     ![Restored Revisions](images\revisions_restored.png "Restored Revisions")
+
+{PANEL/}
+
+{PANEL: Revisions Storage}
+
+### Revisions Documents Storage  
+
+* The creation of a document revision stores a full version of the modified document in the revisions storage,  
+  in the same **blittable JSON document** format as that of regular documents.  
+
+* **Revisions Compression**  
+   * individual fields are compressed as they are compressed in regular documents:  
+     any text field of more than 128 bytes is compressed.  
+   * Revisions are compressed by default.  
+     Learn [here](../../server/configuration/database-configuration#databases.compression.compressrevisionsdefault) 
+     how to toggle this database option on and off.  
+   * Learn [here](../../server/storage/documents-compression) how to apply Document Compression to revisions.  
+
+---
+
+### Revisions Document Extensions Storage
+
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series) about revisions and **time series**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters) about revisions and **counters**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments) about revisions and **attachments**.  
+
+{PANEL/}
+
+{PANEL: Force Revision Creation}
+
+So far we've discussed the automatic creation of revisions when the feature is enabled.  
+But you can also **force the creation** of a document revision, whether the feature is enabled or not.  
+This is useful when you choose to disable Revisions but still want to create a revision for a specific document,  
+e.g. to take a snapshot of the document as a precaution before editing it.  
+
+* You can force the creation of a revision via Studio or using the 
+  [ForceRevisionCreationFor](../../document-extensions/revisions/overview#force-revision-creation-via-api) 
+  API method.  
+* A revision **will** be created even if the Revisions feature is disabled for the document's collection.  
+* A revision **will** be created even if the document was not modified  
+  (unless the document has revisions and the latest revision contains the current document contents).  
+
+---
+
+#### Force Revision Creation via Studio
+
+To create a revision manually via Studio, use the **Create Revision** button in the 
+document view's Revisions tab.  
+
+![Create a revision manually](images\revisions_create-revision-manually.png "Create a revision manually")
+
+---
+
+#### Force Revision Creation via API
+
+To create a revision manually via the API, use the advanced session `force_revision_creation_for` method.  
+{CODE:python force_revision_creation_for@DocumentExtensions\Revisions\Revisions.py /}
+
+{NOTE: When the Revisions feature is disabled:}
+Deleting a document that owns a manually-created revision will not move the revision to the revisions bin.  
+
+* A `delete revision` will Not be created.  
+* Manual revisions will not be kept in the revisions bin.  
+
+{NOTE/}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
new file mode 100644
index 0000000000..84dabbb6bc
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
@@ -0,0 +1,272 @@
+# Revisions and Other Features
+
+---
+
+{NOTE: }
+
+* This page describes relationships between Revisions and other RavenDB features, including -
+    * When is revisions creation triggered by other features
+    * How revisions are supported by other features  
+
+* In this page:  
+   * [Revisions and Counters](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters)  
+   * [Revisions and Time Series](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series)  
+   * [Revisions and Attachments](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments)  
+   * [Revisions and Replication](../../document-extensions/revisions/revisions-and-other-features#revisions-and-replication)
+   * [Revisions and ETL](../../document-extensions/revisions/revisions-and-other-features#revisions-and-etl)
+   * [Revisions and Backup](../../document-extensions/revisions/revisions-and-other-features#revisions-and-backup)  
+   * [Revisions and Data Subscriptions](../../document-extensions/revisions/revisions-and-other-features#revisions-and-data-subscriptions)
+   * [Revisions Import and Export](../../document-extensions/revisions/revisions-and-other-features#revisions-import-and-export)
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions and Counters}
+
+### Revisions creation:
+
+* A document revision will be created when:   
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
+    
+* A revision will Not be created upon modifying the value of an existing [counter](../../document-extensions/counters/overview).
+
+---
+
+### Stored data:
+
+* A revision that is created for a document that contains counters  
+  will have the `@counters-snapshot` property in its **metadata**.  
+ 
+* This property holds the counters' names and values at the time when the revision was created. 
+
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
+  It does not specify the value of the counter on each individual node.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@counters-snapshot": {
+              "counterName1": 7,
+              "counterName2": 42
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+the counters from the revision are restored to functionality along with their values.  
+
+---
+
+### Extract counters data from revisions:
+
+Use [GetMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
+and then extract the counters' data.  
+
+{CODE-TABS}
+{CODE-TAB:csharp:Sync extract_counters@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
+{CODE-TAB:csharp:Async extract_counters_async@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
+{CODE-TABS/}
+
+{PANEL/}
+
+{PANEL: Revisions and Time Series}
+
+### Revisions Creation:
+
+* A document revision will be created when:  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
+      (A time series is deleted from a document when all its entries are deleted)
+
+* A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document that contains time series  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
+
+* This property does Not hold the time series values data,  
+  it only contains the following information for the time when the revision was created:
+  * The time series names
+  * The number of entries in each time series
+  * Dates of the first and last entry in each time series
+  
+* Read more about Revisions and Time Series [here](../../document-extensions/timeseries/time-series-and-other-features#revisions).
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@timeseries-snapshot": {
+              "timeSeriesName1": {
+                  "Count": 5,
+                  "Start": "2023-03-22T11:25:00.9110000Z",
+                  "End": "2023-03-22T11:28:34.9110000Z"
+              },
+              "timeSeriesName2": {
+                   "Count": 10,
+                   "Start": "2023-03-22T11:26:00.3950000Z",
+                   "End": "2023-03-22T11:28:48.3950000Z"
+              }
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
+
+* If the current document **contains** a time series name as in the revision:
+    * The reverted document will keep the time series entries & values as it was in the current document.
+    * Time series entries and values from the revision are Not restored.
+
+* If the current document **doesn't contain** a time series name as in the revision,  
+  or if the document itself was deleted:  
+  * The reverted document will have the time series from the revision  
+  * However, the entries count will be 0  
+
+{PANEL/}
+
+{PANEL: Revisions and Attachments}
+
+### Revisions Creation:
+
+A document revision will be created when:  
+
+  * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+  * An attachment is **deleted** from the document.   
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document with attachments  
+  will have the `@attachments` property in its **metadata**.
+
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
+  The property only contains the following information for each attachment the document had when the revision was created:  
+  * Attachment file name
+  * File content type
+  * File size
+  * A hash string (a reference to the file in the storage)
+
+* Existing attachment files in the storage are Not duplicated per revision that is created when the document itself is modified.
+
+* An attachment file is removed from RavenDB's storage only when there is no live document or a revision that refers to it.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@attachments": [
+              {
+                  "Name": "attachmentFileName.png",
+                  "ContentType": "image/png",
+                  "Size": 33241,
+                  "Hash": "iFg0o6D38pUcWGVlP71ddDp8SCcoEal47kG3LtWx0+Y=",
+              }, 
+          ],
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+the attachments are restored to their state when the revision was created.
+
+{PANEL/}
+
+{PANEL: Revisions and Replication}
+
+* Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
+
+* The revisions will be replicated by all replication types:
+   * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+   * [External replication](../../server/clustering/replication/replication#external-replication)
+   * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+
+* Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
+
+{PANEL/}
+
+{PANEL: Revisions and ETL}
+
+* An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
+
+* However, if revisions are enabled on the destination database,  
+  whenever the ETL process sends a modified document and the target document is overwritten,  
+  a new revision will be created for the document in the target database as expected.  
+
+{PANEL/}
+
+{PANEL: Revisions and Backup}
+
+Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
+
+{PANEL/}
+
+{PANEL: Revisions and Data Subscriptions}
+
+* Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
+
+{PANEL/}
+
+{PANEL: Revisions Import and Export}
+
+* Revisions can be imported and exported with a `.ravendbdump` file:
+    * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
+    * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
+
+* Revisions can be imported when migrating data from another [live RavenDB server](../../studio/database/tasks/import-data/import-from-ravendb#step-#4:-set-import-options).
+
+  ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Counters: Overview](../../document-extensions/counters/overview)
+* [Time Series: Overview](../../document-extensions/timeseries/overview)
+* [Attachments: What are Attachments](../../document-extensions/attachments/what-are-attachments)
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
+
+### Data Subscriptions
+
+* [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
+* [Revisions and Data Subscriptions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.java.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.java.markdown
new file mode 100644
index 0000000000..e71433a812
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.java.markdown
@@ -0,0 +1,38 @@
+# Revisions and Other Features
+
+When the revisions feature is enabled, a snapshot of a document that holds *Counters* will include in its metadata a `@counters-snapshot` property, 
+that holds all the document's counter names **and values** (at the time of the revision creation).  
+This can be useful when historic records of the documents and their counter values are needed.
+
+{INFO: How do counter operations affect revision creation }
+Creation of a new counter and deletion of a counter modify the parent document (documents hold
+their counter names in the metadata) and will trigger a revision creation.  
+Incrementing an existing counter does not modify the parent document and will not trigger a revision creation.
+{INFO/}
+
+### Example
+
+{CODE:java example@DocumentExtensions\Revisions\ClientAPI\Session\CounterRevisions.java /}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Counters: Overview](../../document-extensions/counters/overview)
+* [Time Series: Overview](../../document-extensions/timeseries/overview)
+* [Attachments: What are Attachments](../../document-extensions/attachments/what-are-attachments)
+
+### Client API
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
+
+### Data Subscriptions
+* [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
+* [Revisions and Data Subscriptions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
new file mode 100644
index 0000000000..aa9c4d87f2
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
@@ -0,0 +1,314 @@
+# Revisions and Other Features
+
+---
+
+{NOTE: }
+
+* This page describes relationships between Revisions and other RavenDB features, including -
+    * When is revisions creation triggered by other features
+    * How revisions are supported by other features  
+
+* In this page:  
+   * [Revisions and Counters](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters)  
+   * [Revisions and Time Series](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series)  
+   * [Revisions and Attachments](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments)  
+   * [Revisions and Replication](../../document-extensions/revisions/revisions-and-other-features#revisions-and-replication)
+   * [Revisions and ETL](../../document-extensions/revisions/revisions-and-other-features#revisions-and-etl)
+   * [Revisions and Backup](../../document-extensions/revisions/revisions-and-other-features#revisions-and-backup)  
+   * [Revisions and Data Subscriptions](../../document-extensions/revisions/revisions-and-other-features#revisions-and-data-subscriptions)
+   * [Revisions Import and Export](../../document-extensions/revisions/revisions-and-other-features#revisions-import-and-export)
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions and Counters}
+
+{NOTE: }
+
+**Revisions creation**  
+
+* A document revision will be created when:   
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
+    
+* A revision will Not be created upon modifying the value of an existing counter.
+
+{NOTE/}
+
+{NOTE: }
+
+**Stored data**  
+
+* A revision that is created for a document that contains counters  
+  will have the `@counters-snapshot` property in its **metadata**.  
+ 
+* This property holds the counters' names and values at the time when the revision was created. 
+
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
+  It does not specify the value of the counter on each individual node.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@counters-snapshot": {
+              "counterName1": 7,
+              "counterName2": 42
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+{NOTE/}
+
+{NOTE: }
+
+**Reverted data**  
+
+* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+  the counters from the revision are restored to functionality along with their values.  
+
+{NOTE/}
+
+{NOTE: }
+
+**Extract counters data from revisions**  
+
+* Use [getMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
+  and then extract the counters' data.  
+
+{CODE:nodejs extract_counters@documentExtensions\revisions\client-api\session\revisionsAndOtherFeatures.js /}
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and Time Series}
+
+{NOTE: }
+
+**Revisions Creation**
+
+* A document revision will be created when:  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
+      (A time series is deleted from a document when all its entries are deleted)
+
+* A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
+
+{NOTE/}
+
+{NOTE: }
+
+**Stored Data**
+
+* A revision that is created for a document that contains time series  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
+
+* This property does Not hold the time series values data,  
+  it only contains the following information for the time when the revision was created:
+  * The time series names
+  * The number of entries in each time series
+  * Dates of the first and last entry in each time series
+  
+* Read more about Revisions and Time Series [here](../../document-extensions/timeseries/time-series-and-other-features#revisions).
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@timeseries-snapshot": {
+              "timeSeriesName1": {
+                  "Count": 5,
+                  "Start": "2023-03-22T11:25:00.9110000Z",
+                  "End": "2023-03-22T11:28:34.9110000Z"
+              },
+              "timeSeriesName2": {
+                   "Count": 10,
+                   "Start": "2023-03-22T11:26:00.3950000Z",
+                   "End": "2023-03-22T11:28:48.3950000Z"
+              }
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+{NOTE/}
+
+{NOTE: }
+
+**Reverted Data**
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
+
+* If the current document **contains** a time series name as in the revision:
+    * The reverted document will keep the time series entries & values as it was in the current document.
+    * Time series entries and values from the revision are Not restored.
+
+* If the current document **doesn't contain** a time series name as in the revision,  
+  or if the document itself was deleted:  
+  * The reverted document will have the time series from the revision  
+  * However, the entries count will be 0  
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and Attachments}
+
+{NOTE: }
+
+**Revisions Creation**
+
+* A document revision will be created when:  
+    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+    * An attachment is **deleted** from the document.   
+
+{NOTE/}
+
+{NOTE: }
+
+**Stored Data**
+
+* A revision that is created for a document with attachments  
+  will have the `@attachments` property in its **metadata**.
+
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
+  The property only contains the following information for each attachment the document had when the revision was created:  
+  * Attachment file name
+  * File content type
+  * File size
+  * A hash string (a reference to the file in the storage)
+
+* Existing attachment files in the storage are Not duplicated per revision that is created when the document itself is modified.
+
+* An attachment file is removed from RavenDB's storage only when there is no live document or a revision that refers to it.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@attachments": [
+              {
+                  "Name": "attachmentFileName.png",
+                  "ContentType": "image/png",
+                  "Size": 33241,
+                  "Hash": "iFg0o6D38pUcWGVlP71ddDp8SCcoEal47kG3LtWx0+Y=",
+              }, 
+          ],
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+{NOTE/}
+
+{NOTE: }
+
+**Reverted Data**
+
+* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+  the attachments are restored to their state when the revision was created.
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and Replication}
+
+{NOTE: }
+
+* Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
+
+* The revisions will be replicated by all replication types:
+  * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+  * [External replication](../../server/clustering/replication/replication#external-replication)
+  * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+
+* Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and ETL}
+
+{NOTE: }
+
+* An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
+
+* However, if revisions are enabled on the destination database,  
+  whenever the ETL process sends a modified document and the target document is overwritten,  
+  a new revision will be created for the document in the target database as expected.  
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and Backup}
+
+{NOTE: }
+
+* Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions and Data Subscriptions}
+
+{NOTE: }
+
+* Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
+
+{NOTE/}
+
+{PANEL/}
+
+{PANEL: Revisions Import and Export}
+
+{NOTE: }
+
+* Revisions can be imported and exported with a `.ravendbdump` file:
+    * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
+    * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
+
+* Revisions can be imported when migrating data from another [live RavenDB server](../../studio/database/tasks/import-data/import-from-ravendb#step-#4:-set-import-options).
+
+  ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
+
+{NOTE/}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Counters: Overview](../../document-extensions/counters/overview)
+* [Time Series: Overview](../../document-extensions/timeseries/overview)
+* [Attachments: What are Attachments](../../document-extensions/attachments/what-are-attachments)
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
+
+### Data Subscriptions
+
+* [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
+* [Revisions and Data Subscriptions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning)  
diff --git a/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown
new file mode 100644
index 0000000000..183185c493
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown
@@ -0,0 +1,260 @@
+# Revisions and Other Features
+
+---
+
+{NOTE: }
+
+* This page describes relationships between Revisions and other RavenDB features, including -
+    * When is revisions creation triggered by other features
+    * How revisions are supported by other features  
+
+* In this page:  
+   * [Revisions and Counters](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters)  
+   * [Revisions and Time Series](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series)  
+   * [Revisions and Attachments](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments)  
+   * [Revisions and Replication](../../document-extensions/revisions/revisions-and-other-features#revisions-and-replication)
+   * [Revisions and ETL](../../document-extensions/revisions/revisions-and-other-features#revisions-and-etl)
+   * [Revisions and Backup](../../document-extensions/revisions/revisions-and-other-features#revisions-and-backup)  
+   * [Revisions and Data Subscriptions](../../document-extensions/revisions/revisions-and-other-features#revisions-and-data-subscriptions)
+   * [Revisions Import and Export](../../document-extensions/revisions/revisions-and-other-features#revisions-import-and-export)
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions and Counters}
+
+### Revisions creation:
+
+* A document revision will be created when:   
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
+    
+* A revision will Not be created upon modifying the value of an existing [counter](../../document-extensions/counters/overview).
+
+---
+
+### Stored data:
+
+* A revision that is created for a document that contains counters  
+  will have the `@counters-snapshot` property in its **metadata**.  
+ 
+* This property holds the counters' names and values at the time when the revision was created. 
+
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
+  It does not specify the value of the counter on each individual node.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@counters-snapshot": {
+              "counterName1": 7,
+              "counterName2": 42
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+the counters from the revision are restored to functionality along with their values.  
+
+{PANEL/}
+
+{PANEL: Revisions and Time Series}
+
+### Revisions Creation:
+
+* A document revision will be created when:  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
+      (A time series is deleted from a document when all its entries are deleted)
+
+* A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document that contains time series  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
+
+* This property does Not hold the time series values data,  
+  it only contains the following information for the time when the revision was created:
+  * The time series names
+  * The number of entries in each time series
+  * Dates of the first and last entry in each time series
+  
+* Read more about Revisions and Time Series [here](../../document-extensions/timeseries/time-series-and-other-features#revisions).
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@timeseries-snapshot": {
+              "timeSeriesName1": {
+                  "Count": 5,
+                  "Start": "2023-03-22T11:25:00.9110000Z",
+                  "End": "2023-03-22T11:28:34.9110000Z"
+              },
+              "timeSeriesName2": {
+                   "Count": 10,
+                   "Start": "2023-03-22T11:26:00.3950000Z",
+                   "End": "2023-03-22T11:28:48.3950000Z"
+              }
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
+
+* If the current document **contains** a time series name as in the revision:
+    * The reverted document will keep the time series entries & values as it was in the current document.
+    * Time series entries and values from the revision are Not restored.
+
+* If the current document **doesn't contain** a time series name as in the revision,  
+  or if the document itself was deleted:  
+  * The reverted document will have the time series from the revision  
+  * However, the entries count will be 0  
+
+{PANEL/}
+
+{PANEL: Revisions and Attachments}
+
+### Revisions Creation:
+
+A document revision will be created when:  
+
+  * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+  * An attachment is **deleted** from the document.   
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document with attachments  
+  will have the `@attachments` property in its **metadata**.
+
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
+  The property only contains the following information for each attachment the document had when the revision was created:  
+  * Attachment file name
+  * File content type
+  * File size
+  * A hash string (a reference to the file in the storage)
+
+* Existing attachment files in the storage are Not duplicated per revision that is created when the document itself is modified.
+
+* An attachment file is removed from RavenDB's storage only when there is no live document or a revision that refers to it.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@attachments": [
+              {
+                  "Name": "attachmentFileName.png",
+                  "ContentType": "image/png",
+                  "Size": 33241,
+                  "Hash": "iFg0o6D38pUcWGVlP71ddDp8SCcoEal47kG3LtWx0+Y=",
+              }, 
+          ],
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+the attachments are restored to their state when the revision was created.
+
+{PANEL/}
+
+{PANEL: Revisions and Replication}
+
+* Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
+
+* The revisions will be replicated by all replication types:
+   * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+   * [External replication](../../server/clustering/replication/replication#external-replication)
+   * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+
+* Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
+
+{PANEL/}
+
+{PANEL: Revisions and ETL}
+
+* An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
+
+* However, if revisions are enabled on the destination database,  
+  whenever the ETL process sends a modified document and the target document is overwritten,  
+  a new revision will be created for the document in the target database as expected.  
+
+{PANEL/}
+
+{PANEL: Revisions and Backup}
+
+Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
+
+{PANEL/}
+
+{PANEL: Revisions and Data Subscriptions}
+
+* Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
+
+{PANEL/}
+
+{PANEL: Revisions Import and Export}
+
+* Revisions can be imported and exported with a `.ravendbdump` file:
+    * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
+    * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
+
+* Revisions can be imported when migrating data from another [live RavenDB server](../../studio/database/tasks/import-data/import-from-ravendb#step-#4:-set-import-options).
+
+  ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Counters: Overview](../../document-extensions/counters/overview)
+* [Time Series: Overview](../../document-extensions/timeseries/overview)
+* [Attachments: What are Attachments](../../document-extensions/attachments/what-are-attachments)
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
+
+### Data Subscriptions
+
+* [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
+* [Revisions and Data Subscriptions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning)  
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.cs
new file mode 100644
index 0000000000..1f79c1fa48
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.cs
@@ -0,0 +1,331 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Operations.Revisions;
+using Raven.Client.ServerWide.Operations;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Operations
+{
+    public class ConfigRevisions
+    {
+        public ConfigRevisions()
+        {
+            // REPLACE
+            using (var documentStore = new DocumentStore())
+            {
+                #region replace_configuration
+                // ==============================================================================
+                // Define default settings that will apply to ALL collections
+                // Note: this is optional
+                var defaultRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 100,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 7, 0, 0, 0),
+                    MaximumRevisionsToDeleteUponDocumentUpdate = 15,
+                    PurgeOnDelete = false,
+                    Disabled = false
+                    
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created anytime a document is modified or deleted.
+                    // * Revisions of a deleted document can be accessed in the Revisions Bin view.
+                    // * At least 100 of the latest revisions will be kept.
+                    // * Older revisions will be removed if they exceed 7 days on next revision creation.
+                    // * A maximum of 15 revisions will be deleted each time a document is updated,
+                    //   until the defined '# of revisions to keep' limit is reached.
+                };
+
+                // ==============================================================================
+                // Define a specific configuration for the EMPLOYEES collection
+                // This will override the default settings 
+                var employeesRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 50,
+                    MinimumRevisionAgeToKeep = new TimeSpan(hours: 12, minutes: 0, seconds: 0),
+                    PurgeOnDelete = true,
+                    Disabled = false
+                    
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created anytime an Employee document is modified.
+                    // * When a document is deleted all its revisions will be removed.
+                    // * At least 50 of the latest revisions will be kept.
+                    // * Older revisions will be removed if they exceed 12 hours on next revision creation.
+                };
+
+                // ==============================================================================
+                // Define a specific configuration for the PRODUCTS collection
+                // This will override the default settings 
+                var productsRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    Disabled = true 
+                    // No revisions will be created for the Products collection,
+                    // even though default configuration is enabled
+                };
+
+                // ==============================================================================
+                // Combine all configurations in the RevisionsConfiguration object
+                var revisionsConfig = new RevisionsConfiguration()
+                {
+                    Default = defaultRevConfig,
+                    Collections = new Dictionary<string, RevisionsCollectionConfiguration>()
+                    {
+                        { "Employees", employeesRevConfig },
+                        { "Products", productsRevConfig }
+                    }
+                };
+                
+                // ==============================================================================
+                // Define the configure revisions operation, pass the configuration
+                var configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+                
+                // Execute the operation by passing it to Maintenance.Send
+                // Any existing configuration will be replaced with the new configuration passed
+                documentStore.Maintenance.Send(configureRevisionsOp);
+                #endregion
+            }
+            
+            // MODIFY
+            using (var documentStore = new DocumentStore())
+            {
+                var defaultRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 100,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 7, 0, 0, 0),
+                    MaximumRevisionsToDeleteUponDocumentUpdate = 15,
+                    PurgeOnDelete = false,
+                    Disabled = false
+                };
+
+                var employeesRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 50,
+                    MinimumRevisionAgeToKeep = new TimeSpan(hours: 12, minutes: 0, seconds: 0),
+                    PurgeOnDelete = true
+                };
+
+                var productsRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    Disabled = true
+                };
+
+                #region modify_configuration
+                // ==============================================================================
+                // Define the get database record operation:
+                var getDatabaseRecordOp = new GetDatabaseRecordOperation(documentStore.Database);
+                // Get the current revisions configuration from the database record:
+                RevisionsConfiguration revisionsConfig =
+                    documentStore.Maintenance.Server.Send(getDatabaseRecordOp).Revisions;
+
+                // ==============================================================================
+                // If no revisions configuration exists, then create a new configuration
+                if (revisionsConfig == null)
+                {
+                    revisionsConfig = new RevisionsConfiguration()
+                    {
+                        Default = defaultRevConfig,
+                        Collections = new Dictionary<string, RevisionsCollectionConfiguration>()
+                        {
+                            { "Employees", employeesRevConfig },
+                            { "Products", productsRevConfig }
+                        }
+                    };
+                }
+                
+                // ==============================================================================
+                // If a revisions configuration already exists, then modify it
+                else
+                {
+                    revisionsConfig.Default = defaultRevConfig;
+                    revisionsConfig.Collections["Employees"] = employeesRevConfig;
+                    revisionsConfig.Collections["Products"] = productsRevConfig;
+                }
+
+                // ==============================================================================
+                // Define the configure revisions operation, pass the configuration
+                var configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+
+                // Execute the operation by passing it to Maintenance.Send
+                // The existing configuration will be updated
+                documentStore.Maintenance.Send(configureRevisionsOp);
+                #endregion
+            }
+        }
+
+        public async Task ConfigRevisionsAsync()
+        {
+            // REPLACE
+            using (var documentStore = new DocumentStore())
+            {
+                #region replace_configuration_async
+                // ==============================================================================
+                // Define default settings that will apply to ALL collections
+                // Note: this is optional
+                var defaultRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 100,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 7, 0, 0, 0),
+                    MaximumRevisionsToDeleteUponDocumentUpdate = 15,
+                    PurgeOnDelete = false,
+                    Disabled = false,
+                    
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created anytime a document is modified or deleted.
+                    // * Revisions of a deleted document can be accessed in the Revisions Bin view.
+                    // * At least 100 of the latest revisions will be kept.
+                    // * Older revisions will be removed if they exceed 7 days on next revision creation.
+                    // * A maximum of 15 revisions will be deleted each time a document is updated,
+                    //   until the defined '# of revisions to keep' limit is reached.
+                };
+
+                // ==============================================================================
+                // Define a specific configuration for the EMPLOYEES collection
+                // This will override the default settings 
+                var employeesRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 50,
+                    MinimumRevisionAgeToKeep = new TimeSpan(hours: 12, minutes: 0, seconds: 0),
+                    PurgeOnDelete = true,
+                    Disabled = false
+                   
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created anytime an Employee document is modified.
+                    // * When a document is deleted all its revisions will be removed.
+                    // * At least 50 of the latest revisions will be kept.
+                    // * Older revisions will be removed if they exceed 12 hours on next revision creation.
+                };
+                    
+                // ==============================================================================
+                // Define a specific configuration for the PRODUCTS collection
+                // This will override the default settings 
+                var productsRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    Disabled = true 
+                    // No revisions will be created for the Products collection,
+                    // even though default configuration is enabled
+                };
+
+                // ==============================================================================
+                // Combine all configurations in the RevisionsConfiguration object
+                var revisionsConfig = new RevisionsConfiguration()
+                {
+                    Default = defaultRevConfig,
+                    Collections = new Dictionary<string, RevisionsCollectionConfiguration>()
+                    {
+                        { "Employees", employeesRevConfig },
+                        { "Products", productsRevConfig }
+                    }
+                };
+
+                // ==============================================================================
+                // Define the configure revisions operation, pass the configuration
+                var configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+               
+                // Execute the operation by passing it to Maintenance.SendAsync
+                // Any existing configuration will be replaced with the new configuration passed
+                await documentStore.Maintenance.SendAsync(configureRevisionsOp);
+                #endregion
+            }
+            
+            // MODIFY
+            using (var documentStore = new DocumentStore())
+            {
+                var defaultRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 100,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 7, 0, 0, 0),
+                    MaximumRevisionsToDeleteUponDocumentUpdate = 15,
+                    PurgeOnDelete = false,
+                    Disabled = false
+                };
+
+                var employeesRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    MinimumRevisionsToKeep = 50,
+                    MinimumRevisionAgeToKeep = new TimeSpan(hours: 12, minutes: 0, seconds: 0),
+                    PurgeOnDelete = true
+                };
+
+                var productsRevConfig = new RevisionsCollectionConfiguration()
+                {
+                    Disabled = true
+                };
+
+                #region modify_configuration_async
+                // ==============================================================================
+                // Define the get database record operation:
+                var getDatabaseRecordOp = new GetDatabaseRecordOperation(documentStore.Database);
+                // Get the current revisions configuration from the database record:
+                RevisionsConfiguration revisionsConfig =
+                    documentStore.Maintenance.Server.Send(getDatabaseRecordOp).Revisions;
+
+                // ==============================================================================
+                // If no revisions configuration exists, then create a new configuration
+                if (revisionsConfig == null)
+                {
+                    revisionsConfig = new RevisionsConfiguration()
+                    {
+                        Default = defaultRevConfig,
+                        Collections = new Dictionary<string, RevisionsCollectionConfiguration>()
+                        {
+                            { "Employees", employeesRevConfig },
+                            { "Products", productsRevConfig }
+                        }
+                    };
+                }
+                
+                // ==============================================================================
+                // If a revisions configuration already exists, then modify it
+                else
+                {
+                    revisionsConfig.Default = defaultRevConfig;
+                    revisionsConfig.Collections["Employees"] = employeesRevConfig;
+                    revisionsConfig.Collections["Products"] = productsRevConfig;
+                }
+
+                // ==============================================================================
+                // Define the configure revisions operation, pass the configuration
+                var configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+
+                // Execute the operation by passing it to Maintenance.SendAsync
+                // The existing configuration will be updated
+                await documentStore.Maintenance.SendAsync(configureRevisionsOp);
+                #endregion
+            }
+        }
+    }
+
+    public class Syntax
+    {
+        public interface IFoo
+        {
+            /*
+            #region syntax_1
+            public ConfigureRevisionsOperation(RevisionsConfiguration configuration);
+            #endregion
+            */
+        }
+
+        #region syntax_2
+        public class RevisionsConfiguration
+        {
+            public RevisionsCollectionConfiguration Default;
+            public Dictionary<string, RevisionsCollectionConfiguration> Collections;
+        }
+        #endregion
+        
+        #region syntax_3
+        public class RevisionsCollectionConfiguration
+        {
+            public long? MinimumRevisionsToKeep { get; set; }
+            public TimeSpan? MinimumRevisionAgeToKeep { get; set; }
+            public long? MaximumRevisionsToDeleteUponDocumentUpdate { get; set; }
+            public bool PurgeOnDelete { get; set; }
+            public bool Disabled { get; set; }
+        }
+        #endregion
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisionsForConflicts.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisionsForConflicts.cs
new file mode 100644
index 0000000000..06929cd000
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisionsForConflicts.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Threading.Tasks;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Operations.Revisions;
+using Raven.Client.ServerWide.Operations;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Operations
+{
+    public class ConfigureRevisionsForConflicts
+    {
+        public ConfigureRevisionsForConflicts()
+        {
+            using (var documentStore = new DocumentStore())
+            {
+                #region conflict_revisions_configuration
+                // Define the settings that will apply for conflict revisions (for all collections)
+                var conflictRevConfig = new RevisionsCollectionConfiguration
+                {
+                    PurgeOnDelete = true,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 45, 0, 0, 0)
+                    
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created for conflict documents
+                    // * When the parent document is deleted all its revisions will be removed.
+                    // * Revisions that exceed 45 days will be removed on next revision creation.
+                };
+
+                // Define the configure conflict revisions operation, pass the configuration
+                var configureConflictRevisionsOp = 
+                    new ConfigureRevisionsForConflictsOperation(documentStore.Database, conflictRevConfig);
+
+                // Execute the operation by passing it to Maintenance.Server.Send
+                // The existing conflict revisions configuration will be replaced by the configuration passed
+                documentStore.Maintenance.Server.Send(configureConflictRevisionsOp);
+                #endregion
+            }
+        }
+
+        public async Task ConfigureRevisionsForConflictsAsync()
+        {
+            using (var documentStore = new DocumentStore())
+            {
+                #region conflict_revisions_configuration_async
+                // Define the settings that will apply for conflict revisions (for all collections)
+                var conflictRevConfig = new RevisionsCollectionConfiguration
+                {
+                    PurgeOnDelete = true,
+                    MinimumRevisionAgeToKeep = new TimeSpan(days: 45, 0, 0, 0)
+                    
+                    // With this configuration:
+                    // ------------------------
+                    // * A revision will be created for conflict documents
+                    // * When the parent document is deleted all its revisions will be removed.
+                    // * Revisions that exceed 45 days will be removed on next revision creation.
+                };
+
+                // Define the configure conflict revisions operation, pass the configuration
+                var configureConflictRevisionsOp = 
+                    new ConfigureRevisionsForConflictsOperation(documentStore.Database, conflictRevConfig);
+
+                // Execute the operation by passing it to Maintenance.Server.Send
+                // The existing conflict revisions configuration will be replaced by the configuration passed
+                await documentStore.Maintenance.Server.SendAsync(configureConflictRevisionsOp);
+                #endregion
+            }
+        }
+        
+        public class Syntax
+        {
+            public interface IFoo
+            {
+                /*
+                #region syntax_1
+                public ConfigureRevisionsForConflictsOperation(string database, RevisionsCollectionConfiguration configuration)
+                #endregion
+                */
+            }
+        
+            #region syntax_2
+            public class RevisionsCollectionConfiguration
+            {
+                public long? MinimumRevisionsToKeep { get; set; }
+                public TimeSpan? MinimumRevisionAgeToKeep { get; set; }
+                public long? MaximumRevisionsToDeleteUponDocumentUpdate { get; set; }
+                public bool PurgeOnDelete { get; set; }
+                public bool Disabled { get; set; }
+            }
+            #endregion
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.cs
new file mode 100644
index 0000000000..a5a7874e04
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.cs
@@ -0,0 +1,128 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Operations.Revisions;
+using Raven.Documentation.Samples.Orders;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Operations
+{
+    public class GetRevisions
+    {
+        public GetRevisions()
+        {
+            using (var documentStore = new DocumentStore())
+            {
+                #region getAllRevisions
+                // Define the get revisions operation, pass the document id
+                var getRevisionsOp = new GetRevisionsOperation<Company>("Companies/1-A");
+                
+                // Execute the operation by passing it to Operations.Send
+                RevisionsResult<Company> revisions = documentStore.Operations.Send(getRevisionsOp);
+
+                // The revisions info:
+                List<Company> allRevisions = revisions.Results; // All the revisions
+                int revisionsCount = revisions.TotalResults;    // Total number of revisions
+                #endregion
+            }
+            
+            using (var documentStore = new DocumentStore())
+            {
+                #region getRevisionsWithPaging
+                var start = 0;
+                var pageSize = 100;
+                
+                while (true)
+                {
+                    // Execute the get revisions operation
+                    // Pass the document id, start & page size to get
+                    RevisionsResult<Company> revisions = documentStore.Operations.Send(
+                        new GetRevisionsOperation<Company>("Companies/1-A", start, pageSize));
+                    
+                    {
+                        // Process the retrieved revisions here
+                    }
+                    
+                    if (revisions.Results.Count < pageSize)
+                        break; // No more revisions to retrieve
+
+                    // Increment 'start' by page-size, to get the "next page" in next iteration
+                    start += pageSize;
+                }
+                #endregion
+            }
+            
+            using (var documentStore = new DocumentStore())
+            {
+                #region getRevisionsWithPagingParams
+                var parameters = new GetRevisionsOperation<Company>.Parameters
+                {
+                    Id = "Companies/1-A",
+                    Start = 0,
+                    PageSize = 100
+                };
+
+                RevisionsResult<Company> revisions = documentStore.Operations.Send(
+                    new GetRevisionsOperation<Company>(parameters));
+                #endregion
+            }
+        }
+        
+        public async Task GetRevisionsAsync()
+        {
+            using (var documentStore = new DocumentStore())
+            {
+                #region getAllRevisions_async
+                // Define the get revisions operation, pass the document id
+                var getRevisionsOp = new GetRevisionsOperation<Company>("Companies/1-A");
+                
+                // Execute the operation by passing it to Operations.Send
+                RevisionsResult<Company> revisions = await documentStore.Operations.SendAsync(getRevisionsOp);
+
+                // The revisions info:
+                List<Company> allRevisions = revisions.Results; // All the revisions
+                int revisionsCount = revisions.TotalResults;    // Number of revisions
+                #endregion
+            }
+
+            using (var documentStore = new DocumentStore())
+            {
+                #region getRevisionsWithPaging_async
+                var start = 0;
+                var pageSize = 100;
+                
+                while (true)
+                {
+                    // Execute the get revisions operation
+                    // Pass the document id, start & page size to get
+                    RevisionsResult<Company> revisions = await documentStore.Operations.SendAsync(
+                        new GetRevisionsOperation<Company>("Companies/1-A", start, pageSize));
+                    {
+                        // Process the retrieved revisions here
+                    }
+                    
+                    if (revisions.Results.Count < pageSize)
+                        break; // No more revisions to retrieve
+
+                    // Increment 'start' by page-size, to get the "next page" in next iteration
+                    start += pageSize;
+                }
+                #endregion
+            }
+
+            using (var documentStore = new DocumentStore())
+            {
+                #region getRevisionsWithPagingParams_async
+                var parameters = new GetRevisionsOperation<Company>.Parameters
+                {
+                    Id = "Companies/1-A",
+                    Start = 0,
+                    PageSize = 100
+                };
+
+                RevisionsResult<Company> revisions = await documentStore.Operations.SendAsync(
+                    new GetRevisionsOperation<Company>(parameters));
+                #endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Counting.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Counting.cs
new file mode 100644
index 0000000000..b6d14e9c53
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Counting.cs
@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using Raven.Client.Documents;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Session
+{
+    public class getCount
+    {
+        public async Task Samples()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region getCount
+                    // Get the number of revisions for document 'companies/1-A"
+                    var revisionsCount = session.Advanced.Revisions.GetCountFor("companies/1-A");
+                    #endregion
+                }
+
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region getCount_async
+                    // Get the number of revisions for document 'companies/1-A"
+                    var revisionsCount = await asyncSession.Advanced.Revisions.GetCountForAsync("companies/1-A");
+                    #endregion
+                }
+            }
+        }
+        
+        private interface IFoo
+        {
+            #region syntax
+            long GetCountFor(string id);
+            #endregion
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Including.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Including.cs
new file mode 100644
index 0000000000..990bd4e985
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Including.cs
@@ -0,0 +1,357 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Raven.Client;
+using Raven.Client.Documents;
+using Raven.Client.Json;
+using Raven.Documentation.Samples.Orders;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Session
+{
+    public class IncludeRevisions
+    {
+        public IncludeRevisions()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region include_1
+                    // The revision creation time
+                    // For example - looking for a revision from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+                    
+                    // Load a document:
+                    var order = session.Load<Order>("orders/1-A", builder => builder
+                        // Pass the revision creation time to 'IncludeRevisions'
+                        // The revision will be 'loaded' to the session along with the document
+                        .IncludeRevisions(creationTime));
+
+                    // Get the revision by creation time - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = session
+                        .Advanced.Revisions.Get<Order>("orders/1-A", creationTime);
+                    #endregion
+                }
+
+                using (var session = store.OpenSession())
+                {
+                    #region include_2
+                    // Load a document:
+                    var contract = session.Load<Contract>("contracts/1-A", builder => builder
+                         // Pass the path to the document property that contains the revision change vector(s)
+                         // The revision(s) will be 'loaded' to the session along with the document
+                        .IncludeRevisions(x => x.RevisionChangeVector)    // Include a single revision
+                        .IncludeRevisions(x => x.RevisionChangeVectors)); // Include multiple revisions
+                    
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = session
+                        .Advanced.Revisions.Get<Contract>(contract.RevisionChangeVector);
+                    var revisions = session
+                        .Advanced.Revisions.Get<Contract>(contract.RevisionChangeVectors);
+                    #endregion
+                }
+
+                using (var session = store.OpenSession())
+                {
+                    #region include_3
+                    // The revision creation time
+                    // For example - looking for revisions from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+                    
+                    // Query for documents:
+                    var orderDocuments = session.Query<Order>()
+                        .Where(x => x.ShipTo.Country == "Canada")
+                         // Pass the revision creation time to 'IncludeRevisions'
+                        .Include(builder => builder.IncludeRevisions(creationTime))
+                         // For each document in the query results,
+                         // the matching revision will be 'loaded' to the session along with the document
+                        .ToList();
+                    
+                    // Get a revision by its creation time for a document from the query results
+                    // It will be retrieved from the SESSION - no additional trip to the server is made
+                    var revision = session
+                        .Advanced.Revisions.Get<Order>(orderDocuments[0].Id, creationTime);
+                    #endregion
+                }
+
+                using (var session = store.OpenSession())
+                {
+                    #region include_4
+                    // Query for documents:
+                    var orderDocuments = session.Query<Contract>()
+                         // Pass the path to the document property that contains the revision change vector(s)
+                        .Include(builder => builder
+                            .IncludeRevisions(x => x.RevisionChangeVector)   // Include a single revision
+                            .IncludeRevisions(x => x.RevisionChangeVectors)) // Include multiple revisions
+                         // For each document in the query results,
+                         // the matching revisions will be 'loaded' to the session along with the document
+                        .ToList();
+
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = session.
+                        Advanced.Revisions.Get<Contract>(orderDocuments[0].RevisionChangeVector);
+                    var revisions = session
+                        .Advanced.Revisions.Get<Contract>(orderDocuments[0].RevisionChangeVectors);
+                    #endregion
+                }
+
+                using (var session = store.OpenSession())
+                {
+                    #region include_5
+                    // The revision creation time
+                    // For example - looking for revisions from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+                    
+                    // Query for documents with Raw Query:
+                    var orderDocuments = session.Advanced
+                         // Use 'include revisions' in the RQL   
+                        .RawQuery<Order>("from Orders include revisions($p0)")
+                         // Pass the revision creation time 
+                        .AddParameter("p0", creationTime)
+                         // For each document in the query results,
+                         // the matching revision will be 'loaded' to the session along with the document
+                        .ToList();
+
+                    // Get a revision by its creation time for a document from the query results
+                    // It will be retrieved from the SESSION - no additional trip to the server is made
+                    var revision = session
+                        .Advanced.Revisions.Get<Order>(orderDocuments[0].Id, creationTime);
+                    #endregion
+                }
+                
+                using (var session = store.OpenSession())
+                {
+                    #region include_6
+                    // Query for documents with Raw Query:
+                    var orderDocuments = session.Advanced
+                         // Use 'include revisions' in the RQL   
+                        .RawQuery<Contract>("from Contracts include revisions($p0, $p1)")
+                         // Pass the path to the document properties containing the change vectors
+                        .AddParameter("p0", "RevisionChangeVector")
+                        .AddParameter("p1", "RevisionChangeVectors")
+                         // For each document in the query results,
+                         // the matching revisions will be 'loaded' to the session along with the document
+                        .ToList();
+
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = session.
+                        Advanced.Revisions.Get<Contract>(orderDocuments[0].RevisionChangeVector);
+                    var revisions = session
+                        .Advanced.Revisions.Get<Contract>(orderDocuments[0].RevisionChangeVectors);
+                    #endregion
+                }
+
+                #region include_7
+                using (var session = store.OpenSession())
+                {
+                    // Get the revisions' metadata for document 'contracts/1-A'
+                    List<MetadataAsDictionary> contractRevisionsMetadata =
+                        session.Advanced.Revisions.GetMetadataFor("contracts/1-A");
+
+                    // Get a change vector from the metadata
+                    string changeVector = 
+                        contractRevisionsMetadata.First().GetString(Constants.Documents.Metadata.ChangeVector);
+
+                    // Patch the document - add the revision change vector to a specific document property
+                    session.Advanced
+                        .Patch<Contract, string>("contracts/1-A", x => x.RevisionChangeVector, changeVector);
+
+                    // Save your changes
+                    session.SaveChanges();
+                }
+                #endregion
+            }
+        }
+
+        public async Task IncludeRevisionsAsync()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_1_async
+                    // The revision creation time
+                    // For example - looking for a revision from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+
+                    // Load a document:
+                    var order = await asyncSession.LoadAsync<Order>("orders/1-A", builder => builder
+                        // Pass the revision creation time to 'IncludeRevisions'
+                        // The revision will be 'loaded' to the session along with the document
+                        .IncludeRevisions(creationTime));
+
+                    // Get the revision by creation time - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = await asyncSession
+                        .Advanced.Revisions.GetAsync<Order>("orders/1-A", creationTime);
+                    #endregion
+                }
+                
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_2_async
+                    // Load a document:
+                    var contract = await asyncSession.LoadAsync<Contract>("contracts/1-A",builder => builder
+                        // Pass the path to the document property that contains the revision change vector(s)
+                        // The revision(s) will be 'loaded' to the session along with the document
+                        .IncludeRevisions(x => x.RevisionChangeVector)    // Include a single revision
+                        .IncludeRevisions(x => x.RevisionChangeVectors)); // Include multiple revisions
+                    
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = await asyncSession
+                        .Advanced.Revisions.GetAsync<Contract>(contract.RevisionChangeVector);
+                    var revisions = await asyncSession
+                        .Advanced.Revisions.GetAsync<Contract>(contract.RevisionChangeVectors);
+                    #endregion
+                }
+                
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_3_async
+                    // The revision creation time
+                    // For example - looking for revisions from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+                    
+                    // Query for documents:
+                    var orderDocuments = await asyncSession.Query<Order>()
+                        .Where(x => x.ShipTo.Country == "Canada")
+                         // Pass the revision creation time to 'IncludeRevisions'
+                        .Include(builder => builder.IncludeRevisions(creationTime))
+                         // For each document in the query results,
+                         // the matching revision will be 'loaded' to the session along with the document
+                        .ToListAsync();
+                    
+                    // Get a revision by its creation time for a document from the query results
+                    // It will be retrieved from the SESSION - no additional trip to the server is made
+                    var revision = await asyncSession
+                        .Advanced.Revisions.GetAsync<Order>(orderDocuments[0].Id, creationTime);
+                    #endregion
+                }
+                
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_4_async
+                    // Query for documents:
+                    var orderDocuments = await asyncSession.Query<Contract>()
+                        // Pass the path to the document property that contains the revision change vector(s)
+                        .Include(builder => builder
+                            .IncludeRevisions(x => x.RevisionChangeVector)   // Include a single revision
+                            .IncludeRevisions(x => x.RevisionChangeVectors)) // Include multiple revisions
+                        // For each document in the query results,
+                        // the matching revisions will be 'loaded' to the session along with the document
+                        .ToListAsync();
+
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = await asyncSession.
+                        Advanced.Revisions.GetAsync<Contract>(orderDocuments[0].RevisionChangeVector);
+                    var revisions = await asyncSession
+                        .Advanced.Revisions.GetAsync<Contract>(orderDocuments[0].RevisionChangeVectors);
+                    #endregion
+                }
+                
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_5_async
+                    // The revision creation time
+                    // For example - looking for revisions from last month
+                    var creationTime = DateTime.Now.AddMonths(-1);
+                    
+                    // Query for documents with Raw Query:
+                    var orderDocuments = await asyncSession.Advanced
+                        // Use 'include revisions' in the RQL   
+                        .AsyncRawQuery<Order>("from Orders include revisions($p0)")
+                        // Pass the revision creation time 
+                        .AddParameter("p0", creationTime)
+                        // For each document in the query results,
+                        // the matching revision will be 'loaded' to the session along with the document
+                        .ToListAsync();
+
+                    // Get a revision by its creation time for a document from the query results
+                    // It will be retrieved from the SESSION - no additional trip to the server is made
+                    var revision = await asyncSession
+                        .Advanced.Revisions.GetAsync<Order>(orderDocuments[0].Id, creationTime);
+                    #endregion
+                }
+                
+                using (var asyncSession  = store.OpenAsyncSession())
+                {
+                    #region include_6_async
+                    // Query for documents with Raw Query:
+                    var orderDocuments = await asyncSession.Advanced
+                        // Use 'include revisions' in the RQL   
+                        .AsyncRawQuery<Contract>("from Contracts include revisions($p0, $p1)")
+                        // Pass the path to the document properties containing the change vectors
+                        .AddParameter("p0", "RevisionChangeVector")
+                        .AddParameter("p1", "RevisionChangeVectors")
+                        // For each document in the query results,
+                        // the matching revisions will be 'loaded' to the session along with the document
+                        .ToListAsync();
+
+                    // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+                    // No additional trip to the server is made
+                    var revision = await asyncSession.
+                        Advanced.Revisions.GetAsync<Contract>(orderDocuments[0].RevisionChangeVector);
+                    var revisions = await asyncSession
+                        .Advanced.Revisions.GetAsync<Contract>(orderDocuments[0].RevisionChangeVectors);
+                    #endregion
+                }
+                
+                #region include_7_async
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    // Get the revisions' metadata for document 'contracts/1-A'
+                    List<MetadataAsDictionary> contractRevisionsMetadata =  
+                        await asyncSession.Advanced.Revisions.GetMetadataForAsync("contracts/1-A");
+
+                    // Get a change vector from the metadata
+                    string changeVector = 
+                        contractRevisionsMetadata.First().GetString(Constants.Documents.Metadata.ChangeVector);
+
+                    // Patch the document - add the revision change vector to a specific document property
+                    asyncSession.Advanced
+                        .Patch<Contract, string>("contracts/1-A", x => x.RevisionChangeVector, changeVector);
+
+                    // Save your changes
+                    await asyncSession.SaveChangesAsync();
+                }
+                #endregion
+            }
+        }
+        
+        #region sample_document
+        // Sample Contract document
+        private class Contract
+        {
+            public string Id { get; set; }
+            public string Name { get; set; }
+            public string RevisionChangeVector { get; set; }        // A single change vector
+            public List<string> RevisionChangeVectors { get; set; } // A list of change vectors
+        }
+        #endregion
+        
+        private interface IFoo
+        {
+            public interface IRevisionIncludeBuilder<T, out TBuilder>
+            {
+                #region syntax
+                // Include a single revision by Time
+                TBuilder IncludeRevisions(DateTime before);
+                
+                // Include a single revision by Change Vector
+                TBuilder IncludeRevisions(Expression<Func<T, string>> path);
+                
+                // Include an array of revisions by Change Vectors
+                TBuilder IncludeRevisions(Expression<Func<T, IEnumerable<string>>> path);
+                #endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Loading.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Loading.cs
new file mode 100644
index 0000000000..9e546126d1
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/Loading.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Raven.Client;
+using Raven.Client.Documents;
+using Raven.Client.Json;
+using Raven.Documentation.Samples.Orders;
+using Xunit;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Session
+{
+    public class GetRevisions
+    {
+        public async Task Samples()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region example_1_sync
+                    // Get revisions for document 'orders/1-A'
+                    // Revisions will be ordered by most recent revision first
+                    List<Order> orderRevisions = session
+                        .Advanced
+                        .Revisions
+                        .GetFor<Order>(id: "orders/1-A", start: 0, pageSize: 10);
+                    #endregion
+                }
+
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region example_1_async
+                    // Get revisions for document 'orders/1-A'
+                    // Revisions will be ordered by most recent revision first
+                    List<Order> orderRevisions = await asyncSession
+                        .Advanced
+                        .Revisions
+                        .GetForAsync<Order>(id: "orders/1-A", start: 0, pageSize: 10);
+                    #endregion
+                }
+            }
+
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region example_2_sync
+                    // Get revisions' metadata for document 'orders/1-A'
+                    List<MetadataAsDictionary> orderRevisionsMetadata = session
+                        .Advanced
+                        .Revisions
+                        .GetMetadataFor(id: "orders/1-A", start: 0, pageSize: 10);
+                    
+                    // Each item returned is a revision's metadata, as can be verified in the @flags key
+                    var metadata = orderRevisionsMetadata[0];
+                    var flagsValue = metadata.GetString(Constants.Documents.Metadata.Flags);
+                    
+                    Assert.Contains("Revision", flagsValue);
+                    #endregion
+                }
+
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region example_2_async
+                    // Get revisions' metadata for document 'orders/1-A'
+                    List<MetadataAsDictionary> orderRevisionsMetadata = await asyncSession
+                        .Advanced
+                        .Revisions
+                        .GetMetadataForAsync(id: "orders/1-A", start: 0, pageSize: 10);
+                    
+                    // Each item returned is a revision's metadata, as can be verified in the @flags key
+                    var metadata = orderRevisionsMetadata[0];
+                    var flagsValue = metadata.GetString(Constants.Documents.Metadata.Flags);
+                    
+                    Assert.Contains("Revision", flagsValue);
+                    #endregion
+                }
+            }
+
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region example_3_sync
+                    // Get a revision by its creation time
+                    Order revisionFromLastYear = session
+                        .Advanced
+                        .Revisions
+                         // If no revision was created at the specified time,
+                         // then the first revision that precedes it will be returned
+                        .Get<Order>("orders/1-A", DateTime.Now.AddYears(-1));
+                    #endregion
+                }
+
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region example_3_async
+                    // Get a revision by its creation time
+                    Order revisionFromLastYear = await asyncSession
+                        .Advanced
+                        .Revisions
+                        // If no revision was created at the specified time,
+                        // then the first revision that precedes it will be returned
+                        .GetAsync<Order>("orders/1-A", DateTime.Now.AddYears(-1));
+                    #endregion
+                }
+            }
+
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region example_4_sync
+                    // Get revisions metadata 
+                    List<MetadataAsDictionary> revisionsMetadata = session
+                        .Advanced
+                        .Revisions
+                        .GetMetadataFor("orders/1-A", start: 0, pageSize: 25);
+
+                    // Get the change-vector from the metadata
+                    var changeVector = revisionsMetadata[0].GetString(Constants.Documents.Metadata.ChangeVector);
+                    
+                    // Get the revision by its change-vector
+                    Order revision = session
+                        .Advanced
+                        .Revisions
+                        .Get<Order>(changeVector);
+                    #endregion
+                }
+
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region example_4_async
+                    // Get revisions metadata 
+                    List<MetadataAsDictionary> revisionsMetadata = await asyncSession
+                        .Advanced
+                        .Revisions
+                        .GetMetadataForAsync("orders/1-A", start: 0, pageSize: 25);
+
+                    // Get the change-vector from the metadata
+                    var changeVector = revisionsMetadata[0].GetString(Constants.Documents.Metadata.ChangeVector);
+                    
+                    // Get the revision by its change-vector
+                    Order revision = await asyncSession
+                        .Advanced
+                        .Revisions
+                        .GetAsync<Order>(changeVector);
+                    #endregion
+                }
+            }
+        }
+        
+        private interface IFoo
+        {
+            #region syntax_1
+            List<T> GetFor<T>(string id, int start = 0, int pageSize = 25);
+            #endregion
+
+            #region syntax_2
+            List<MetadataAsDictionary> GetMetadataFor(string id, int start = 0, int pageSize = 25);
+            #endregion
+
+            #region syntax_3
+            T Get<T>(string id, DateTime date);
+            #endregion
+            
+            #region syntax_4
+            // Get a revision by its change vector
+            T Get<T>(string changeVector);
+
+            // Get multiple revisions by their change vectors
+            Dictionary<string, T> Get<T>(IEnumerable<string> changeVectors);
+            #endregion
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.cs
new file mode 100644
index 0000000000..e3bd9e4df2
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Raven.Client;
+using Raven.Client.Documents;
+using Raven.Client.Json;
+
+namespace Raven.Documentation.Samples.DocumentExtensions.Revisions.ClientAPI.Session
+{
+    public class ExtractCountersFromRevisions
+    {
+        public ExtractCountersFromRevisions()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var session = store.OpenSession())
+                {
+                    #region extract_counters
+                    // Use GetMetadataFor to get revisions metadata for document 'orders/1-A'
+                    List<MetadataAsDictionary> revisionsMetadata = session
+                        .Advanced.Revisions.GetMetadataFor(id: "orders/1-A");
+
+                    // Extract the counters data from the metadata
+                    List<MetadataAsDictionary> countersDataInRevisions = revisionsMetadata
+                        .Where(metadata =>
+                            metadata.ContainsKey(Constants.Documents.Metadata.RevisionCounters))
+                        .Select(metadata =>
+                            (MetadataAsDictionary)metadata[Constants.Documents.Metadata.RevisionCounters])
+                        .ToList();
+                    #endregion
+                }
+            }
+        }
+
+        public async Task ExtractCountersFromRevisionsAsync()
+        {
+            using (var store = new DocumentStore())
+            {
+                using (var asyncSession = store.OpenAsyncSession())
+                {
+                    #region extract_counters_async
+                    // Use GetMetadataForAsync to get revisions metadata for document 'orders/1-A'
+                    List<MetadataAsDictionary> revisionsMetadata = await asyncSession
+                        .Advanced.Revisions.GetMetadataForAsync(id: "orders/1-A");
+
+                    // Extract the counters data from the metadata
+                    List<MetadataAsDictionary> countersDataInRevisions = revisionsMetadata
+                        .Where(metadata =>
+                            metadata.ContainsKey(Constants.Documents.Metadata.RevisionCounters))
+                        .Select(metadata =>
+                            (MetadataAsDictionary)metadata[Constants.Documents.Metadata.RevisionCounters])
+                        .ToList();
+                    #endregion
+                }
+            }
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/Revisions.cs b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/Revisions.cs
new file mode 100644
index 0000000000..8bb37ef939
--- /dev/null
+++ b/Documentation/5.4/Samples/csharp/Raven.Documentation.Samples/DocumentExtensions/Revisions/Revisions.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Raven.Client;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Operations.Indexes;
+using Raven.Client.Documents.Operations.Revisions;
+using Raven.Client.Documents.Session;
+using Raven.Client.Json;
+using Raven.Documentation.Samples.Orders;
+
+namespace Raven.Documentation.Samples.Server
+{
+    public class Revisions
+    {
+        private class User
+        {
+            public string Name { get; set; }
+        }
+
+        private class Loan
+        {
+            public string Id { get; set; }
+        }
+
+        public async Task Sample()
+        {
+            using (var store = new DocumentStore())
+            {
+                #region configuration
+                await store.Maintenance.SendAsync(new ConfigureRevisionsOperation(new RevisionsConfiguration
+                {
+                    Default = new RevisionsCollectionConfiguration
+                    {
+                        Disabled = false,
+                        PurgeOnDelete = false,
+                        MinimumRevisionsToKeep = 5,
+                        MinimumRevisionAgeToKeep = TimeSpan.FromDays(14),
+                    },
+                    Collections = new Dictionary<string, RevisionsCollectionConfiguration>
+                    {
+                        {"Users", new RevisionsCollectionConfiguration {Disabled = true}},
+                        {"Orders", new RevisionsCollectionConfiguration {Disabled = false}}
+                    }
+                }));
+                #endregion
+
+                #region store
+                using (var session = store.OpenSession())
+                {
+                    session.Store(new User
+                    {
+                        Name = "Ayende Rahien"
+                    });
+
+                    session.SaveChanges();
+                }
+                #endregion
+
+                Loan loan = new Loan { Id = "loans/1" };
+
+                using (var session = store.OpenSession())
+                {
+                    #region get_revisions
+                    // Get all the revisions that were created for a document, by document ID
+                    List<User> revisions = session
+                        .Advanced
+                        .Revisions
+                        .GetFor<User>("users/1", start: 0, pageSize: 25);
+
+                    // Get revisions metadata 
+                    List<MetadataAsDictionary> revisionsMetadata = session
+                        .Advanced
+                        .Revisions
+                        .GetMetadataFor("users/1", start: 0, pageSize: 25);
+
+                    // Get revisions by their change vectors
+                    User revison = session
+                        .Advanced
+                        .Revisions
+                        .Get<User>(revisionsMetadata[0].GetString(Constants.Documents.Metadata.ChangeVector));
+
+                    // Get a revision by its creation time
+                    // If no revision was created at that precise time, get the first revision to precede it
+                    User revisonAtYearAgo = session
+                        .Advanced
+                        .Revisions
+                        .Get<User>("users/1", DateTime.Now.AddYears(-1));
+                    #endregion
+                }
+            }
+        }
+
+        public async Task ForceRevisionCreationForSample()
+        {
+            using (var store = new DocumentStore())
+            {
+                string companyId;
+                using (var session = store.OpenSession())
+                {
+                    #region ForceRevisionCreationByEntity
+                    // Force revision creation by entity
+                    var company = new Company { 
+                            Name = "CompanyProfile" 
+                        };
+                    session.Store(company);
+                    companyId = company.Id;
+                    session.SaveChanges();
+
+                    // Forcing the creation of a revision by entity can be performed 
+                    // only when the entity is tracked, after the document is stored.
+                    session.Advanced.Revisions.ForceRevisionCreationFor<Company>(company);
+                    #endregion
+                }
+
+                using (var session = store.OpenSession())
+                {
+                    #region ForceRevisionCreationByID
+                    // Force revision creation by ID
+                    session.Advanced.Revisions.ForceRevisionCreationFor(companyId);
+                    session.SaveChanges();
+                    #endregion
+
+                    var revisionsCount = session.Advanced.Revisions.GetFor<Company>(companyId).Count;
+                }
+            }
+        }
+
+        public class Company
+        {
+            public string Id { get; set; }
+            public string ExternalId { get; set; }
+            public string Name { get; set; }
+            public Contact Contact { get; set; }
+            public Address Address { get; set; }
+            public string Phone { get; set; }
+            public string Fax { get; set; }
+        }
+
+    }
+}
diff --git a/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.java b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.java
new file mode 100644
index 0000000000..680677202a
--- /dev/null
+++ b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.java
@@ -0,0 +1,40 @@
+package net.ravendb.ClientApi.Operations;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.operations.revisions;
+import net.ravendb.client.documents.operations.revisions.RevisionsCollectionConfiguration;
+
+public class ConfigureRevisions {
+
+    public ConfigureRevisions() {
+        try (IDocumentStore documentStore = new DocumentStore()) {
+            //region operation
+            // Create a configuration for the Employees collection
+            RevisionsCollectionConfiguration employeesRevConfig = new RevisionsCollectionConfiguration();
+            employeesRevConfig.setMinimumRevisionAgeToKeep(Duration.ofDays(1));
+            employeesRevConfig.setMinimumRevisionsToKeep(42l);
+            employeesRevConfig.setPurgeOnDelete(true);
+
+            // Add the Employees configuration to a map
+            Map<String, RevisionsCollectionConfiguration> collections = new HashMap<>();
+            collectionConfig.put("Employees", employeesRevConfig);
+
+            // Create a default collection configuration
+            RevisionsCollectionConfiguration defaultRevConfig = new RevisionsCollectionConfiguration();
+            defaultRevConfig.setMinimumRevisionAgeToKeep(Duration.ofDays(7));
+            defaultRevConfig.setMinimumRevisionsToKeep(100l);
+            defaultRevConfig.setPurgeOnDelete(false);
+
+            // Combine to create a configuration for the database
+            RevisionsConfiguration northwindRevConfig = new RevisionsConfiguration();
+            northwindRevConfig.setCollections(collections);
+            northwindRevConfig.setDefaultConfig(defaultRevConfig);
+
+            // Execute the operation to update the database
+            documentStore.maintenance().send(new ConfigureRevisionsOperation(northwindRevConfig));
+            //endregion
+        }
+
+    }
+}
diff --git a/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/CounterRevisions.java b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/CounterRevisions.java
new file mode 100644
index 0000000000..fa17df6e25
--- /dev/null
+++ b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/CounterRevisions.java
@@ -0,0 +1,30 @@
+package net.ravendb.ClientApi.Session.Revisions;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.session.IDocumentSession;
+import net.ravendb.client.json.MetadataAsDictionary;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CounterRevisions {
+
+    public void samples() {
+        try (IDocumentStore store = new DocumentStore()) {
+            try (IDocumentSession session = store.openSession()) {
+                //region example
+                List<MetadataAsDictionary> orderRevisionsMetadata = session.advanced()
+                    .revisions()
+                    .getMetadataFor("orders/1-A", 0, 10);
+
+                List<MetadataAsDictionary> orderCountersSnapshots = orderRevisionsMetadata
+                    .stream()
+                    .filter(x -> x.containsKey("@counters-snapshot"))
+                    .map(x -> (MetadataAsDictionary) x.get("@counters-snapshot"))
+                    .collect(Collectors.toList());
+                //endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/Loading.java b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/Loading.java
new file mode 100644
index 0000000000..00c4fb1d92
--- /dev/null
+++ b/Documentation/5.4/Samples/java/src/test/java/net/ravendb/DocumentExtensions/Revisions/ClientAPI/Session/Loading.java
@@ -0,0 +1,71 @@
+package net.ravendb.ClientApi.Session.Revisions;
+
+import net.ravendb.client.documents.DocumentStore;
+import net.ravendb.client.documents.IDocumentStore;
+import net.ravendb.client.documents.session.IDocumentSession;
+import net.ravendb.client.json.MetadataAsDictionary;
+
+import java.util.List;
+import java.util.Map;
+
+public class Loading {
+    private interface IFoo {
+        //region syntax_1
+        <T> List<T> getFor(Class<T> clazz, String id);
+
+        <T> List<T> getFor(Class<T> clazz, String id, int start);
+
+        <T> List<T> getFor(Class<T> clazz, String id, int start, int pageSize);
+        //endregion
+
+        //region syntax_2
+        List<MetadataAsDictionary> getMetadataFor(String id);
+
+        List<MetadataAsDictionary> getMetadataFor(String id, int start);
+
+        List<MetadataAsDictionary> getMetadataFor(String id, int start, int pageSize);
+        //endregion
+
+        //region syntax_3
+        <T> T get(Class<T> clazz, String changeVector);
+
+        <T> Map<String, T> get(Class<T> clazz, String[] changeVectors);
+        //endregion
+    }
+
+    private static class Order {
+
+    }
+
+    public void samples() {
+        try (IDocumentStore store = new DocumentStore()) {
+            try (IDocumentSession session = store.openSession()) {
+                //region example_1_sync
+                List<Order> orderRevisions = session
+                    .advanced()
+                    .revisions()
+                    .getFor(Order.class, "orders/1-A", 0, 10);
+                //endregion
+            }
+
+            try (IDocumentSession session = store.openSession()) {
+                //region example_2_sync
+                List<MetadataAsDictionary> orderRevisionsMetadata = session
+                    .advanced()
+                    .revisions()
+                    .getMetadataFor("orders/1-A", 0, 10);
+                //endregion
+            }
+
+            try (IDocumentSession session = store.openSession()) {
+                String orderRevisionChangeVector = null;
+                //region example_3_sync
+                Order orderRevision = session
+                    .advanced()
+                    .revisions()
+                    .get(Order.class, orderRevisionChangeVector);
+                //endregion
+            }
+        }
+    }
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisions.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisions.js
new file mode 100644
index 0000000000..2308f8ad86
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisions.js
@@ -0,0 +1,132 @@
+import { DocumentStore } from "ravendb";
+
+const documentStore = new DocumentStore();
+
+async function configureRevisions() {
+    {
+        //region replace_configuration
+        // ==============================================================================
+        // Define default settings that will apply to ALL collections
+        // Note: this is optional
+        const defaultRevConfig = new RevisionsCollectionConfiguration();
+        defaultRevConfig.minimumRevisionsToKeep = 100;
+        defaultRevConfig.minimumRevisionAgeToKeep = TimeUtil.millisToTimeSpan(3600 * 1000 * 24 * 7) // 7 days
+        defaultRevConfig.maximumRevisionsToDeleteUponDocumentUpdate = 15;
+        defaultRevConfig.purgeOnDelete = false;
+        defaultRevConfig.disabled = false;
+        
+        // With this configuration:
+        // ------------------------
+        // * A revision will be created anytime a document is modified or deleted.
+        // * Revisions of a deleted document can be accessed in the Revisions Bin view.
+        // * At least 100 of the latest revisions will be kept.
+        // * Older revisions will be removed if they exceed 7 days on next revision creation.
+        // * A maximum of 15 revisions will be deleted each time a document is updated,
+        //   until the defined '# of revisions to keep' limit is reached.
+
+        // ==============================================================================
+        // Define a specific configuration for the EMPLOYEES collection
+        // This will override the default settings
+        const employeesRevConfig  = new RevisionsCollectionConfiguration();
+        employeesRevConfig.minimumRevisionsToKeep = 50;
+        employeesRevConfig.minimumRevisionAgeToKeep = TimeUtil.millisToTimeSpan(3600 * 1000 * 12);  // 12 hrs
+        employeesRevConfig.purgeOnDelete = true;
+        employeesRevConfig.disabled = false;
+
+        // With this configuration:
+        // ------------------------
+        // * A revision will be created anytime an Employee document is modified.
+        // * When a document is deleted all its revisions will be removed.
+        // * At least 50 of the latest revisions will be kept.
+        // * Older revisions will be removed if they exceed 12 hours on next revision creation.
+
+        // ==============================================================================
+        // Define a specific configuration for the PRODUCTS collection
+        // This will override the default settings
+        const productsRevConfig   = new RevisionsCollectionConfiguration();
+        productsRevConfig.disabled = true;
+        
+        // With this configuration:
+        // ------------------------
+        // No revisions will be created for the Products collection,
+        // even though default configuration is enabled
+
+        // ==============================================================================
+        // Combine all configurations in the RevisionsConfiguration object
+        const revisionsConfig = new RevisionsConfiguration();
+        revisionsConfig.defaultConfig = defaultRevConfig;
+        revisionsConfig.collections = new Map<string, RevisionsCollectionConfiguration>();
+        revisionsConfig.collections.set("Employees", employeesRevConfig);
+        revisionsConfig.collections.set("Products", productsRevConfig);
+
+        // ==============================================================================
+        // Define the configure revisions operation, pass the configuration
+        const configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+
+        // Execute the operation by passing it to maintenance.send
+        // Any existing configuration will be replaced with the new configuration passed
+        await store.maintenance.send(configureRevisionsOp);
+        //endregion
+    }
+    {
+        //region modify_configuration
+        // ==============================================================================
+        // Define the get database record operation:
+        const getDatabaseRecordOp = new GetDatabaseRecordOperation(documentStore.database);
+        // Get the current revisions configuration from the database record:
+        const record = await store.maintenance.server.send(getDatabaseRecordOp);
+        const revisionsConfig = record.revisions;
+
+        // ==============================================================================
+        // If no revisions configuration exists, then create a new configuration
+        if (!revisionsConfig) {
+            const revisionsConfig = new RevisionsConfiguration();
+            revisionsConfig.defaultConfig = defaultRevConfig;
+            revisionsConfig.collections = new Map<string, RevisionsCollectionConfiguration>();
+            revisionsConfig.collections.set("Employees", employeesRevConfig);
+            revisionsConfig.collections.set("Products", productsRevConfig);
+        }
+        
+        // ==============================================================================
+        // If a revisions configuration already exists, then modify it
+        else {
+            revisionsConfig.defaultConfig = defaultRevConfig;
+            revisionsConfig.collections.set("Employees", employeesRevConfig);
+            revisionsConfig.collections.set("Products", productsRevConfig);
+        }
+        
+        // ==============================================================================
+        // Define the configure revisions operation, pass the configuration
+        const configureRevisionsOp = new ConfigureRevisionsOperation(revisionsConfig);
+        
+        // Execute the operation by passing it to maintenance.send
+        // The existing configuration will be updated
+        await documentStore.maintenance.send(configureRevisionsOp);
+        //endregion
+    }
+}
+
+{
+    //region syntax_1
+    const configureRevisionsOp = new ConfigureRevisionsOperation(configuration);
+    //endregion
+
+    //region syntax_2
+    class RevisionsConfiguration
+    {
+        defaultConfig;
+        collections;
+    }
+    //endregion
+
+    //region syntax_3
+    class RevisionsCollectionConfiguration
+    {
+        minimumRevisionsToKeep;
+        minimumRevisionAgeToKeep;
+        maximumRevisionsToDeleteUponDocumentUpdate;
+        purgeOnDelete;
+        disabled;
+    }
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisionsForConflicts.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisionsForConflicts.js
new file mode 100644
index 0000000000..c5e8721a4a
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/configureRevisionsForConflicts.js
@@ -0,0 +1,45 @@
+import { DocumentStore } from "ravendb";
+
+const documentStore = new DocumentStore();
+
+async function configureRevisions() {
+    {
+        //region conflict_revisions_configuration
+        // Define the settings that will apply for conflict revisions (for all collections)
+        const conflictRevConfig  = new RevisionsCollectionConfiguration();
+        conflictRevConfig.minimumRevisionAgeToKeep = TimeUtil.millisToTimeSpan(3600 * 1000 * 24 * 45) // 45 days
+        conflictRevConfig.purgeOnDelete = true;
+        
+        // With this configuration:
+        // ------------------------
+        // * A revision will be created for conflict documents
+        // * When the parent document is deleted all its revisions will be removed.
+        // * Revisions that exceed 45 days will be removed on next revision creation.
+
+        // Define the configure conflict revisions operation, pass the configuration
+        const configureConflictRevisionsOp =
+            new ConfigureRevisionsForConflictsOperation(documentStore.database, conflictRevConfig);
+
+        // Execute the operation by passing it to maintenance.server.send
+        // The existing conflict revisions configuration will be replaced by the configuration passed
+        await documentStore.maintenance.server.send(configureConflictRevisionsOp);
+        //endregion
+    }
+}
+
+{
+    //region syntax_1
+    const configureRevisionsOp = new ConfigureRevisionsForConflictsOperation(database, configuration);
+    //endregion
+
+    //region syntax_2
+    class RevisionsCollectionConfiguration
+    {
+        minimumRevisionsToKeep;
+        minimumRevisionAgeToKeep;
+        maximumRevisionsToDeleteUponDocumentUpdate;
+        purgeOnDelete;
+        disabled;
+    }
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/getRevisions.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/getRevisions.js
new file mode 100644
index 0000000000..088d0b79ef
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/operations/getRevisions.js
@@ -0,0 +1,69 @@
+import { DocumentStore } from "ravendb";
+
+const documentStore = new DocumentStore();
+
+async function getRevisions() {
+    {
+        //region getAllRevisions
+        // Define the get revisions operation, pass the document id
+        const getRevisionsOp = new GetRevisionsOperation("Companies/1-A");
+
+        // Execute the operation by passing it to operations.send
+        const revisions = await documentStore.operations.send(getRevisionsOp);
+
+        // The revisions info:
+        const allRevisions = revisions.results;        // All the revisions
+        const revisionsCount = revisions.totalResults; // Total number of revisions
+        //endregion
+    }
+    {
+        //region getRevisionsWithPaging
+        const parameters = {
+            start: 0,
+            pageSize: 100
+        };
+        
+        while (true)
+        {
+            // Execute the get revisions operation
+            // Pass parameters with document id, start & page size
+            const revisions = await documentStore.operations.send(
+                new GetRevisionsOperation("Companies/1-A", parameters));
+            
+            {
+                // Process the retrieved revisions here
+            }
+
+            if (revisions.results.length < parameters.pageSize)
+                break; // No more revisions to retrieve
+
+            // Increment 'start' by page-size, to get the "next page" in next iteration
+            parameters.start += parameters.pageSize;
+        }
+        //endregion
+    }
+}
+
+{
+    //region syntax_1  
+    // Available overloads:
+    const getRevisionsOp = new GetRevisionsOperation(id);
+    const getRevisionsOp = new GetRevisionsOperation(id, parameters);
+    //endregion
+
+    //region syntax_2
+    // The parameters object
+    {
+        start,   // Revision number to start from
+        pageSize // Number of revisions to get
+    }
+    //endregion
+
+    //region syntax_3
+    class RevisionsResult
+    {
+        results;      // The retrieved revisions
+        totalResults; // Total number of revisions that exist for the document
+    }
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/getCount.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/getCount.js
new file mode 100644
index 0000000000..d29a9eeb9b
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/getCount.js
@@ -0,0 +1,21 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+
+async function getCount() {
+
+    const session = store.openSession();
+
+    //region getCount
+    // Get the number of revisions for document 'companies/1-A"
+    const revisionsCount = await session.advanced.revisions.getCountFor("companies/1-A");
+    //endregion
+}
+
+{
+    const session = store.openSession();
+    
+    //region syntax
+    await session.advanced.revisions.getCountFor(id);
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/including.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/including.js
new file mode 100644
index 0000000000..5631205fc9
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/including.js
@@ -0,0 +1,180 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+
+async function includeRevisions() {
+
+    const session = store.openSession();
+    {
+        //region include_1
+        // The revision creation time
+        // For example - looking for a revision from last month
+        const creationTime = new Date();
+        creationTime.setMonth(creationTime.getMonth() - 1).toLocaleString();
+
+        // Load a document:
+        const order = await session.load("orders/1-A", {
+            // Pass the revision creation time to 'includeRevisions'
+            // The revision will be 'loaded' to the session along with the document
+            includes: builder => builder.includeRevisions(creationTime)
+        });
+
+        // Get the revision by creation time - it will be retrieved from the SESSION
+        // No additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get("orders/1-A", creationTime);
+        //endregion
+    }
+    {
+        //region include_2
+        // Load a document:
+        const contract = await session.load("contracts/1-A", {
+            includes: builder => builder
+                // Pass the path to the document property that contains the revision change vector(s)
+                // The revision(s) will be 'loaded' to the session along with the document
+                .includeRevisions("revisionChangeVector")  // Include a single revision
+                .includeRevisions("revisionChangeVectors") // Include multiple revisions
+        });
+
+        // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+        // No additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get(contract.revisionChangeVector);
+        const revisions = await session
+            .advanced.revisions.get(contract.revisionChangeVectors);
+        //endregion
+    }
+    {
+        //region include_3
+        // The revision creation time
+        // For example - looking for a revision from last month
+        const creationTime = new Date();
+        creationTime.setMonth(creationTime.getMonth() - 1).toLocaleString();
+
+        // Define the query:
+        const query = session.query({collection: "Orders"})
+            .whereEquals("ShipTo.Country", "Canada")
+            // Pass the revision creation time to 'includeRevisions'
+            .include(builder => builder.includeRevisions(creationTime));
+
+        // Execute the query:
+        // For each document in the query results,
+        // the matching revision will be 'loaded' to the session along with the document
+        const orderDocuments = await query.all();
+
+        // Get a revision by its creation time for a document from the query results
+        // It will be retrieved from the SESSION - no additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get(orderDocuments[0].id, creationTime);
+        //endregion
+    }
+    {
+        //region include_4
+        // Define the query:
+        const query = session.query({collection: "Contracts"})
+            // Pass the path to the document property that contains the revision change vector(s)
+            .include(builder => {
+                builder
+                    .includeRevisions("revisionChangeVector")  // Include a single revision
+                    .includeRevisions("revisionChangeVectors") // Include multiple revisions
+            });
+
+        // Execute the query:
+        // For each document in the query results,
+        // the matching revisions will be 'loaded' to the session along with the document
+        const orderDocuments = await query.all();
+
+        // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+        // No additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get(orderDocuments[0].revisionChangeVector);
+        const revisions = await session
+            .advanced.revisions.get(orderDocuments[0].revisionChangeVectors);
+        //endregion
+    }
+    {
+        //region include_5
+        // The revision creation time
+        // For example - looking for a revision from last month
+        const creationTime = new Date();
+        creationTime.setMonth(creationTime.getMonth() - 1).toLocaleString();
+
+        // Define the Raw Query:
+        const rawQuery = session.advanced
+            // Use 'include revisions' in the RQL
+            .rawQuery("from Orders include revisions($p0)")
+            // Pass the revision creation time 
+            .addParameter("p0", creationTime);
+
+        // Execute the query:
+        // For each document in the query results,
+        // the matching revision will be 'loaded' to the session along with the document
+        const orderDocuments = await rawQuery.all();
+
+        // Get a revision by its creation time for a document from the query results
+        // It will be retrieved from the SESSION - no additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get(orderDocuments[0].Id, creationTime);
+        //endregion
+    }
+    {
+        //region include_6
+        // Define the Raw Query:
+        const rawQuery = session.advanced
+            // Use 'include revisions' in the RQL
+            .rawQuery("from Contracts include revisions($p0, $p1)")
+            // Pass the path to the document properties containing the change vectors
+            .addParameter("p0", "revisionChangeVector")
+            .addParameter("p1", "revisionChangeVectors");
+
+        // Execute the raw query:
+        // For each document in the query results,
+        // the matching revisions will be 'loaded' to the session along with the document
+        const orderDocuments = await rawQuery.all();
+
+        // Get the revision(s) by change vectors - it will be retrieved from the SESSION
+        // No additional trip to the server is made
+        const revision = await session
+            .advanced.revisions.get(orderDocuments[0].revisionChangeVector);
+        const revisions = await session
+            .advanced.revisions.get(orderDocuments[0].revisionChangeVectors);
+        //endregion
+    }
+    {
+        //region include_7
+        // Get the revisions' metadata for document 'contracts/1-A'
+        const contractRevisionsMetadata = await session
+            .advanced.revisions.getMetadataFor("contracts/1-A");
+
+        // Get a change vector from the metadata
+        const metadata = orderRevisionsMetadata[0];
+        const changeVector = metadata[CONSTANTS.Documents.Metadata.CHANGE_VECTOR];
+
+        // Patch the document - add the revision change vector to a specific document property
+        await session.advanced.patch("contracts/1-A", "revisionChangeVector", changeVector);
+
+        // Save your changes
+        await session.saveChanges();
+        //endregion
+    }
+}
+
+{
+    //region syntax
+    object includeRevisions(before);
+    object includeRevisions(path);
+    //endregion
+}
+
+{
+    //region sample_document
+    // Sample Contract document
+    class Contract {
+        id: string;
+        name: string;
+        revisionChangeVector: string;
+        revisionChangeVectors: string[];
+    }
+    //endregion
+}
+
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/loading.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/loading.js
new file mode 100644
index 0000000000..6720f3e479
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/loading.js
@@ -0,0 +1,99 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+
+async function samples() {
+    {
+        const session = store.openSession();
+        
+        {
+            //region example_1
+            // Get revisions for document 'orders/1-A'
+            const orderRevisions = await session.advanced.revisions
+                .getFor("orders/1-A", {
+                    start: 0,
+                    pageSize: 10
+                });
+            //endregion
+        }
+        {
+            //region example_2
+            // Get revisions' metadata for document 'orders/1-A'
+            const orderRevisionsMetadata = await session.advanced.revisions
+                .getMetadataFor("orders/1-A", {
+                    start: 0,
+                    pageSize: 10
+                });
+
+            // Each item returned is a revision's metadata, as can be verified in the @flags key
+            const metadata = orderRevisionsMetadata[0];
+            const flagsValue = metadata[CONSTANTS.Documents.Metadata.FLAGS];
+
+            assertThat(flagsValue).contains("Revision");
+            //endregion
+        }
+        {
+            //region example_3
+            // Creation time to use, e.g. last year: 
+            const creationTime = new Date();
+            creationTime.setFullYear(creationTime.getFullYear() - 1);
+
+            // Get a revision by its creation time
+            // If no revision was created at the specified time,
+            // then the first revision that precedes it will be returned
+            const orderRevision = await session.advanced.revisions
+                .get("orders/1-A", creationTime.toLocaleDateString());
+            //endregion
+        }
+        {
+            //region example_4
+            // Get revisions metadata 
+            const revisionsMetadata = await session.advanced.revisions
+                .getMetadataFor("orders/1-A", {
+                    start: 0,
+                    pageSize: 25
+                });
+            
+            // Get the change-vector from the metadata
+            var changeVector = revisionsMetadata[0][CONSTANTS.Documents.Metadata.CHANGE_VECTOR];
+            
+            // Get the revision by its change-vector
+            const orderRevision = await session.advanced.revisions
+                .get(changeVector);
+            //endregion
+        }
+    }
+}
+
+{
+    const session = store.openSession();
+    //region syntax_1
+    // Available overloads:
+    await session.advanced.revisions.getFor(id);
+    await session.advanced.revisions.getFor(id, options);
+    //endregion
+
+    //region syntax_2
+    // Available overloads:
+    await session.advanced.revisions.getMetadataFor(id);
+    await session.advanced.revisions.getMetadataFor(id, options);
+    //endregion
+
+    //region syntax_3
+    await session.advanced.revisions.get(id, date);
+    //endregion
+
+    //region syntax_4
+    // Available overloads:
+    await session.advanced.revisions.get(changeVector);
+    await session.advanced.revisions.get(changeVectors);
+    //endregion
+
+    //region syntax_5
+    // options object
+    {
+        start,   // The first revision to retrieve, used for paging. Default is 0.
+        pageSize // Number of revisions to retrieve per results page. Default is 25.
+    }
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/revisionsAndOtherFeatures.js b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/revisionsAndOtherFeatures.js
new file mode 100644
index 0000000000..2500dd7c98
--- /dev/null
+++ b/Documentation/5.4/Samples/nodejs/documentExtensions/revisions/client-api/session/revisionsAndOtherFeatures.js
@@ -0,0 +1,18 @@
+import { DocumentStore } from "ravendb";
+
+const store = new DocumentStore();
+
+async function getCount() {
+
+    const session = store.openSession();
+
+    //region extract_counters    
+    // Use getMetadataFor to get revisions metadata for document 'orders/1-A'
+    const revisionsMetadata = await session.advanced.revisions.getMetadataFor("orders/1-A");
+
+    // Extract the counters data from the metadata
+    const countersDataInRevisions = revisionsMetadata
+        .filter(x => !!x[CONSTANTS.Documents.Metadata.REVISION_COUNTERS])
+        .map(x => x[CONSTANTS.Documents.Metadata.REVISION_COUNTERS]);
+    //endregion
+}
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py
new file mode 100644
index 0000000000..42a87f494e
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py
@@ -0,0 +1,158 @@
+from datetime import timedelta
+from typing import Dict
+
+from ravendb import RevisionsCollectionConfiguration, RevisionsConfiguration, GetDatabaseRecordOperation
+from ravendb.documents.operations.definitions import MaintenanceOperation
+from ravendb.documents.operations.revisions import ConfigureRevisionsOperation, ConfigureRevisionsOperationResult
+
+from examples_base import ExampleBase
+
+
+class ConfigRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_configure_revisions(self):
+        with self.embedded_server.get_document_store("ConfigurationRevisions") as store:
+            with store.open_session() as session:
+                # region replace_configuration
+                # ==============================================================================
+                # Define default settings that will apply to ALL collections
+                # Note: this is optional
+                default_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=100,
+                    minimum_revisions_age_to_keep=timedelta(days=7),
+                    maximum_revisions_to_delete_upon_document_creation=15,
+                    purge_on_delete=False,
+                    disabled=False,
+                    # With this configuration:
+                    # ------------------------
+                    # * A revision will be created anytime a document is modified or deleted.
+                    # * Revisions of a deleted document can be accessed in the Revisions Bin view.
+                    # * At least 100 of the latest revisions will be kept.
+                    # * Older revisions will be removed if they exceed 7 days on next revision creation.
+                    # * A maximum of 15 revisions will be deleted each time a document is updated,
+                    #   until the defined '# of revisions to keep' limit is reached.
+                )
+
+                employees_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=50,
+                    minimum_revisions_age_to_keep=timedelta(hours=12),
+                    purge_on_delete=True,
+                    disabled=False,
+                    # With this configuration:
+                    # ------------------------
+                    # * A revision will be created anytime an Employee document is modified.
+                    # * When a document is deleted all its revisions will be removed.
+                    # * At least 50 of the latest revisions will be kept.
+                    # * Older revisions will be removed if they exceed 12 hours on next revision creation.
+                )
+
+                # ==============================================================================
+                # Define a specific configuration for the EMPLOYEES collection
+                # This will override the default settings
+                products_rev_config = RevisionsCollectionConfiguration(
+                    disabled=True
+                    # No revisions will be created for the Products collection,
+                    # even though default configuration is enabled
+                )
+
+                # ==============================================================================
+                # Combine all configurations in the RevisionsConfiguration object
+                revisions_config = RevisionsConfiguration(
+                    default_config=default_rev_config,
+                    collections={"Employees": employees_rev_config, "Products": products_rev_config},
+                )
+
+                # ==============================================================================
+                # Define the configure revisions operation, pass the configuration
+                configure_revisions_op = ConfigureRevisionsOperation(revisions_config)
+
+                # Execute the operation by passing it to Maintenance.Send
+                # Any existing configuration will be replaced with the new configuration passed
+                store.maintenance.send(configure_revisions_op)
+                # endregion
+
+                # MODIFY
+                default_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=100,
+                    minimum_revisions_age_to_keep=timedelta(days=7),
+                    maximum_revisions_to_delete_upon_document_creation=15,
+                    purge_on_delete=False,
+                    disabled=False,
+                )
+
+                employees_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=50,
+                    minimum_revisions_age_to_keep=timedelta(hours=12),
+                    purge_on_delete=True,
+                )
+
+                products_rev_config = RevisionsCollectionConfiguration(disabled=True)
+
+                # region modify_configuration
+                # ==============================================================================
+                # Define the get database record operation:
+                get_database_record_op = GetDatabaseRecordOperation(store.database)
+                # Get the current revisions configuration from the database record:
+                revisions_config = store.maintenance.server.send(get_database_record_op).revisions
+
+                # ==============================================================================
+                # If no revisions configuration exists, then create a new configuration
+                if revisions_config is None:
+                    revisions_config = RevisionsConfiguration(
+                        default_config=default_rev_config,
+                        collections={"Employees": employees_rev_config, "Products": products_rev_config},
+                    )
+
+                # ==============================================================================
+                # If a revisions configuration already exists, then modify it
+                else:
+                    revisions_config.default_config = default_rev_config
+                    revisions_config.collections["Employees"] = employees_rev_config
+                    revisions_config.collections["Products"] = products_rev_config
+
+                # ==============================================================================
+                # Define the configure revisions operation, pass the configuration
+                configure_revisions_op = ConfigureRevisionsOperation(revisions_config)
+
+                # Execute the operation by passing it to maintenance.send
+                # The existing configuration will be updated
+                store.maintenance.send(configure_revisions_op)
+
+                # Execute the operation by passing it to maintenance.send
+                # The existing configuration will be updated
+                store.maintenance.send(configure_revisions_op)
+                # endregion
+
+
+class Foo:
+    # region syntax_1
+    class ConfigureRevisionsOperation(MaintenanceOperation[ConfigureRevisionsOperationResult]):
+        def __init__(self, configuration: RevisionsConfiguration): ...
+
+    # endregion
+
+    # region syntax_2
+
+    class RevisionsConfiguration:
+        def __init__(
+            self,
+            default_config: RevisionsCollectionConfiguration = None,
+            collections: Dict[str, RevisionsCollectionConfiguration] = None,
+        ): ...
+
+    # endregion
+    # region syntax_3
+
+    class RevisionsCollectionConfiguration:
+        def __init__(
+            self,
+            minimum_revisions_to_keep: int = None,
+            minimum_revisions_age_to_keep: timedelta = None,
+            disabled: bool = False,
+            purge_on_delete: bool = False,
+            maximum_revisions_to_delete_upon_document_creation: int = None,
+        ): ...
+
+    # endregion
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py
new file mode 100644
index 0000000000..fd63257da6
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py
@@ -0,0 +1,47 @@
+from ravendb.documents.operations.revisions import GetRevisionsOperation
+
+from examples_base import ExampleBase, Company
+
+
+class GetRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_get_revisions(self):
+        with self.embedded_server.get_document_store("GetRevisionsOperation") as store:
+            # region getAllRevisions
+            # Define the get revisions operation, pass the document id
+            get_revisions_op = GetRevisionsOperation("companies/1-A")
+
+            # Execute the operation by passing it to Operations.Send
+            revisions = store.operations.send(get_revisions_op)
+
+            # The revisions info:
+            all_revisions = revisions.results  # All the revisions
+            revisions_count = revisions.total_results  # Total number of revisions
+            # endregion
+
+            # region getRevisionsWithPaging
+            start = 0
+            page_size = 100
+
+            while True:
+                # Execute the get revisions operation
+                # Pass the document id, start & page size to get
+                revisions = store.operations.send(GetRevisionsOperation("comapnies/1-A", Company, start, page_size))
+
+                # Process the retrieved revisions here
+
+                if len(revisions.results) < page_size:
+                    break  # No more revisions to retrieve
+
+                # Increment 'start' by page-size, to get the "next page" in next iteration
+                start += page_size
+
+            # endregion
+
+            # region getRevisionsWithPagingParams
+            parameters = GetRevisionsOperation.Parameters("companies/1-A", 0, 100)
+
+            revisions = store.operations.send(GetRevisionsOperation.from_parameters(parameters))
+            # endregion
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py
new file mode 100644
index 0000000000..e59b1a9500
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py
@@ -0,0 +1,21 @@
+from examples_base import ExampleBase
+
+
+class CountingRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_count_revisions(self):
+        with self.embedded_server.get_document_store("CountingRevisions") as store:
+            with store.open_session() as session:
+                # region getCount
+                # Get the number of revisions for document 'companies/1-A'
+                revisions_count = session.advanced.revisions.get_count_for("companies/1-A")
+                # endregion
+
+
+# region syntax
+def get_count_for(self, id_: str) -> int: ...
+
+
+# endregion
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py
new file mode 100644
index 0000000000..8f217dbd3a
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py
@@ -0,0 +1,76 @@
+import datetime
+from typing import Type, List, Dict, TypeVar
+
+from ravendb.primitives import constants
+
+from examples_base import ExampleBase, Order
+
+_T = TypeVar("_T")
+
+
+class GetRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_get_revisions(self):
+        with self.embedded_server.get_document_store("GetRevisions") as store:
+            with store.open_session() as session:
+                # region example_1_sync
+                # Get revisions for document 'orders/1-A'
+                # Revisions will be ordered by most recent revision first
+                order_revisions = session.advanced.revisions.get_for("orders/1-A", Order, 0, 10)
+                # endregion
+
+                # region example_2_sync
+                # Get 'revisions' metadata for document 'orders/1-A'
+                order_revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A", 0, 10)
+
+                # Each item returned is a revision's metadata, as can be verified in the @flags key
+                metadata = order_revisions_metadata[0]
+                flags_value = metadata[constants.Documents.Metadata.FLAGS]
+
+                self.assertIn("Revision", flags_value)
+                # endregion
+
+                # region example_3_sync
+                # Get a revision by its creation time
+                revision_from_last_year = (
+                    session.advanced.revisions
+                    # If no revision was created at the specified time,
+                    # then the first revision that precedes it will be returned
+                    .get_by_before_date("orders/1-A", datetime.datetime.utcnow() - datetime.timedelta(days=365))
+                )
+                # endregion
+                # region example_4_sync
+                # Get revisions metadata
+                revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A", 0, 25)
+
+                # Get the change-vector from the metadata
+                change_vector = revisions_metadata[0][constants.Documents.Metadata.CHANGE_VECTOR]
+
+                # Get the revision by its change-vector
+                revision = session.advanced.revisions.get_by_change_vector(change_vector, Order)
+                # endregion
+
+
+class Foo:
+    # region syntax_1
+    def get_for(self, id_: str, object_type: Type[_T] = None, start: int = 0, page_size: int = 25) -> List[_T]: ...
+
+    # endregion
+    # region syntax_2
+    def get_metadata_for(self, id_: str, start: int = 0, page_size: int = 25) -> List["MetadataAsDictionary"]: ...
+
+    # endregion
+    # region syntax_3
+    def get_by_before_date(self, id_: str, before_date: datetime.datetime, object_type: Type[_T] = None) -> _T: ...
+
+    # endregion
+    # region syntax_4
+    # Get a revision by its change vector
+    def get_by_change_vector(self, change_vector: str, object_type: Type[_T] = None) -> _T: ...
+
+    # Get multiple revisions by their change vectors
+    def get_by_change_vectors(self, change_vectors: List[str], object_type: Type[_T] = None) -> Dict[str, _T]: ...
+
+    # endregion
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py
new file mode 100644
index 0000000000..fe9a9ce9c2
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py
@@ -0,0 +1,23 @@
+from ravendb.primitives import constants
+
+from examples_base import ExampleBase
+
+
+class ExtractCountersFromRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_extract_counters_from_revisions(self):
+        with self.embedded_server.get_document_store("ExtractCountersFromRevisions") as store:
+            with store.open_session() as session:
+                # region extract_counter
+                # Use get_metadata_for to get revisions metadata for document 'orders/1-A'
+                revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A")
+
+                # Extract the counters data from the metadata
+                counters_data_in_revisions = [
+                    metadata[constants.Documents.Metadata.REVISION_COUNTERS]
+                    for metadata in revisions_metadata
+                    if constants.Documents.Metadata.REVISION_COUNTERS in metadata
+                ]
+                # endregion
diff --git a/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/Revisions.py b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/Revisions.py
new file mode 100644
index 0000000000..054a9a2419
--- /dev/null
+++ b/Documentation/5.4/Samples/python/DocumentExtensions/Revisions/Revisions.py
@@ -0,0 +1,26 @@
+from examples_base import ExampleBase, Company
+
+class Force(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_force_revision_creation_for(self):
+        with self.embedded_server.get_document_store("ForceRevision") as store:
+            with store.open_session() as session:
+                self.add_companies(session)
+            company_id = "companies/1"
+            # region force_revision_creation_for
+            with store.open_session() as session:
+                company = session.load(company_id, Company)
+                company.name = "HR V2"
+
+                session.advanced.revisions.force_revision_creation_for(company)
+                session.save_changes()
+
+                revisions = session.advanced.revisions.get_for(company.Id, Company)
+                revisions_count = len(revisions)
+
+                self.assertEqual(1, revisions_count)
+                # Assert revision contains the value 'Before' the changes...
+                self.assertEqual("HR V2", revisions[1].name)
+            # endregion
diff --git a/Documentation/6.0/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown
new file mode 100644
index 0000000000..5911032047
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/client-api/session/configuration/how-to-customize-id-generation-for-entities.python.markdown
@@ -0,0 +1,30 @@
+# Session: How to Customize ID Generation for Entities
+---
+
+{NOTE: }
+
+RavenDB provides sveral ways to create document IDs.  
+
+- To get familiar with basic built-in ID generation strategies 
+  before starting to customize entity identifiers, please see:  
+  [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)  
+
+- To learn about conventions related to ID customization, please see 
+  the following articles, presentnig conventions that can be applied 
+  to all entity types or to a particular type.  
+   - [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)  
+   - [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)  
+
+{NOTE/}
+
+## Related articles
+
+### Document Identifiers
+
+- [Working with Document Identifiers](../../../client-api/document-identifiers/working-with-document-identifiers)
+- [Global ID Generation Conventions](../../../client-api/configuration/identifier-generation/global)
+- [Type-specific ID Generation Conventions](../../../client-api/configuration/identifier-generation/type-specific)
+
+### Knowledge Base
+
+- [Document Identifier Generation](../../../server/kb/document-identifier-generation)
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
index b42a07fa6c..8d276c383f 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.dotnet.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
-  * __Default configuration__ - applies to all document collections.  
-  * __Collection-specific configurations__ - override the default settings for these collections.  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
   * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
 
-* The configuration passed to this operation will __REPLACE__ the current revisions configuration in the database.  
-  To __MODIFY__ existing configuration, fetch the current configuration from the database record first.  
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
 
 * After applying the configuration,  
   revisions are created and purged for a document whenever the document is created, modified, or deleted.  
@@ -32,7 +32,7 @@
 {PANEL: Replace configuration}
 
 * In this example, we create a new `RevisionsConfiguration` for the database.  
-  If revisions configuration already exists in the database - it will be __replaced__.
+  If revisions configuration already exists in the database - it will be **replaced**.
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync replace_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
@@ -43,7 +43,7 @@
 
 {PANEL: Modify configuration}
 
-* In this example, we fetch the existing revisions configuration from the database record and __modify__ it.   
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync modify_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
@@ -58,14 +58,14 @@
 
 | Parameter | Type | Description |
 | - | - | - |
-| __configuration__ | `RevisionsConfiguration` | The revisions configuration to apply |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
 
 {CODE:csharp syntax_2@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
 
 | Property | Type | Description |
 | - | - | - |
-| __Default__ | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `Collections`. |
-| __Collections__ | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+| **Default** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `Collections`. |
+| **Collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
 
 {CODE:csharp syntax_3@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.cs /}
 
@@ -73,11 +73,11 @@
 
 | Property | Type | Description |
 | - | - | - |
-| __MinimumRevisionsToKeep__ | `long` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> __Default__ : `null` = no limit </li></ul> |
-| __MinimumRevisionAgeToKeep__ | `TimeSpan` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> __Default__ : `null` = no age limit</li><ul> |
-| __MaximumRevisionsToDeleteUponDocumentUpdate__ | `long` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> __Default__ : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
-| __PurgeOnDelete__ | `bool` | <ul><li>`false` ( __Default__ ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
-| __Disabled__ | `bool` | <ul><li>`false` ( __Default__ ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+| **MinimumRevisionsToKeep** | `long` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **MinimumRevisionAgeToKeep** | `TimeSpan` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **MaximumRevisionsToDeleteUponDocumentUpdate** | `long` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **PurgeOnDelete** | `bool` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **Disabled** | `bool` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
index b21e8bd0f5..4210dae096 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.js.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
-  * __Default configuration__ - applies to all document collections.  
-  * __Collection-specific configurations__ - override the default settings for these collections.  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
   * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
 
-* The configuration passed to this operation will __REPLACE__ the current revisions configuration in the database.  
-  To __MODIFY__ existing configuration, fetch the current configuration from the database record first.  
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
 
 * After applying the configuration,  
   revisions are created and purged for a document whenever the document is created, modified, or deleted.  
@@ -32,7 +32,7 @@
 {PANEL: Replace configuration}
 
 * In this example, we create a new `RevisionsConfiguration` for the database.  
-  If revisions configuration already exists in the database - it will be __replaced__.
+  If revisions configuration already exists in the database - it will be **replaced**.
 
 {CODE:nodejs replace_configuration@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -40,7 +40,7 @@
 
 {PANEL: Modify configuration}
 
-* In this example, we fetch the existing revisions configuration from the database record and __modify__ it.   
+* In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
 
 {CODE:nodejs modify_configuration@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -52,14 +52,14 @@
 
 | Parameter | Type | Description |
 | - | - | - |
-| __configuration__ | `RevisionsConfiguration` | The revisions configuration to apply |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
 
 {CODE:nodejs syntax_2@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
 | Property | Type | Description |
 | - | - | - |
-| __defaultConfig__ | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
-| __collections__ | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+| **defaultConfig** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
+| **collections** | `Dictionary<string, RevisionsCollectionConfiguration>` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
 
 {CODE:nodejs syntax_3@document-extensions\revisions\client-api\operations\configureRevisions.js /}
 
@@ -67,11 +67,11 @@
 
 | Property | Type | Description |
 | - | - | - |
-| __minimumRevisionsToKeep__ | `number` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> __Default__ : `null` = no limit </li></ul> |
-| __minimumRevisionAgeToKeep__ | `string` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> __Default__ : `null` = no age limit</li><ul> |
-| __maximumRevisionsToDeleteUponDocumentUpdate__ | `number` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> __Default__ : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
-| __purgeOnDelete__ | `boolean` | <ul><li>`false` ( __Default__ ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
-| __disabled__ | `boolean` | <ul><li>`false` ( __Default__ ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
+| **minimumRevisionsToKeep** | `number` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `null` = no limit </li></ul> |
+| **minimumRevisionAgeToKeep** | `string` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `null` = no age limit</li><ul> |
+| **maximumRevisionsToDeleteUponDocumentUpdate** | `number` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `null` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+| **purgeOnDelete** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`true` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **disabled** | `boolean` | <ul><li>`false` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`true` - No revisions will be created or purged.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown
new file mode 100644
index 0000000000..b3644c0e1f
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/configure-revisions.python.markdown
@@ -0,0 +1,99 @@
+# Configure Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `ConfigureRevisionsOperation` to apply the following [revisions configuration](../../../../studio/database/settings/document-revisions#revisions-configuration) to the database:  
+  * **Default configuration** - applies to all document collections.  
+  * **Collection-specific configurations** - override the default settings for these collections.  
+  * To apply a configuration for conflict document revisions see [configure conflict revisions](../../../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration).  
+
+* The configuration passed to this operation will **REPLACE** the current revisions configuration in the database.  
+  To **MODIFY** existing configuration, fetch the current configuration from the database record first.  
+
+* After applying the configuration,  
+  revisions are created and purged for a document whenever the document is created, modified, or deleted.  
+
+* To create a revision when there is no configuration defined (or enabled) see: [force revision creation](../../../../document-extensions/revisions/overview#force-revision-creation)
+
+* By default, the operation will be applied to the [default database](../../../../client-api/setting-up-default-database).  
+  To operate on a different database see [switch operations to different database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database).  
+
+* In this page:  
+  * [Replace configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#replace-configuration)  
+  * [Modify configuration](../../../../document-extensions/revisions/client-api/operations/configure-revisions#modify-configuration)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/configure-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Replace configuration}
+
+In this example, we create a new `RevisionsConfiguration` for the database.  
+If revisions configuration already exists in the database - it will be **replaced**.
+{CODE:python replace_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Modify configuration}
+
+In this example, we fetch the existing revisions configuration from the database record and **modify** it.   
+{CODE:python modify_configuration@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:python syntax_1@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **configuration** | `RevisionsConfiguration` | The revisions configuration to apply |
+
+{CODE:python syntax_2@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+| Property | Type | Description |
+| - | - | - |
+| **default_config** | `RevisionsCollectionConfiguration` | Optional default settings that apply to any collection Not specified in `collections`. |
+| **collections** | `Dict[str, RevisionsCollectionConfiguration]` | A Dictionary of collection-specific configurations<br>The `keys` are the collection names<br>The `values` are the corresponding configurations.<br>Overrides the default settings for the collections defined. |
+
+{CODE:python syntax_3@DocumentExtensions\Revisions\ClientAPI\Operations\ConfigureRevisions.py /}
+
+<a id="revisions-collection-configuration-object" />
+
+| Property | Type | Description |
+| - | - | - |
+| **minimum_revisions_to_keep** | `int` | <ul><li>This number of revisions will be kept per document.</li><li>Older revisions exceeding this number will be purged upon the next document modification.<li> **Default** : `None` = no limit </li></ul> |
+| **minimum_revisions_age_to_keep** | `timedelta` | <ul><li>Limit the number of revisions kept per document by their age.</li><li>Revisions that are older than this time will be purged upon the next document modification.</li><li> **Default** : `None` = no age limit</li><ul> |
+| **disabled** | `bool` | <ul><li>`fFalse` ( **Default** ) - Revisions will be created and purged according to the configuration.</li><li>`True` - No revisions will be created or purged.</li></ul> |
+| **purge_on_delete** | `bool` | <ul><li>`False` ( **Default** ) - Revisions of a deleted document are moved to the [Revisions Bin](../../../../studio/database/document-extensions/revisions#revisions-bin).</li><li>`True` - When a document is deleted all its revisions are also deleted.</li></ul> |
+| **maximum_revisions_to_delete_upon_document_creation** | `int` | <ul><li>The maximum number of revisions to delete upon each document modification.</li><li> **Default** : `None` = no limit,<br> all revisions that pend purging will be deleted.</li></ul> |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+* [What Is a Collection](../../../../client-api/faq/what-is-a-collection)
+* [What Are Operations](../../../../client-api/operations/what-are-operations)
+* [Switch Operation Database](../../../../client-api/operations/how-to/switch-operations-to-a-different-database)
+* [Setting Up a Default Database](../../../../client-api/setting-up-default-database)
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
+* [Manage Database Group](../../../../studio/database/settings/manage-database-group)
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
index 47c0f0c537..b1ddaeb96e 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.dotnet.markdown
@@ -4,7 +4,7 @@
 
 {NOTE: }
 
-* By default, RavenDB creates __revisions for conflict documents__ for all collections  
+* By default, RavenDB creates **revisions for conflict documents** for all collections  
   when conflicts occur and when they are resolved.  
 
 * Use `ConfigureRevisionsForConflictsOperation` to disable the feature or modify the configuration. 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
index abb3411225..5dbaf2dd7b 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/conflict-revisions-configuration.js.markdown
@@ -4,7 +4,7 @@
 
 {NOTE: }
 
-* By default, RavenDB creates __revisions for conflict documents__ for all collections  
+* By default, RavenDB creates **revisions for conflict documents** for all collections  
   when conflicts occur and when they are resolved.  
 
 * Use `ConfigureRevisionsForConflictsOperation` to disable the feature or modify the configuration. 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown
new file mode 100644
index 0000000000..de96cca443
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/operations/get-revisions.python.markdown
@@ -0,0 +1,65 @@
+# Get Revisions Operation
+
+---
+
+{NOTE: }
+
+* Use `GetRevisionsOperation` to GET the document's revisions.
+
+* To only COUNT the number of revisions without getting them, use the [get_count_for](../../../../document-extensions/revisions/client-api/session/counting) session method.
+
+* In this page:  
+  * [Get all revisions](../../../../document-extensions/revisions/client-api/operations/get-revisions#get-all-revisions)  
+  * [Paging results](../../../../document-extensions/revisions/client-api/operations/get-revisions#paging-results)  
+  * [Syntax](../../../../document-extensions/revisions/client-api/operations/get-revisions#syntax)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+{CODE:python getAllRevisions@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Paging results}
+
+* Get and process revisions, one page at a time:
+  {CODE:python getRevisionsWithPaging@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+* The document ID, start & page size can be wrapped in a `Parameters` object:
+  {CODE:python getRevisionsWithPagingParams@DocumentExtensions\Revisions\ClientAPI\Operations\GetRevisions.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id** | `string` | Document ID for which to get revisions |
+| **start** | `int` | Revision number to start from |
+| **page_size** | `int` | Number of revisions to get |
+| **parameters** | `Parameters` | An object that wraps `id`, `start`, and `page_size` |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
index bcc97304e9..aefdc24898 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.dotnet.markdown
@@ -6,9 +6,9 @@
 
 * For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).  
 
-* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the __Client API__.  
+* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.  
 
-* From the __Client API__, revisions can be configured and managed by:  
+* From the **Client API**, revisions can be configured and managed by:  
     * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
     * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
 
@@ -26,29 +26,29 @@
 
 {PANEL: Revisions Session methods}
 
-* __Get revisions__:  
+* **Get revisions**:  
 
   * [GetFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
   * [GetMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
   * [Get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
-  * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about __lazy versions__ of `GetFor`, `GetMetadataFor`, and `Get`.
+  * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `GetFor`, `GetMetadataFor`, and `Get`.
 
 ---
 
-* __Include revisions__:  
+* **Include revisions**:  
 
   * [IncludeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `Session.Load` or `Session.Query`.  
   * [RawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
 
 ---
 
-* __Count revisions__:  
+* **Count revisions**:  
 
   * [GetCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.  
 
 ---
 
-* __Force revision creation__:
+* **Force revision creation**:
 
     * [ForceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
index 80fcfa270e..3df166adb6 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.js.markdown
@@ -6,9 +6,9 @@
 
 * For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).
 
-* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the __Client API__.
+* Document revisions can be managed from the [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.
 
-* From the __Client API__, revisions can be configured and managed by:
+* From the **Client API**, revisions can be configured and managed by:
     * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)
     * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)
 
@@ -26,29 +26,29 @@
 
 {PANEL: Revisions Session methods}
 
-* __Get revisions__:
+* **Get revisions**:
 
     * [getFor](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) - retrieve all revisions kept for a document.
     * [getMetadataFor](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) - retrieve metadata for all revisions kept for a document.
     * [get](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) - retrieve revisions by change vector or creation time.
-    * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about __lazy versions__ of `getFor`, `getMetadataFor`, and `get`.
+    * Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) about **lazy versions** of `getFor`, `getMetadataFor`, and `get`.
 
 ---
 
-* __Include revisions__:
+* **Include revisions**:
 
     * [includeRevisions](../../../document-extensions/revisions/client-api/session/including#section) - include revisions when retrieving documents via `session.load` or `session.query`.
     * [rawQuery](../../../document-extensions/revisions/client-api/session/including#including-revisions-with-session.advanced.rawquery) - Learn how to include revisions when retrieving documents via raw queries.
 
 ---
 
-* __Count revisions__:
+* **Count revisions**:
 
     * [getCountFor](../../../document-extensions/revisions/client-api/session/counting#getcountfor) - get the number of revisions kept for a document.
 
 ---
 
-* __Force revision creation__:
+* **Force revision creation**:
 
     * [forceRevisionCreationFor](../../../document-extensions/revisions/overview#force-revision-creation-via-api) - create a revision even if revision configuration is disabled.
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown
new file mode 100644
index 0000000000..3252ef44bf
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/overview.python.markdown
@@ -0,0 +1,66 @@
+# Revisions Client API Overview
+
+---
+
+{NOTE: }
+
+* For a general revisions overview see: [Revisions Overview](../../../document-extensions/revisions/overview).  
+
+* Document revisions can be managed using [Studio](../../../studio/database/settings/document-revisions) or from the **Client API**.  
+
+* Find below a list of methods that revisions can be configured and managed by.  
+    * [Store Operations](../../../document-extensions/revisions/client-api/overview#revisions-store-operations)  
+    * [Session Methods](../../../document-extensions/revisions/client-api/overview#revisions-session-methods)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions `store` Operations}
+
+* [ConfigureRevisionsOperation](../../../document-extensions/revisions/client-api/operations/configure-revisions) - apply a revision configuration
+* [GetRevisionsOperation](../../../document-extensions/revisions/client-api/operations/get-revisions) - get revisions
+
+{PANEL/}
+
+{PANEL: Revisions `session` methods}
+
+#### Get revisions:  
+
+* Use [get_for](../../../document-extensions/revisions/client-api/session/loading#get-all-revisions) 
+  to retrieve **all** revisions kept for a document.  
+* Use [get_metadata_for](../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) 
+  to retrieve **metadata** for all revisions kept for a document.  
+* Use [get_by_before_date ](../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time) 
+  to retrieve revisions by **change vector** or **creation time**.  
+* Read [here](../../../client-api/session/how-to/perform-operations-lazily#getRevisions) 
+  about **lazy versions** of `get_for`, `get_metadata_for`, and `get_by_before_date`.  
+
+---
+
+#### Count revisions:  
+
+Use [get_count_for](../../../document-extensions/revisions/client-api/session/counting#getcountfor) 
+to get the number of revisions kept for a document.  
+
+---
+
+#### Force revision creation:
+
+Read [here](../../../document-extensions/revisions/overview#force-revision-creation-via-api) 
+about creating a revision even if revision configuration is disabled.  
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown
new file mode 100644
index 0000000000..dda9c8405c
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/counting.python.markdown
@@ -0,0 +1,55 @@
+# Count Revisions
+
+---
+
+{NOTE: }
+
+* You can get the number of revisions a document has by using the session `advanced` method `get_count_for`.
+
+* In this page:  
+   * [Get revisions count](../../../../document-extensions/revisions/client-api/session/counting#get-revisions-count)
+   * [syntax](../../../../document-extensions/revisions/client-api/session/counting#syntax)
+
+{NOTE/}
+
+---
+
+{PANEL: Get revisions count}
+
+{CODE:python getCount@DocumentExtensions\Revisions\ClientAPI\Session\Counting.py /}
+
+{PANEL/}
+
+{PANEL: Syntax}
+
+{CODE:python syntax@DocumentExtensions\Revisions\ClientAPI\Session\Counting.py /}
+
+| Parameter | Type | Description |
+| - | - | - |
+| **id_** | `str` | The ID of the document that revisions are counted for |
+
+| Return value | |
+| - | - |
+| `int` | The number of revisions for the specified document |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../../../document-extensions/revisions/client-api/session/loading)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
index bd8284a56f..918cfd3144 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.dotnet.markdown
@@ -5,18 +5,18 @@
 {NOTE: }
 
 * Document revisions can be [included](../../../../client-api/how-to/handle-document-relationships#includes) in results when:  
-  * __Making a query__ (`Session.Query` / `Session.Advanced.RawQuery`)
-  * __Loading a document__ (`Session.Load`) from the server  
+  * **Making a query** (`Session.Query` / `Session.Advanced.RawQuery`)
+  * **Loading a document** (`Session.Load`) from the server  
 
 * The revisions to include can be specified by:
-  * __Creation time__
-  * __Change vector__
+  * **Creation time**
+  * **Change vector**
 
 * In this page:
   * [Overview:](../../../../document-extensions/revisions/client-api/session/including#overview)
-      * [Why include revisions](../../../../document-extensions/revisions/client-api/session/including#why-include)
-      * [Including by creation time](../../../../document-extensions/revisions/client-api/session/including#include-by-time)
-      * [Including by change vector](../../../../document-extensions/revisions/client-api/session/including#include-by-change-vector)
+      * [Why include revisions](../../../../document-extensions/revisions/client-api/session/including#why-include-revisions)
+      * [Including by creation time](../../../../document-extensions/revisions/client-api/session/including#including-by-creation-time)
+      * [Including by change vector](../../../../document-extensions/revisions/client-api/session/including#including-by-change-vector)
   * [Include revisions:](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-loading-document)  
       * [When Loading document](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-loading-document)
       * [When making a Query](../../../../document-extensions/revisions/client-api/session/including#include-revisions-when-making-a-query)
@@ -30,11 +30,7 @@
 
 {PANEL: Overview}
 
-{NOTE: }
-
-<a id="why-include" /> __Why include revisions__:
-
----
+#### Why include revisions:
 
 * Including revisions may be useful, for example, when an auditing application loads or queries for a document.  
   The document's past revisions can be included with the document to make the document's history available for instant inspection.  
@@ -43,30 +39,22 @@
   [Getting](../../../../document-extensions/revisions/client-api/session/loading) a revision that was included with the document will retrieve it directly from the session.  
   This also holds true when attempting to include revisions but none are found.
 
-{NOTE/}
-
-{NOTE: }
-
-<a id="include-by-time" /> __Including by Creation Time__:
-
 ---
 
+#### Including by Creation Time:
+
 * You can include a single revision by specifying its creation time, see examples below.
 
 * You can pass local time or UTC, either way the server will  convert it to UTC.  
 
-* __If the provided time matches__ the creation time of a document revision, this revision will be included.
-
-* __If no exact match is found__, then the first revision that precedes the specified time will be returned.
+* **If the provided time matches** the creation time of a document revision, this revision will be included.
 
-{NOTE/}
-
-{NOTE: }
-
-<a id="include-by-change-vector" /> __Including by Change Vector__:
+* **If no exact match is found**, then the first revision that precedes the specified time will be returned.
 
 ---
 
+#### Including by Change Vector:
+
 * Each time a document is modified, its [Change Vector](../../../../server/clustering/replication/change-vector) is updated.  
 
 * When a revision is created,  
@@ -77,7 +65,7 @@
   * When modifying the document, store its updated change vector in a property in the document.  
     Can be done by [patching](../../../../document-extensions/revisions/client-api/session/including#patching-the-revision-change-vector) the document from the Client API or from the Studio.  
   
-  * Specify the __path__ to this property when including the revisions, see examples below.  
+  * Specify the **path** to this property when including the revisions, see examples below.  
   
   * e.g.:  
     Each time an employee's contract document is modified (e.g. when their salary is raised),  
@@ -85,13 +73,11 @@
     Whenever the time comes to re-evaluate an employee's terms and their contract is loaded,  
     its past revisions can be easily included with it by their change vectors.
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Include revisions when Loading document}
 
-__Include a revision by Time__
+#### Include a revision by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_1@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -100,7 +86,7 @@ __Include a revision by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_2@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -114,7 +100,7 @@ __Include revisions by Change Vector__
 
 {PANEL: Include revisions when making a Query}
 
-__Include revisions by Time__
+#### Include revisions by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_3@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -123,7 +109,7 @@ __Include revisions by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_4@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -145,7 +131,7 @@ __Include revisions by Change Vector__
 
 ---
 
-__Include revisions by Time__
+#### Include revisions by Time:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_5@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -154,7 +140,7 @@ __Include revisions by Time__
 
 ---
 
-__Include revisions by Change Vector__
+#### Include revisions by Change Vector:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync include_6@DocumentExtensions\Revisions\ClientAPI\Session\Including.cs /}
@@ -171,13 +157,13 @@ __Include revisions by Change Vector__
 
 | Parameters | Type | Description |
 | - | - | - |
-| __before__ | `DateTime` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
-| __path__ | `Expression<Func<T, string>>` | <ul><li>The path to the document property that contains<br> __a single change vector__ of the revision to be included.</li></ul> |
-| __path__ | `Expression<Func<T, IEnumerable<string>>>` | <ul><li>The path to the document property that contains<br> __an array of change vectors__ of the revisions to be included.</li></ul> |
+| **before** | `DateTime` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
+| **path** | `Expression<Func<T, string>>` | <ul><li>The path to the document property that contains<br> **a single change vector** of the revision to be included.</li></ul> |
+| **path** | `Expression<Func<T, IEnumerable<string>>>` | <ul><li>The path to the document property that contains<br> **an array of change vectors** of the revisions to be included.</li></ul> |
 
 | Return value | |
 | - | - |
-| `TBuilder` | <ul><li>When __loading__ a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When __querying__ for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
+| `TBuilder` | <ul><li>When **loading** a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When **querying** for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
index 9ab721439f..8cde3d50ab 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/including.js.markdown
@@ -5,12 +5,12 @@
 {NOTE: }
 
 * Document revisions can be included in results when:
-    * __Making a query__ (`session.query` / `session.advanced.rawQuery`)
-    * __Loading a document__ (`session.load`) from the server
+    * **Making a query** (`session.query` / `session.advanced.rawQuery`)
+    * **Loading a document** (`session.load`) from the server
 
 * The revisions to include can be specified by:
-    * __Creation time__
-    * __Change vector__
+    * **Creation time**
+    * **Change vector**
 
 * In this page:
   * [Overview:](../../../../document-extensions/revisions/client-api/session/including#overview)
@@ -32,7 +32,7 @@
 
 {NOTE: }
 
-<a id="why-include" /> __Why include revisions__:
+<a id="why-include" /> **Why include revisions**:
 
 ---
 
@@ -47,7 +47,7 @@
 
 {NOTE: }
 
-<a id="include-by-time" /> __Including by Creation Time__:
+<a id="include-by-time" /> **Including by Creation Time**:
 
 ---
 
@@ -55,15 +55,15 @@
 
 * You can pass local time or UTC, either way the server will  convert it to UTC.  
 
-* __If the provided time matches__ the creation time of a document revision, this revision will be included.
+* **If the provided time matches** the creation time of a document revision, this revision will be included.
 
-* __If no exact match is found__, then the first revision that precedes the specified time will be returned.
+* **If no exact match is found**, then the first revision that precedes the specified time will be returned.
 
 {NOTE/}
 
 {NOTE: }
 
-<a id="include-by-change-vector" /> __Including by Change Vector__:
+<a id="include-by-change-vector" /> **Including by Change Vector**:
 
 ---
 
@@ -77,7 +77,7 @@
   * When modifying the document, store its updated change vector in a property in the document.  
     Can be done by [patching](../../../../document-extensions/revisions/client-api/session/including#patching-the-revision-change-vector) the document from the Client API or from the Studio.
 
-  * Specify the __path__ to this property when including the revisions, see examples below.  
+  * Specify the **path** to this property when including the revisions, see examples below.  
   
   * e.g.:  
     Each time an employee's contract document is modified (e.g. when their salary is raised),  
@@ -91,13 +91,13 @@
 
 {PANEL: Include revisions when Loading document}
 
-__Include a revision by Time__
+**Include a revision by Time**
 
 {CODE:nodejs include_1@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_2@document-extensions\revisions\client-api\session\including.js /}
 
@@ -108,13 +108,13 @@ __Include revisions by Change Vector__
 
 {PANEL: Include revisions when making a Query}
 
-__Include revisions by Time__
+**Include revisions by Time**
 
 {CODE:nodejs include_3@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_4@document-extensions\revisions\client-api\session\including.js /}
 
@@ -133,13 +133,13 @@ __Include revisions by Change Vector__
 
 ---
 
-__Include revisions by Time__
+**Include revisions by Time**
 
 {CODE:nodejs include_5@document-extensions\revisions\client-api\session\including.js /}
 
 ---
 
-__Include revisions by Change Vector__
+**Include revisions by Change Vector**
 
 {CODE:nodejs include_6@document-extensions\revisions\client-api\session\including.js /}
 
@@ -153,12 +153,12 @@ __Include revisions by Change Vector__
 
 | Parameters | Type | Description |
 | - | - | - |
-| __before__ | `string` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
-| __path__ | `string` | <ul><li>The path to the document property that contains <br> __a single change vector__ or __an array of change vectors__ <br>of the revisions to be included.</li></ul> |
+| **before** | `string` | <ul><li>Creation time of the revision to be included.</li><li>Pass local time or UTC.<br>The server will convert the param to UTC.</li><li>If no revision was created at this time then the first revision that precedes it is returned.</li></ul> |
+| **path** | `string` | <ul><li>The path to the document property that contains <br> **a single change vector** or **an array of change vectors** <br>of the revisions to be included.</li></ul> |
 
 | Return value | |
 | - | - |
-| `object` | <ul><li>When __loading__ a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When __querying__ for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
+| `object` | <ul><li>When **loading** a document:<br>A builder object that is used to build the include part in the Load request.</il><li>When **querying** for a document:<br>A builder object that is used to build the include part in the Query RQL expression.</li><li>Can be used in chaining.</li></ul> |
 
 {PANEL/}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
index 10dffab20f..d7d9e2d5f9 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.dotnet.markdown
@@ -4,21 +4,16 @@
 
 {NOTE: }
 
-* Using the Advanced Session methods you can __retrieve revisions and their metadata__  
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
   from the database for the specified document.  
 
 * These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).   
   
 * In this page:  
-  
-  * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
-
-  * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
-
-  * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
-  
-  * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
-
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
 
 {NOTE/}
 
@@ -30,14 +25,14 @@
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_1_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -55,14 +50,14 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_2_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -80,7 +75,7 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
@@ -89,7 +84,7 @@ __Example__:
 
 ---
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
@@ -106,14 +101,14 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync example_4_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TAB:csharp:Async example_4_async@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 {CODE-TABS/}
 
-__Syntax__:
+**Syntax**:
 
 {CODE syntax_4@DocumentExtensions\Revisions\ClientAPI\Session\Loading.cs /}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
index 89bb8e27ab..519a6e2117 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.js.markdown
@@ -4,20 +4,16 @@
 
 {NOTE: }
 
-* Using the Advanced Session methods you can __retrieve revisions and their metadata__  
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
   from the database for the specified document.  
 
 * These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).
 
-* In this page:
-
-    * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
-
-    * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
-
-    * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
-   
-    * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
 
 {NOTE/}
 
@@ -29,11 +25,11 @@
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_1@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_1@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -56,11 +52,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_2@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_2@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -83,11 +79,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_3@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_3@document-extensions\revisions\client-api\session\loading.js /}
 
@@ -108,11 +104,11 @@ __Syntax__:
 
 ---
 
-__Example__:
+**Example**:
 
 {CODE:nodejs example_4@document-extensions\revisions\client-api\session\loading.js /}
 
-__Syntax__:
+**Syntax**:
 
 {CODE:nodejs syntax_4@document-extensions\revisions\client-api\session\loading.js /}
 
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown
new file mode 100644
index 0000000000..6809e2cc8d
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/client-api/session/loading.python.markdown
@@ -0,0 +1,110 @@
+# Get Revisions
+
+---
+
+{NOTE: }
+
+* Using the Advanced Session methods you can **retrieve revisions and their metadata**  
+  from the database for the specified document.  
+
+* These methods can also be executed lazily, see [get revisions lazily](../../../../client-api/session/how-to/perform-operations-lazily#getRevisions).   
+  
+* In this page:  
+   * [Get all revisions](../../../../document-extensions/revisions/client-api/session/loading#get-all-revisions)  
+   * [Get revisions metadata](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata)  
+   * [Get revisions by creation time](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-creation-time)  
+   * [Get revisions by change vector](../../../../document-extensions/revisions/client-api/session/loading#get-revisions-by-change-vector)  
+
+{NOTE/}
+
+---
+
+{PANEL: Get all revisions}
+
+Use `get_for` to retrieve all of the revisions currently kept for the specified document.
+
+* **Example**:
+  {CODE:python example_1_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_1@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameters | Type | Description |
+     | - | - |- |
+     | **id_** | `str` | Document ID for which to retrieve revisions |
+     | **object_type** | `Type[_T]` | The type of the object whose revisions we want to retrieve |
+     | **start** | `int` | First revision to retrieve, used for paging |
+     | **page_size** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions metadata}
+
+Use `get_metadata_for` to retrieve the metadata for all the revisions currently kept for the specified document.
+
+* **Example**:
+  {CODE:python example_2_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_2@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameters | Type | Description |
+     | - | - |- |
+     | **id_** | `str` | Document ID for which to retrieve revisions' metadata |
+     | **start** | `int` | First revision to retrieve metadata for, used for paging |
+     | **page_size** | `int` | Number of revisions to retrieve per results page |
+
+{PANEL/}
+
+{PANEL: Get revisions by creation time}
+
+Use `get_by_before_date` to retrieve a revision by its **creation time**.
+
+* **Example**:
+  {CODE:python example_3_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_3@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameter | Type | Description |
+     | - | - | - |
+     | **id_** | `str` | The ID of the document whose revisions we want to retrieve by creation time |
+     | **before_date** | `datetime.datetime` | Revision creation time |
+     | **object_type** | `Type[_T]` | The type of the object whose revisions we want to retrieve |
+
+
+{PANEL/}
+
+{PANEL: Get revisions by change vector}
+
+To retrieve a revision or multiple revisions by **change vectors**, get the 
+change vector using `get_metadata_for` and the revisions using `get_by_change_vector`.  
+
+* **Example**:
+  {CODE:python example_4_sync@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+* **Syntax**:
+  {CODE:python syntax_4@DocumentExtensions\Revisions\ClientAPI\Session\Loading.py /}
+
+     | Parameter | Type | Description |
+     | - | - | - |
+     | **change_vectors** | `List[str]` | A list of change vector strings |
+     | **object_type** | `Type[_T]` | The types of the objects whose revisions we want to retrieve |
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Including Revisions](../../../../document-extensions/revisions/client-api/session/including)  
+* [Session: Counting Revisions](../../../../document-extensions/revisions/client-api/session/counting)  
+
+### Studio
+
+* [Settings: Document Revisions](../../../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.dotnet.markdown
new file mode 100644
index 0000000000..1fe3798ace
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.dotnet.markdown
@@ -0,0 +1,348 @@
+# Document Revisions Overview
+---
+
+{NOTE: }
+
+* **Document Revisions** are snapshots of documents and their extensions.  
+   * Revisions can be created for documents **automatically** when the documents 
+     are created, modified, or deleted.  
+   * Revisions can also be created for documents [manually](../../document-extensions/revisions/overview#force-revision-creation).  
+
+* Revisions will be automatically **created** and **purged** for a document 
+  only if the Revisions feature is enabled for the document's collection.  
+  To enable or disable the Revisions feature for collections, and to set 
+  limits for the number of revisions that can be kept per document, 
+  apply a [Revisions configuration](../../document-extensions/revisions/overview#revisions-configuration) 
+  to all and/or specific collections.  
+
+* The trail of revisions created for a document can be inspected to track the changes 
+  made in the document over time, and the document's live version can be reverted to any 
+  of its recorded revisions.  
+
+    {INFO: }
+    Tracking document revisions allows you, for example, to check how an employee's 
+    contract has changed over time, restore a single corrupted document without requiring 
+    a backup file, or conduct a full-scale audit of your data.  
+    {INFO/}
+
+* Revisions and their configuration can be managed via Client API methods or using Studio.  
+
+* In this page:  
+  * [Revisions Configuration](../../document-extensions/revisions/overview#revisions-configuration)  
+     * [Default Settings and Collection-Specific Configurations](../../document-extensions/revisions/overview#default-settings-and-collection-specific-configurations)  
+     * [Defining a Revisions Configuration](../../document-extensions/revisions/overview#defining-a-revisions-configuration)  
+     * [Revisions Configuration Options](../../document-extensions/revisions/overview#revisions-configuration-options)  
+     * [Revisions Configuration Execution](../../document-extensions/revisions/overview#revisions-configuration-execution)  
+     * [Enabling and Disabling Revisions for Existing Documents](../../document-extensions/revisions/overview#enabling-and-disabling-revisions-for-existing-documents)  
+  * [How it Works](../../document-extensions/revisions/overview#how-it-works)  
+  * [Revisions Storage](../../document-extensions/revisions/overview#revisions-storage)  
+  * [Force Revision Creation](../../document-extensions/revisions/overview#force-revision-creation)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Configuration}
+
+By default, the Revisions feature is **Disabled** for all collections: no revisions 
+are created or purged for any document.  
+You can change this behavior, and other Revisions settings, by applying 
+a Revisions Configuration to the database.  
+
+The Revisions configuration enables or disables the creation and purging 
+of revisions for documents, and optionally limits the number of revisions 
+kept per document.  
+
+The revision configurations are stored in the database record.  
+
+{NOTE: Conflict Revisions}
+Revisions created for **conflicting documents** are a special case, that is 
+not covered in this article.  
+
+* Conflict revisions are **Enabled** by default.  
+* Read about the conflict revisions API here: 
+  [Conflict Revisions Configuration](../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration)  
+* Read about managing conflict revisions via Studio here: 
+  [Editing the Conflicting Document Defaults](../../studio/database/settings/document-revisions#editing-the-conflicting-document-defaults)  
+
+{NOTE/}
+
+
+---
+
+#### Default Settings and Collection-Specific Configurations
+
+The Revisions configuration is comprised of **Default Settings** and/or 
+**Collection-specific configurations**.  
+
+* The **default settings** apply to all the documents that a collection-specific 
+  configuration is not defined for.  
+* **Collection-specific** configurations apply only to documents of the collections they are defined for,  
+  overriding the default settings for these collections.  
+  {NOTE: }
+  If you apply no default settings, Revisions will be **disabled** for any 
+  collection that a collection-specific configuration is not defined for.  
+  {NOTE/}
+
+---
+
+#### Defining a Revisions Configuration
+
+You can apply a Revisions configuration using Studio or the Client API.  
+
+* Via Studio:  
+   * Manage the Revisions configuration via Studio using the Studio Settings 
+     [Document Revisions](../../studio/database/settings/document-revisions) 
+     page.  
+   * Inspect and manage the revisions created for each document using Studio's 
+     Document View [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab).  
+* Via Client API:  
+  [Read here](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+  how to define and apply a Revisions configuration using the `ConfigureRevisionsOperation`
+  Store operation.  
+
+---
+
+#### Revisions Configuration Options
+
+A Revisions configuration defines -  
+
+* _Whether to Enable or Disable Revisions_.  
+   * If the Revisions feature is **Enabled** for a collection,  
+     creating, modifying, or deleting any document from this collection will trigger the automatic creation  
+     of a new document revision and optionally the Purging of existing revisions for 
+     the document.  
+   * If the Revisions feature is **Disabled** for a collection,  
+     RavenDB will **not** automatically Create or Purge revisions for documents of this collection.  
+* _Whether to Limit the number of revisions that can be kept per document_.  
+  RavenDB will only purge revisions if they exceed the limits you set.
+* [Learn more here](../../document-extensions/revisions/client-api/operations/configure-revisions#section-2) 
+  about the available configuration options.  
+
+---
+
+#### Revisions Configuration Execution
+
+Creating a Revisions configuration does **not** immediately trigger its execution.  
+Default and collection-specific configurations are executed when -  
+
+1. **Documents are Created, Modified, or Deleted**.  
+  When a document is created, modified, or deleted, the configuration (either 
+  default or collection-specific) that applies to its collection is examined.  
+  If the Revisions feature is enabled for this collection:  
+   * A revision of the document will be created.  
+   * Revisions will optionally be purged according to limits set in the configuration.  
+
+2. **[Enforce Configuration](../../studio/database/settings/document-revisions#enforce-configuration) is applied**.  
+  Enforcing Configuration applies the Revisions configuration immediately 
+  throughout the database, **purging** all the revisions that pend purging 
+  by default settings or collection-specific configurations and **deleting** 
+  all the revisions that no configuration applies to.  
+  {WARNING: }
+  
+  * Large databases and collections may contain numerous revisions pending 
+    purging that Enforcing Configuration will purge all at once.  
+    Be aware that this operation may require substantial server resources, 
+    and time it accordingly.  
+  * Revisions that were created over time that no configuration currently 
+    applies to will be deleted. Make sure your configuration includes the 
+    default settings and collection-specific configurations that will 
+    keep the revisions you want to keep intact.  
+  {WARNING/}
+
+---
+
+#### Enabling and Disabling Revisions for Existing Documents
+
+* When the Revisions feature is **Enabled** for a populated collection:  
+  The first revision will be created for an existing document the next 
+  time the document is modified (recording the document **after** its 
+  modification), or when the document is deleted.  
+
+* **Disabling Revisions** for a collection after revisions were created:  
+   * The creation of new revisions and the purging of existing revisions will stop.  
+   * Existing revisions will remain intact.  
+
+{PANEL/}
+
+{PANEL: How it Works}
+
+Let's play with revisions a little to get a taste of its advantages.  
+
+1. **Enable Revisions** so we can experiment with the feature.  
+   The Revisions feature can be enabled using [Studio](../../studio/database/settings/document-revisions) 
+   or the [ConfigureRevisionsOperation](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+   Store operation.  
+   
+     ![Enable Revisions for the Users Collection](images\revisions_enable-revisions.png "Enable Revisions for the Users Collection")
+
+2. **Create a new document in the `Users` collection**.  
+   We will follow the automatic creation of revisions for this document.  
+   You can create the document using [Studio](../../studio/database/documents/create-new-document#create-new-document) 
+   or the [session.Store](../../client-api/session/storing-entities#example) method.  
+   
+     ![Create a Document](images\revisions_create-document.png "Create a Document")
+
+3. **Use Studio to inspect the new document's [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab)**.  
+   Creating the document also created its first revision.  
+   
+     ![Revision for Document Creation](images\revisions_document-created.png "Revision for Document Creation")
+   
+     (Click the _See the current document_ button to return to the parent document view.)  
+
+4. **Modify and Save the document**.  
+   This will create a second revision.  
+   
+     ![Revision for Document Modification](images\revisions_modify-document.png "Revision for Document Modification")
+   
+5. **Delete the document**.  
+   Though you deleted the document, its **audit trail** is **not lost**: 
+   all revisions were moved to the [Revisions Bin](../../studio/database/document-extensions/revisions#revisions-bin),  
+   including a new revision (called "Delete-Revision"), created to indicate 
+   that the document was deleted.  
+
+      To see the "orphaned" revisions (whose parent document was deleted):  
+       * Open the Studio `Documents > Revisions Bin` section  
+       * Click the deleted document's ID 
+    
+      ![Revisions Bin](images\revisions_revisions-bin.png "Revisions Bin")
+
+6. **Restore the document**.  
+   To restore the document after deleting it from one of its revisions,  
+   create a document with the same ID as the document you deleted.  
+   The revisions of the deleted document will be **restored** from the 
+   revisions bin and added to the new document. Opening the document's 
+   Revisions tab will display the whole audit trail, including the 
+   delete-revision created when the old document was deleted and the 
+   revision created when the new document was created.  
+   
+     ![Restored Revisions](images\revisions_restored.png "Restored Revisions")
+
+{PANEL/}
+
+{PANEL: Revisions Storage}
+
+### Revisions Documents Storage  
+
+* The creation of a document revision stores a full version of the modified document in the revisions storage,  
+  in the same **blittable JSON document** format as that of regular documents.  
+
+* **Revisions Compression**  
+   * individual fields are compressed as they are compressed in regular documents:  
+     any text field of more than 128 bytes is compressed.  
+   * Revisions are compressed by default.  
+     Learn [here](../../server/configuration/database-configuration#databases.compression.compressrevisionsdefault) 
+     how to toggle this database option on and off.  
+   * Learn [here](../../server/storage/documents-compression) how to apply Document Compression to revisions.  
+
+---
+
+### Revisions Document Extensions Storage
+
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series) about revisions and **time series**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters) about revisions and **counters**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments) about revisions and **attachments**.  
+
+{PANEL/}
+
+{PANEL: Force Revision Creation}
+
+So far we've discussed the automatic creation of revisions when the feature is enabled.  
+But you can also **force the creation** of a document revision, whether the feature is enabled or not.  
+This is useful when you choose to disable Revisions but still want to create a revision for a specific document,  
+e.g. to take a snapshot of the document as a precaution before editing it.  
+
+* You can force the creation of a revision via Studio or using the 
+  [ForceRevisionCreationFor](../../document-extensions/revisions/overview#force-revision-creation-via-api) 
+  API method.  
+* A revision **will** be created even if the Revisions feature is disabled for the document's collection.  
+* A revision **will** be created even if the document was not modified  
+  (unless the document has revisions and the latest revision contains the current document contents).  
+
+---
+
+#### Force Revision Creation via Studio
+
+To create a revision manually via Studio, use the **Create Revision** button in the 
+document view's Revisions tab.  
+
+![Create a revision manually](images\revisions_create-revision-manually.png "Create a revision manually")
+
+---
+
+#### Force Revision Creation via API
+
+To create a revision manually via the API, use the session `ForceRevisionCreationFor` method.  
+
+`ForceRevisionCreationFor` overloads:  
+{CODE-BLOCK: csharp}
+// Force revision creation by entity.
+// Can be used with tracked entities only.
+void ForceRevisionCreationFor<T>(T entity, 
+              ForceRevisionStrategy strategy = ForceRevisionStrategy.Before);
+
+// Force revision creation by document ID.
+void ForceRevisionCreationFor(string id, 
+              ForceRevisionStrategy strategy = ForceRevisionStrategy.Before);
+{CODE-BLOCK/}
+
+* **Parameters**:
+
+    | Parameter | Type | Description |
+    | - | - | - |
+    | **entity** | `T` | The tracked entity you want to create a revision for |
+    | **id** | string | ID of the document you want to create a revision for |
+    | **strategy** | `ForceRevisionStrategy` | Defines the revision creation strategy (see below). <br> Default: `ForceRevisionStrategy.Before` |
+
+    `ForceRevisionStrategy`:
+    {CODE-BLOCK: csharp}
+public enum ForceRevisionStrategy
+{
+    // Do not force a revision
+    None,
+        
+    // Create a forced revision from the document that is currently in store, 
+    // BEFORE applying any changes made by the user.  
+    // The only exception is a new document, for which a revision will be 
+    // created AFTER the update.
+    Before
+}
+    {CODE-BLOCK/}
+
+* **Sample**:
+    {CODE-TABS}
+    {CODE-TAB:csharp:By_ID ForceRevisionCreationByID@DocumentExtensions\Revisions\Revisions.cs /}
+    {CODE-TAB:csharp:By_Entity ForceRevisionCreationByEntity@DocumentExtensions\Revisions\Revisions.cs /}
+    {CODE-TABS/}
+
+
+{NOTE: When the Revisions feature is disabled:}
+
+Deleting a document that owns a manually-created revision 
+will not move the revision to the revisions bin.  
+
+* A `delete revision` will Not be created.  
+* Manual revisions will not be kept in the revisions bin.  
+
+{NOTE/}
+
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown
new file mode 100644
index 0000000000..190708ae4b
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/overview.python.markdown
@@ -0,0 +1,304 @@
+# Document Revisions Overview
+---
+
+{NOTE: }
+
+* **Document Revisions** are snapshots of documents and their extensions.  
+   * Revisions can be created for documents **automatically** when the documents 
+     are created, modified, or deleted.  
+   * Revisions can also be created for documents [manually](../../document-extensions/revisions/overview#force-revision-creation).  
+
+* Revisions will be automatically **created** and **purged** for a document 
+  only if the Revisions feature is enabled for the document's collection.  
+  To enable or disable the Revisions feature for collections, and to set 
+  limits for the number of revisions that can be kept per document, 
+  apply a [Revisions configuration](../../document-extensions/revisions/overview#revisions-configuration) 
+  to all and/or specific collections.  
+
+* The trail of revisions created for a document can be inspected to track the changes 
+  made in the document over time, and the document's live version can be reverted to any 
+  of its recorded revisions.  
+
+    {INFO: }
+    Tracking document revisions allows you, for example, to check how an employee's 
+    contract has changed over time, restore a single corrupted document without requiring 
+    a backup file, or conduct a full-scale audit of your data.  
+    {INFO/}
+
+* Revisions and their configuration can be managed via Client API methods or using Studio.  
+
+* In this page:  
+  * [Revisions Configuration](../../document-extensions/revisions/overview#revisions-configuration)  
+     * [Default Settings and Collection-Specific Configurations](../../document-extensions/revisions/overview#default-settings-and-collection-specific-configurations)  
+     * [Defining a Revisions Configuration](../../document-extensions/revisions/overview#defining-a-revisions-configuration)  
+     * [Revisions Configuration Options](../../document-extensions/revisions/overview#revisions-configuration-options)  
+     * [Revisions Configuration Execution](../../document-extensions/revisions/overview#revisions-configuration-execution)  
+     * [Enabling and Disabling Revisions for Existing Documents](../../document-extensions/revisions/overview#enabling-and-disabling-revisions-for-existing-documents)  
+  * [How it Works](../../document-extensions/revisions/overview#how-it-works)  
+  * [Revisions Storage](../../document-extensions/revisions/overview#revisions-storage)  
+  * [Force Revision Creation](../../document-extensions/revisions/overview#force-revision-creation)  
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions Configuration}
+
+By default, the Revisions feature is **Disabled** for all collections: no revisions 
+are created or purged for any document.  
+You can change this behavior, and other Revisions settings, by applying 
+a Revisions Configuration to the database.  
+
+The Revisions configuration enables or disables the creation and purging 
+of revisions for documents, and optionally limits the number of revisions 
+kept per document.  
+
+The revision configurations are stored in the database record.  
+
+{NOTE: Conflict Revisions}
+Revisions created for **conflicting documents** are a special case, that is 
+not covered in this article.  
+
+* Conflict revisions are **Enabled** by default.  
+* Read about the conflict revisions API here: 
+  [Conflict Revisions Configuration](../../document-extensions/revisions/client-api/operations/conflict-revisions-configuration)  
+* Read about managing conflict revisions via Studio here: 
+  [Editing the Conflicting Document Defaults](../../studio/database/settings/document-revisions#editing-the-conflicting-document-defaults)  
+
+{NOTE/}
+
+
+---
+
+#### Default Settings and Collection-Specific Configurations
+
+The Revisions configuration is comprised of **Default Settings** and/or 
+**Collection-specific configurations**.  
+
+* The **default settings** apply to all the documents that a collection-specific 
+  configuration is not defined for.  
+* **Collection-specific** configurations apply only to documents of the collections they are defined for,  
+  overriding the default settings for these collections.  
+  {NOTE: }
+  If you apply no default settings, Revisions will be **disabled** for any 
+  collection that a collection-specific configuration is not defined for.  
+  {NOTE/}
+
+---
+
+#### Defining a Revisions Configuration
+
+You can apply a Revisions configuration using Studio or the Client API.  
+
+* Via Studio:  
+   * Manage the Revisions configuration via Studio using the Studio Settings 
+     [Document Revisions](../../studio/database/settings/document-revisions) 
+     page.  
+   * Inspect and manage the revisions created for each document using Studio's 
+     Document View [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab).  
+* Via Client API:  
+  [Read here](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+  how to define and apply a Revisions configuration using the `ConfigureRevisionsOperation`
+  Store operation.  
+
+---
+
+#### Revisions Configuration Options
+
+A Revisions configuration defines -  
+
+* _Whether to Enable or Disable Revisions_.  
+   * If the Revisions feature is **Enabled** for a collection,  
+     creating, modifying, or deleting any document from this collection will trigger the automatic creation  
+     of a new document revision and optionally the Purging of existing revisions for 
+     the document.  
+   * If the Revisions feature is **Disabled** for a collection,  
+     RavenDB will **not** automatically Create or Purge revisions for documents of this collection.  
+* _Whether to Limit the number of revisions that can be kept per document_.  
+  RavenDB will only purge revisions if they exceed the limits you set.
+* [Learn more here](../../document-extensions/revisions/client-api/operations/configure-revisions#section-2) 
+  about the available configuration options.  
+
+---
+
+#### Revisions Configuration Execution
+
+Creating a Revisions configuration does **not** immediately trigger its execution.  
+Default and collection-specific configurations are executed when -  
+
+1. **Documents are Created, Modified, or Deleted**.  
+  When a document is created, modified, or deleted, the configuration (either 
+  default or collection-specific) that applies to its collection is examined.  
+  If the Revisions feature is enabled for this collection:  
+   * A revision of the document will be created.  
+   * Revisions will optionally be purged according to limits set in the configuration.  
+
+2. **[Enforce Configuration](../../studio/database/settings/document-revisions#enforce-configuration) is applied**.  
+  Enforcing Configuration applies the Revisions configuration immediately 
+  throughout the database, **purging** all the revisions that pend purging 
+  by default settings or collection-specific configurations and **deleting** 
+  all the revisions that no configuration applies to.  
+  {WARNING: }
+  
+  * Large databases and collections may contain numerous revisions pending 
+    purging that Enforcing Configuration will purge all at once.  
+    Be aware that this operation may require substantial server resources, 
+    and time it accordingly.  
+  * Revisions that were created over time that no configuration currently 
+    applies to will be deleted. Make sure your configuration includes the 
+    default settings and collection-specific configurations that will 
+    keep the revisions you want to keep intact.  
+  {WARNING/}
+
+---
+
+#### Enabling and Disabling Revisions for Existing Documents
+
+* When the Revisions feature is **Enabled** for a populated collection:  
+  The first revision will be created for an existing document the next 
+  time the document is modified (recording the document **after** its 
+  modification), or when the document is deleted.  
+
+* **Disabling Revisions** for a collection after revisions were created:  
+   * The creation of new revisions and the purging of existing revisions will stop.  
+   * Existing revisions will remain intact.  
+
+{PANEL/}
+
+{PANEL: How it Works}
+
+Let's play with revisions a little to get a taste of its advantages.  
+
+1. **Enable Revisions** so we can experiment with the feature.  
+   The Revisions feature can be enabled using [Studio](../../studio/database/settings/document-revisions) 
+   or the [ConfigureRevisionsOperation](../../document-extensions/revisions/client-api/operations/configure-revisions) 
+   Store operation.  
+   
+     ![Enable Revisions for the Users Collection](images\revisions_enable-revisions.png "Enable Revisions for the Users Collection")
+
+2. **Create a new document in the `Users` collection**.  
+   We will follow the automatic creation of revisions for this document.  
+   You can create the document using [Studio](../../studio/database/documents/create-new-document#create-new-document) 
+   or the [session.Store](../../client-api/session/storing-entities#example) method.  
+   
+     ![Create a Document](images\revisions_create-document.png "Create a Document")
+
+3. **Use Studio to inspect the new document's [Revisions tab](../../studio/database/document-extensions/revisions#revisions-tab)**.  
+   Creating the document also created its first revision.  
+   
+     ![Revision for Document Creation](images\revisions_document-created.png "Revision for Document Creation")
+   
+     (Click the _See the current document_ button to return to the parent document view.)  
+
+4. **Modify and Save the document**.  
+   This will create a second revision.  
+   
+     ![Revision for Document Modification](images\revisions_modify-document.png "Revision for Document Modification")
+   
+5. **Delete the document**.  
+   Though you deleted the document, its **audit trail** is **not lost**: 
+   all revisions were moved to the [Revisions Bin](../../studio/database/document-extensions/revisions#revisions-bin),  
+   including a new revision (called "Delete-Revision"), created to indicate 
+   that the document was deleted.  
+
+      To see the "orphaned" revisions (whose parent document was deleted):  
+       * Open the Studio `Documents > Revisions Bin` section  
+       * Click the deleted document's ID 
+    
+      ![Revisions Bin](images\revisions_revisions-bin.png "Revisions Bin")
+
+6. **Restore the document**.  
+   To restore the document after deleting it from one of its revisions,  
+   create a document with the same ID as the document you deleted.  
+   The revisions of the deleted document will be **restored** from the 
+   revisions bin and added to the new document. Opening the document's 
+   Revisions tab will display the whole audit trail, including the 
+   delete-revision created when the old document was deleted and the 
+   revision created when the new document was created.  
+   
+     ![Restored Revisions](images\revisions_restored.png "Restored Revisions")
+
+{PANEL/}
+
+{PANEL: Revisions Storage}
+
+### Revisions Documents Storage  
+
+* The creation of a document revision stores a full version of the modified document in the revisions storage,  
+  in the same **blittable JSON document** format as that of regular documents.  
+
+* **Revisions Compression**  
+   * individual fields are compressed as they are compressed in regular documents:  
+     any text field of more than 128 bytes is compressed.  
+   * Revisions are compressed by default.  
+     Learn [here](../../server/configuration/database-configuration#databases.compression.compressrevisionsdefault) 
+     how to toggle this database option on and off.  
+   * Learn [here](../../server/storage/documents-compression) how to apply Document Compression to revisions.  
+
+---
+
+### Revisions Document Extensions Storage
+
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series) about revisions and **time series**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters) about revisions and **counters**.  
+Read [here](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments) about revisions and **attachments**.  
+
+{PANEL/}
+
+{PANEL: Force Revision Creation}
+
+So far we've discussed the automatic creation of revisions when the feature is enabled.  
+But you can also **force the creation** of a document revision, whether the feature is enabled or not.  
+This is useful when you choose to disable Revisions but still want to create a revision for a specific document,  
+e.g. to take a snapshot of the document as a precaution before editing it.  
+
+* You can force the creation of a revision via Studio or using the 
+  [ForceRevisionCreationFor](../../document-extensions/revisions/overview#force-revision-creation-via-api) 
+  API method.  
+* A revision **will** be created even if the Revisions feature is disabled for the document's collection.  
+* A revision **will** be created even if the document was not modified  
+  (unless the document has revisions and the latest revision contains the current document contents).  
+
+---
+
+#### Force Revision Creation via Studio
+
+To create a revision manually via Studio, use the **Create Revision** button in the 
+document view's Revisions tab.  
+
+![Create a revision manually](images\revisions_create-revision-manually.png "Create a revision manually")
+
+---
+
+#### Force Revision Creation via API
+
+To create a revision manually via the API, use the advanced session `force_revision_creation_for` method.  
+{CODE:python force_revision_creation_for@DocumentExtensions\Revisions\Revisions.py /}
+
+{NOTE: When the Revisions feature is disabled:}
+Deleting a document that owns a manually-created revision will not move the revision to the revisions bin.  
+
+* A `delete revision` will Not be created.  
+* Manual revisions will not be kept in the revisions bin.  
+
+{NOTE/}
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Revisions and Other Features](../../document-extensions/revisions/revisions-and-other-features)  
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
index 6e7c6dd926..84dabbb6bc 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.dotnet.markdown
@@ -24,28 +24,24 @@
 
 {PANEL: Revisions and Counters}
 
-{NOTE: }
-
-__Revisions creation__  
+### Revisions creation:
 
 * A document revision will be created when:   
-  * A new counter is __created__ on the document.  
-  * A counter is __deleted__ from the document.
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
     
 * A revision will Not be created upon modifying the value of an existing [counter](../../document-extensions/counters/overview).
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Stored data__  
+### Stored data:
 
 * A revision that is created for a document that contains counters  
-  will have the `@counters-snapshot` property in its __metadata__.  
+  will have the `@counters-snapshot` property in its **metadata**.  
  
 * This property holds the counters' names and values at the time when the revision was created. 
 
-* The counter's value stored in the  revision's metadata is the __accumulated value__ from all nodes.  
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
   It does not specify the value of the counter on each individual node.
 
 * Sample revision metadata:  
@@ -62,54 +58,44 @@ __Stored data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
-
-__Reverted data__  
+---
 
-* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
-  the counters from the revision are restored to functionality along with their values.  
+### Reverted data:
 
-{NOTE/}
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+the counters from the revision are restored to functionality along with their values.  
 
-{NOTE: }
+---
 
-__Extract counters data from revisions__  
+### Extract counters data from revisions:
 
-* Use [GetMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
-  and then extract the counters' data.  
+Use [GetMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
+and then extract the counters' data.  
 
 {CODE-TABS}
 {CODE-TAB:csharp:Sync extract_counters@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
 {CODE-TAB:csharp:Async extract_counters_async@DocumentExtensions\Revisions\ClientAPI\Session\RevisionsAndOtherFeatures.cs /}
 {CODE-TABS/}
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Time Series}
 
-{NOTE: }
-
-__Revisions Creation__
+### Revisions Creation:
 
 * A document revision will be created when:  
-    * A new time series is __created__ on the document.  
-    * A time series is __deleted__ from the document.  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
       (A time series is deleted from a document when all its entries are deleted)
 
 * A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Stored Data__
+### Stored Data:
 
 * A revision that is created for a document that contains time series  
-  will have the `@timeseries-snapshot` property in its __metadata__.  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
 
 * This property does Not hold the time series values data,  
   it only contains the following information for the time when the revision was created:
@@ -141,47 +127,40 @@ __Stored Data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
+---
 
-__Reverted Data__
+### Reverted Data:
 
 When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
 
-* If the current document __contains__ a time series name as in the revision:
+* If the current document **contains** a time series name as in the revision:
     * The reverted document will keep the time series entries & values as it was in the current document.
     * Time series entries and values from the revision are Not restored.
 
-* If the current document __doesn't contain__ a time series name as in the revision,  
+* If the current document **doesn't contain** a time series name as in the revision,  
   or if the document itself was deleted:  
   * The reverted document will have the time series from the revision  
   * However, the entries count will be 0  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Attachments}
 
-{NOTE: }
-
-__Revisions Creation__
+### Revisions Creation:
 
-* A document revision will be created when:  
-    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is __added__ to the document.  
-    * An attachment is __deleted__ from the document.   
+A document revision will be created when:  
 
-{NOTE/}
+  * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+  * An attachment is **deleted** from the document.   
 
-{NOTE: }
+---
 
-__Stored Data__
+### Stored Data:
 
 * A revision that is created for a document with attachments  
-  will have the `@attachments` property in its __metadata__.
+  will have the `@attachments` property in its **metadata**.
 
-* This property does Not hold the actual attachments, as the files are stored in __separate storage__.  
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
   The property only contains the following information for each attachment the document had when the revision was created:  
   * Attachment file name
   * File content type
@@ -210,74 +189,52 @@ __Stored Data__
   }
   {CODE-BLOCK/}
 
-{NOTE/}
-
-{NOTE: }
-
-__Reverted Data__
+---
 
-* When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
-  the attachments are restored to their state when the revision was created.
+### Reverted Data:
 
-{NOTE/}
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+the attachments are restored to their state when the revision was created.
 
 {PANEL/}
 
 {PANEL: Revisions and Replication}
 
-{NOTE: }
-
 * Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
 
 * The revisions will be replicated by all replication types:
-  * [Internal replication](../../server/clustering/replication/replication#internal-replication)
-  * [External replication](../../server/clustering/replication/replication#external-replication)
-  * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+   * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+   * [External replication](../../server/clustering/replication/replication#external-replication)
+   * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
 
 * Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and ETL}
 
-{NOTE: }
-
 * An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
 
 * However, if revisions are enabled on the destination database,  
   whenever the ETL process sends a modified document and the target document is overwritten,  
   a new revision will be created for the document in the target database as expected.  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions and Backup}
 
-{NOTE: }
-
-* Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
-
-{NOTE/}
+Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
 
 {PANEL/}
 
 {PANEL: Revisions and Data Subscriptions}
 
-{NOTE: }
-
 * Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
 
-{NOTE/}
-
 {PANEL/}
 
 {PANEL: Revisions Import and Export}
 
-{NOTE: }
-
 * Revisions can be imported and exported with a `.ravendbdump` file:
     * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
     * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
@@ -286,8 +243,6 @@ __Reverted Data__
 
   ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
 
-{NOTE/}
-
 {PANEL/}
 
 ## Related Articles
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
index a9053ee6bc..5bb7705f0c 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.js.markdown
@@ -26,11 +26,11 @@
 
 {NOTE: }
 
-__Revisions creation__  
+**Revisions creation**  
 
 * A document revision will be created when:   
-  * A new counter is __created__ on the document.  
-  * A counter is __deleted__ from the document.
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
     
 * A revision will Not be created upon modifying the value of an existing counter.
 
@@ -38,14 +38,14 @@ __Revisions creation__
 
 {NOTE: }
 
-__Stored data__  
+**Stored data**  
 
 * A revision that is created for a document that contains counters  
-  will have the `@counters-snapshot` property in its __metadata__.  
+  will have the `@counters-snapshot` property in its **metadata**.  
  
 * This property holds the counters' names and values at the time when the revision was created. 
 
-* The counter's value stored in the  revision's metadata is the __accumulated value__ from all nodes.  
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
   It does not specify the value of the counter on each individual node.
 
 * Sample revision metadata:  
@@ -66,7 +66,7 @@ __Stored data__
 
 {NOTE: }
 
-__Reverted data__  
+**Reverted data**  
 
 * When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
   the counters from the revision are restored to functionality along with their values.  
@@ -75,7 +75,7 @@ __Reverted data__
 
 {NOTE: }
 
-__Extract counters data from revisions__  
+**Extract counters data from revisions**  
 
 * Use [getMetadataFor](../../document-extensions/revisions/client-api/session/loading#get-revisions-metadata) to get the revisions metadata for a specified document,  
   and then extract the counters' data.  
@@ -90,11 +90,11 @@ __Extract counters data from revisions__
 
 {NOTE: }
 
-__Revisions Creation__
+**Revisions Creation**
 
 * A document revision will be created when:  
-    * A new time series is __created__ on the document.  
-    * A time series is __deleted__ from the document.  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
       (A time series is deleted from a document when all its entries are deleted)
 
 * A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
@@ -103,10 +103,10 @@ __Revisions Creation__
 
 {NOTE: }
 
-__Stored Data__
+**Stored Data**
 
 * A revision that is created for a document that contains time series  
-  will have the `@timeseries-snapshot` property in its __metadata__.  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
 
 * This property does Not hold the time series values data,  
   it only contains the following information for the time when the revision was created:
@@ -142,15 +142,15 @@ __Stored Data__
 
 {NOTE: }
 
-__Reverted Data__
+**Reverted Data**
 
 When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
 
-* If the current document __contains__ a time series name as in the revision:
+* If the current document **contains** a time series name as in the revision:
     * The reverted document will keep the time series entries & values as it was in the current document.
     * Time series entries and values from the revision are Not restored.
 
-* If the current document __doesn't contain__ a time series name as in the revision,  
+* If the current document **doesn't contain** a time series name as in the revision,  
   or if the document itself was deleted:  
   * The reverted document will have the time series from the revision  
   * However, the entries count will be 0  
@@ -163,22 +163,22 @@ When a document is [reverted](../../document-extensions/revisions/revert-revisio
 
 {NOTE: }
 
-__Revisions Creation__
+**Revisions Creation**
 
 * A document revision will be created when:  
-    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is __added__ to the document.  
-    * An attachment is __deleted__ from the document.   
+    * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+    * An attachment is **deleted** from the document.   
 
 {NOTE/}
 
 {NOTE: }
 
-__Stored Data__
+**Stored Data**
 
 * A revision that is created for a document with attachments  
-  will have the `@attachments` property in its __metadata__.
+  will have the `@attachments` property in its **metadata**.
 
-* This property does Not hold the actual attachments, as the files are stored in __separate storage__.  
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
   The property only contains the following information for each attachment the document had when the revision was created:  
   * Attachment file name
   * File content type
@@ -211,7 +211,7 @@ __Stored Data__
 
 {NOTE: }
 
-__Reverted Data__
+**Reverted Data**
 
 * When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
   the attachments are restored to their state when the revision was created.
diff --git a/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown
new file mode 100644
index 0000000000..183185c493
--- /dev/null
+++ b/Documentation/6.0/Raven.Documentation.Pages/document-extensions/revisions/revisions-and-other-features.python.markdown
@@ -0,0 +1,260 @@
+# Revisions and Other Features
+
+---
+
+{NOTE: }
+
+* This page describes relationships between Revisions and other RavenDB features, including -
+    * When is revisions creation triggered by other features
+    * How revisions are supported by other features  
+
+* In this page:  
+   * [Revisions and Counters](../../document-extensions/revisions/revisions-and-other-features#revisions-and-counters)  
+   * [Revisions and Time Series](../../document-extensions/revisions/revisions-and-other-features#revisions-and-time-series)  
+   * [Revisions and Attachments](../../document-extensions/revisions/revisions-and-other-features#revisions-and-attachments)  
+   * [Revisions and Replication](../../document-extensions/revisions/revisions-and-other-features#revisions-and-replication)
+   * [Revisions and ETL](../../document-extensions/revisions/revisions-and-other-features#revisions-and-etl)
+   * [Revisions and Backup](../../document-extensions/revisions/revisions-and-other-features#revisions-and-backup)  
+   * [Revisions and Data Subscriptions](../../document-extensions/revisions/revisions-and-other-features#revisions-and-data-subscriptions)
+   * [Revisions Import and Export](../../document-extensions/revisions/revisions-and-other-features#revisions-import-and-export)
+
+{NOTE/}
+
+---
+
+{PANEL: Revisions and Counters}
+
+### Revisions creation:
+
+* A document revision will be created when:   
+  * A new counter is **created** on the document.  
+  * A counter is **deleted** from the document.
+    
+* A revision will Not be created upon modifying the value of an existing [counter](../../document-extensions/counters/overview).
+
+---
+
+### Stored data:
+
+* A revision that is created for a document that contains counters  
+  will have the `@counters-snapshot` property in its **metadata**.  
+ 
+* This property holds the counters' names and values at the time when the revision was created. 
+
+* The counter's value stored in the  revision's metadata is the **accumulated value** from all nodes.  
+  It does not specify the value of the counter on each individual node.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@counters-snapshot": {
+              "counterName1": 7,
+              "counterName2": 42
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has counters,  
+the counters from the revision are restored to functionality along with their values.  
+
+{PANEL/}
+
+{PANEL: Revisions and Time Series}
+
+### Revisions Creation:
+
+* A document revision will be created when:  
+    * A new time series is **created** on the document.  
+    * A time series is **deleted** from the document.  
+      (A time series is deleted from a document when all its entries are deleted)
+
+* A revision will Not be created upon modifying the values of an existing [time series](../../document-extensions/timeseries/overview).
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document that contains time series  
+  will have the `@timeseries-snapshot` property in its **metadata**.  
+
+* This property does Not hold the time series values data,  
+  it only contains the following information for the time when the revision was created:
+  * The time series names
+  * The number of entries in each time series
+  * Dates of the first and last entry in each time series
+  
+* Read more about Revisions and Time Series [here](../../document-extensions/timeseries/time-series-and-other-features#revisions).
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@timeseries-snapshot": {
+              "timeSeriesName1": {
+                  "Count": 5,
+                  "Start": "2023-03-22T11:25:00.9110000Z",
+                  "End": "2023-03-22T11:28:34.9110000Z"
+              },
+              "timeSeriesName2": {
+                   "Count": 10,
+                   "Start": "2023-03-22T11:26:00.3950000Z",
+                   "End": "2023-03-22T11:28:48.3950000Z"
+              }
+          },
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has a time series:  
+
+* If the current document **contains** a time series name as in the revision:
+    * The reverted document will keep the time series entries & values as it was in the current document.
+    * Time series entries and values from the revision are Not restored.
+
+* If the current document **doesn't contain** a time series name as in the revision,  
+  or if the document itself was deleted:  
+  * The reverted document will have the time series from the revision  
+  * However, the entries count will be 0  
+
+{PANEL/}
+
+{PANEL: Revisions and Attachments}
+
+### Revisions Creation:
+
+A document revision will be created when:  
+
+  * A new [attachment](../../document-extensions/attachments/what-are-attachments) is **added** to the document.  
+  * An attachment is **deleted** from the document.   
+
+---
+
+### Stored Data:
+
+* A revision that is created for a document with attachments  
+  will have the `@attachments` property in its **metadata**.
+
+* This property does Not hold the actual attachments, as the files are stored in **separate storage**.  
+  The property only contains the following information for each attachment the document had when the revision was created:  
+  * Attachment file name
+  * File content type
+  * File size
+  * A hash string (a reference to the file in the storage)
+
+* Existing attachment files in the storage are Not duplicated per revision that is created when the document itself is modified.
+
+* An attachment file is removed from RavenDB's storage only when there is no live document or a revision that refers to it.
+
+* Sample revision metadata:  
+  {CODE-BLOCK:json}
+  {
+      ...
+      "@metadata": {
+          "@attachments": [
+              {
+                  "Name": "attachmentFileName.png",
+                  "ContentType": "image/png",
+                  "Size": 33241,
+                  "Hash": "iFg0o6D38pUcWGVlP71ddDp8SCcoEal47kG3LtWx0+Y=",
+              }, 
+          ],
+      ...
+      }
+  }
+  {CODE-BLOCK/}
+
+---
+
+### Reverted Data:
+
+When a document is [reverted](../../document-extensions/revisions/revert-revisions) to a revision that has attachments,  
+the attachments are restored to their state when the revision was created.
+
+{PANEL/}
+
+{PANEL: Revisions and Replication}
+
+* Revisions are transferred during [replication](../../server/clustering/replication/replication) from one database instance to another.
+
+* The revisions will be replicated by all replication types:
+   * [Internal replication](../../server/clustering/replication/replication#internal-replication)
+   * [External replication](../../server/clustering/replication/replication#external-replication)
+   * [Hub/Sink replication](../../server/clustering/replication/replication#hubsink-replication)
+
+* Revisions can [help keep data consistency](../../server/clustering/replication/replication#how-revisions-replication-help-data-consistency).  
+
+{PANEL/}
+
+{PANEL: Revisions and ETL}
+
+* An [ETL](../../server/ongoing-tasks/etl/raven) ongoing task does Not send  revisions to the destination database.  
+
+* However, if revisions are enabled on the destination database,  
+  whenever the ETL process sends a modified document and the target document is overwritten,  
+  a new revision will be created for the document in the target database as expected.  
+
+{PANEL/}
+
+{PANEL: Revisions and Backup}
+
+Revisions are [backed up](../../server/ongoing-tasks/backup-overview#backup-contents) both by a logical-backup and by a snapshot.
+
+{PANEL/}
+
+{PANEL: Revisions and Data Subscriptions}
+
+* Learn about revisions and data subscriptions [here](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning).  
+
+{PANEL/}
+
+{PANEL: Revisions Import and Export}
+
+* Revisions can be imported and exported with a `.ravendbdump` file:
+    * Using [the Client API](../../client-api/smuggler/what-is-smuggler)
+    * From the [import](../../studio/database/tasks/import-data/import-data-file#import-options) and [export](../../studio/database/tasks/export-database#export-options) views in the Studio  
+
+* Revisions can be imported when migrating data from another [live RavenDB server](../../studio/database/tasks/import-data/import-from-ravendb#step-#4:-set-import-options).
+
+  ![Import from Live Server](images\import-from-live-server.png "Import from Live Server")
+
+{PANEL/}
+
+## Related Articles
+
+### Document Extensions
+
+* [Document Revisions Overview](../../document-extensions/revisions/overview)  
+* [Revert Revisions](../../document-extensions/revisions/revert-revisions)  
+* [Counters: Overview](../../document-extensions/counters/overview)
+* [Time Series: Overview](../../document-extensions/timeseries/overview)
+* [Attachments: What are Attachments](../../document-extensions/attachments/what-are-attachments)
+
+### Client API
+
+* [Revisions: API Overview](../../document-extensions/revisions/client-api/overview)  
+* [Operations: Configuring Revisions](../../document-extensions/revisions/client-api/operations/configure-revisions)  
+* [Session: Loading Revisions](../../document-extensions/revisions/client-api/session/loading)  
+
+### Studio
+
+* [Settings: Document Revisions](../../studio/database/settings/document-revisions)  
+* [Document Extensions: Revisions](../../studio/database/document-extensions/revisions)  
+
+### Data Subscriptions
+
+* [What Are Data Subscriptions](../../client-api/data-subscriptions/what-are-data-subscriptions)  
+* [Revisions and Data Subscriptions](../../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning)  
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py
new file mode 100644
index 0000000000..42a87f494e
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/ConfigureRevisions.py
@@ -0,0 +1,158 @@
+from datetime import timedelta
+from typing import Dict
+
+from ravendb import RevisionsCollectionConfiguration, RevisionsConfiguration, GetDatabaseRecordOperation
+from ravendb.documents.operations.definitions import MaintenanceOperation
+from ravendb.documents.operations.revisions import ConfigureRevisionsOperation, ConfigureRevisionsOperationResult
+
+from examples_base import ExampleBase
+
+
+class ConfigRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_configure_revisions(self):
+        with self.embedded_server.get_document_store("ConfigurationRevisions") as store:
+            with store.open_session() as session:
+                # region replace_configuration
+                # ==============================================================================
+                # Define default settings that will apply to ALL collections
+                # Note: this is optional
+                default_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=100,
+                    minimum_revisions_age_to_keep=timedelta(days=7),
+                    maximum_revisions_to_delete_upon_document_creation=15,
+                    purge_on_delete=False,
+                    disabled=False,
+                    # With this configuration:
+                    # ------------------------
+                    # * A revision will be created anytime a document is modified or deleted.
+                    # * Revisions of a deleted document can be accessed in the Revisions Bin view.
+                    # * At least 100 of the latest revisions will be kept.
+                    # * Older revisions will be removed if they exceed 7 days on next revision creation.
+                    # * A maximum of 15 revisions will be deleted each time a document is updated,
+                    #   until the defined '# of revisions to keep' limit is reached.
+                )
+
+                employees_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=50,
+                    minimum_revisions_age_to_keep=timedelta(hours=12),
+                    purge_on_delete=True,
+                    disabled=False,
+                    # With this configuration:
+                    # ------------------------
+                    # * A revision will be created anytime an Employee document is modified.
+                    # * When a document is deleted all its revisions will be removed.
+                    # * At least 50 of the latest revisions will be kept.
+                    # * Older revisions will be removed if they exceed 12 hours on next revision creation.
+                )
+
+                # ==============================================================================
+                # Define a specific configuration for the EMPLOYEES collection
+                # This will override the default settings
+                products_rev_config = RevisionsCollectionConfiguration(
+                    disabled=True
+                    # No revisions will be created for the Products collection,
+                    # even though default configuration is enabled
+                )
+
+                # ==============================================================================
+                # Combine all configurations in the RevisionsConfiguration object
+                revisions_config = RevisionsConfiguration(
+                    default_config=default_rev_config,
+                    collections={"Employees": employees_rev_config, "Products": products_rev_config},
+                )
+
+                # ==============================================================================
+                # Define the configure revisions operation, pass the configuration
+                configure_revisions_op = ConfigureRevisionsOperation(revisions_config)
+
+                # Execute the operation by passing it to Maintenance.Send
+                # Any existing configuration will be replaced with the new configuration passed
+                store.maintenance.send(configure_revisions_op)
+                # endregion
+
+                # MODIFY
+                default_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=100,
+                    minimum_revisions_age_to_keep=timedelta(days=7),
+                    maximum_revisions_to_delete_upon_document_creation=15,
+                    purge_on_delete=False,
+                    disabled=False,
+                )
+
+                employees_rev_config = RevisionsCollectionConfiguration(
+                    minimum_revisions_to_keep=50,
+                    minimum_revisions_age_to_keep=timedelta(hours=12),
+                    purge_on_delete=True,
+                )
+
+                products_rev_config = RevisionsCollectionConfiguration(disabled=True)
+
+                # region modify_configuration
+                # ==============================================================================
+                # Define the get database record operation:
+                get_database_record_op = GetDatabaseRecordOperation(store.database)
+                # Get the current revisions configuration from the database record:
+                revisions_config = store.maintenance.server.send(get_database_record_op).revisions
+
+                # ==============================================================================
+                # If no revisions configuration exists, then create a new configuration
+                if revisions_config is None:
+                    revisions_config = RevisionsConfiguration(
+                        default_config=default_rev_config,
+                        collections={"Employees": employees_rev_config, "Products": products_rev_config},
+                    )
+
+                # ==============================================================================
+                # If a revisions configuration already exists, then modify it
+                else:
+                    revisions_config.default_config = default_rev_config
+                    revisions_config.collections["Employees"] = employees_rev_config
+                    revisions_config.collections["Products"] = products_rev_config
+
+                # ==============================================================================
+                # Define the configure revisions operation, pass the configuration
+                configure_revisions_op = ConfigureRevisionsOperation(revisions_config)
+
+                # Execute the operation by passing it to maintenance.send
+                # The existing configuration will be updated
+                store.maintenance.send(configure_revisions_op)
+
+                # Execute the operation by passing it to maintenance.send
+                # The existing configuration will be updated
+                store.maintenance.send(configure_revisions_op)
+                # endregion
+
+
+class Foo:
+    # region syntax_1
+    class ConfigureRevisionsOperation(MaintenanceOperation[ConfigureRevisionsOperationResult]):
+        def __init__(self, configuration: RevisionsConfiguration): ...
+
+    # endregion
+
+    # region syntax_2
+
+    class RevisionsConfiguration:
+        def __init__(
+            self,
+            default_config: RevisionsCollectionConfiguration = None,
+            collections: Dict[str, RevisionsCollectionConfiguration] = None,
+        ): ...
+
+    # endregion
+    # region syntax_3
+
+    class RevisionsCollectionConfiguration:
+        def __init__(
+            self,
+            minimum_revisions_to_keep: int = None,
+            minimum_revisions_age_to_keep: timedelta = None,
+            disabled: bool = False,
+            purge_on_delete: bool = False,
+            maximum_revisions_to_delete_upon_document_creation: int = None,
+        ): ...
+
+    # endregion
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py
new file mode 100644
index 0000000000..fd63257da6
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Operations/GetRevisions.py
@@ -0,0 +1,47 @@
+from ravendb.documents.operations.revisions import GetRevisionsOperation
+
+from examples_base import ExampleBase, Company
+
+
+class GetRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_get_revisions(self):
+        with self.embedded_server.get_document_store("GetRevisionsOperation") as store:
+            # region getAllRevisions
+            # Define the get revisions operation, pass the document id
+            get_revisions_op = GetRevisionsOperation("companies/1-A")
+
+            # Execute the operation by passing it to Operations.Send
+            revisions = store.operations.send(get_revisions_op)
+
+            # The revisions info:
+            all_revisions = revisions.results  # All the revisions
+            revisions_count = revisions.total_results  # Total number of revisions
+            # endregion
+
+            # region getRevisionsWithPaging
+            start = 0
+            page_size = 100
+
+            while True:
+                # Execute the get revisions operation
+                # Pass the document id, start & page size to get
+                revisions = store.operations.send(GetRevisionsOperation("comapnies/1-A", Company, start, page_size))
+
+                # Process the retrieved revisions here
+
+                if len(revisions.results) < page_size:
+                    break  # No more revisions to retrieve
+
+                # Increment 'start' by page-size, to get the "next page" in next iteration
+                start += page_size
+
+            # endregion
+
+            # region getRevisionsWithPagingParams
+            parameters = GetRevisionsOperation.Parameters("companies/1-A", 0, 100)
+
+            revisions = store.operations.send(GetRevisionsOperation.from_parameters(parameters))
+            # endregion
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py
new file mode 100644
index 0000000000..e59b1a9500
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Counting.py
@@ -0,0 +1,21 @@
+from examples_base import ExampleBase
+
+
+class CountingRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_count_revisions(self):
+        with self.embedded_server.get_document_store("CountingRevisions") as store:
+            with store.open_session() as session:
+                # region getCount
+                # Get the number of revisions for document 'companies/1-A'
+                revisions_count = session.advanced.revisions.get_count_for("companies/1-A")
+                # endregion
+
+
+# region syntax
+def get_count_for(self, id_: str) -> int: ...
+
+
+# endregion
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py
new file mode 100644
index 0000000000..8f217dbd3a
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/Loading.py
@@ -0,0 +1,76 @@
+import datetime
+from typing import Type, List, Dict, TypeVar
+
+from ravendb.primitives import constants
+
+from examples_base import ExampleBase, Order
+
+_T = TypeVar("_T")
+
+
+class GetRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_get_revisions(self):
+        with self.embedded_server.get_document_store("GetRevisions") as store:
+            with store.open_session() as session:
+                # region example_1_sync
+                # Get revisions for document 'orders/1-A'
+                # Revisions will be ordered by most recent revision first
+                order_revisions = session.advanced.revisions.get_for("orders/1-A", Order, 0, 10)
+                # endregion
+
+                # region example_2_sync
+                # Get 'revisions' metadata for document 'orders/1-A'
+                order_revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A", 0, 10)
+
+                # Each item returned is a revision's metadata, as can be verified in the @flags key
+                metadata = order_revisions_metadata[0]
+                flags_value = metadata[constants.Documents.Metadata.FLAGS]
+
+                self.assertIn("Revision", flags_value)
+                # endregion
+
+                # region example_3_sync
+                # Get a revision by its creation time
+                revision_from_last_year = (
+                    session.advanced.revisions
+                    # If no revision was created at the specified time,
+                    # then the first revision that precedes it will be returned
+                    .get_by_before_date("orders/1-A", datetime.datetime.utcnow() - datetime.timedelta(days=365))
+                )
+                # endregion
+                # region example_4_sync
+                # Get revisions metadata
+                revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A", 0, 25)
+
+                # Get the change-vector from the metadata
+                change_vector = revisions_metadata[0][constants.Documents.Metadata.CHANGE_VECTOR]
+
+                # Get the revision by its change-vector
+                revision = session.advanced.revisions.get_by_change_vector(change_vector, Order)
+                # endregion
+
+
+class Foo:
+    # region syntax_1
+    def get_for(self, id_: str, object_type: Type[_T] = None, start: int = 0, page_size: int = 25) -> List[_T]: ...
+
+    # endregion
+    # region syntax_2
+    def get_metadata_for(self, id_: str, start: int = 0, page_size: int = 25) -> List["MetadataAsDictionary"]: ...
+
+    # endregion
+    # region syntax_3
+    def get_by_before_date(self, id_: str, before_date: datetime.datetime, object_type: Type[_T] = None) -> _T: ...
+
+    # endregion
+    # region syntax_4
+    # Get a revision by its change vector
+    def get_by_change_vector(self, change_vector: str, object_type: Type[_T] = None) -> _T: ...
+
+    # Get multiple revisions by their change vectors
+    def get_by_change_vectors(self, change_vectors: List[str], object_type: Type[_T] = None) -> Dict[str, _T]: ...
+
+    # endregion
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py
new file mode 100644
index 0000000000..fe9a9ce9c2
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/ClientAPI/Session/RevisionsAndOtherFeatures.py
@@ -0,0 +1,23 @@
+from ravendb.primitives import constants
+
+from examples_base import ExampleBase
+
+
+class ExtractCountersFromRevisions(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_extract_counters_from_revisions(self):
+        with self.embedded_server.get_document_store("ExtractCountersFromRevisions") as store:
+            with store.open_session() as session:
+                # region extract_counter
+                # Use get_metadata_for to get revisions metadata for document 'orders/1-A'
+                revisions_metadata = session.advanced.revisions.get_metadata_for("orders/1-A")
+
+                # Extract the counters data from the metadata
+                counters_data_in_revisions = [
+                    metadata[constants.Documents.Metadata.REVISION_COUNTERS]
+                    for metadata in revisions_metadata
+                    if constants.Documents.Metadata.REVISION_COUNTERS in metadata
+                ]
+                # endregion
diff --git a/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/Revisions.py b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/Revisions.py
new file mode 100644
index 0000000000..28e8b4ca44
--- /dev/null
+++ b/Documentation/6.0/Samples/python/DocumentExtensions/Revisions/Revisions.py
@@ -0,0 +1,23 @@
+from ravendb.primitives import constants
+
+from examples_base import ExampleBase
+
+class Force(ExampleBase):
+    def setUp(self):
+        super().setUp()
+
+        # region force_revision_creation_for
+        with self.store.open_session() as session:
+            company = session.load(company_id, Company)
+            company.name = "HR V2"
+
+            session.advanced.revisions.force_revision_creation_for(company)
+            session.save_changes()
+
+            revisions = session.advanced.revisions.get_for(company.Id, Company)
+            revisions_count = len(revisions)
+
+            self.assertEqual(1, revisions_count)
+            # Assert revision contains the value 'Before' the changes...
+            self.assertEqual("HR", revisions[0].name)
+        # endregion