edits

Author: TheovanKraay

articles/cosmos-db/cassandra/TOC.yml

@@ -177,10 +177,16 @@
             - name: Mapping Cassandra consistency levels
               href: consistency-mapping.md
             - name: High availability
-              href: ../high-availability.md
-            - name: Conflict types and resolution policies
-              displayName: last write wins, custom, multi-region writes, multi-master
-              href: ../conflict-resolution-policies.md
+              items:
+                - name: High availability overview
+                  href: ../high-availability.md
+                - name: Multi-region writes
+                  items:
+                    - name: Understanding multi-region writes
+                      href: ../multi-region-writes.md
+                    - name: Conflict resolution
+                      displayName: last write wins, custom, multi-region writes, multi-master
+                      href: ../conflict-resolution-policies.md
             - name: Global distribution - under the hood
               href: ../global-dist-under-the-hood.md
         - name: Security

articles/cosmos-db/change-feed.md

@@ -67,6 +67,13 @@ Change feed is available for partition key ranges of an Azure Cosmos DB containe
 
 Change feed items come in the order of their modification time. This sort order is guaranteed per partition key, and there's no guaranteed order across the partition key values.
 
+> [!NOTE]
+> For [multi-region write](multi-region-writes.md) accounts, there are two timestamps:
+> - The server epoch time at which the record was written in the local region. This is recorded as `_ts`.
+> - The epoch time at which the absence of a conflict was confirmed, or the conflict was resolved in the [hub region](multi-region-writes.md#hub-region) for that record. This is recorded as `crts`. 
+> Change feed items come in the order recorded by `crts`.
+
+
 ### Change feed in multi-region Azure Cosmos DB accounts
 
 In a multi-region Azure Cosmos DB account, changes in one region are available in all regions. If a write-region fails over, change feed works across the manual failover operation, and it's contiguous. For accounts with multiple write regions, there's no guarantee of when changes will be available. Incoming changes to the same document may be dropped in latest version mode if there was a more recent change in another region, and all changes will be captured in all versions and deletes mode.

articles/cosmos-db/get-latest-restore-timestamp.md

@@ -18,6 +18,9 @@ This article describes how to get the [latest restorable timestamp](latest-resto
 
 This feature is supported for Azure Cosmos DB API for NoSQL containers, API for MongoDB , Table API and API for Gremlin graphs.
 
+> [!IMPORTANT]
+> For [multi-region write](multi-region-writes.md) accounts, the latest restorable timestamp is determinded by a [conflict resolution timestamp (`crts`)](multi-region-writes.md#understanding-timestamps). This is not returned by the methods listed below. See GitHub sample [here](https://github.com/Azure-Samples/cosmosdb-get-conflict-resolved-timestamp-from-changefeed) to learn how to consume Azure Cosmos DB's Change Feed and return documents with `ConflictResolvedTimestamp(crts)` in a container. 
+
 ## SQL container
 
 ### PowerShell

articles/cosmos-db/gremlin/TOC.yml

@@ -185,10 +185,16 @@
           displayName: session, consistency prefix, strong, eventual, bounded staleness
           href: ../consistency-levels.md
         - name: High availability
-          href: ../high-availability.md
-        - name: Conflict types and resolution policies
-          displayName: last write wins, custom, multi-region writes, multi-master
-          href: ../conflict-resolution-policies.md
+          items:
+            - name: High availability overview
+              href: ../high-availability.md
+            - name: Multi-region writes
+              items:
+                - name: Understanding multi-region writes
+                  href: ../multi-region-writes.md
+                - name: Conflict resolution
+                  displayName: last write wins, custom, multi-region writes, multi-master
+                  href: ../conflict-resolution-policies.md
         - name: Global distribution - under the hood
           href: ../global-dist-under-the-hood.md
     - name: Security

articles/cosmos-db/mongodb/TOC.yml

@@ -254,10 +254,16 @@
             - name: Mapping MongoDB consistency levels
               href: consistency-mapping.md
             - name: High availability
-              href: ../high-availability.md
-            - name: Conflict types and resolution policies
-              displayName: last write wins, custom, multi-region writes, multi-master
-              href: ../conflict-resolution-policies.md
+              items:
+                - name: High availability overview
+                  href: ../high-availability.md
+                - name: Multi-region writes
+                  items:
+                    - name: Understanding multi-region writes
+                      href: ../multi-region-writes.md
+                    - name: Conflict resolution
+                      displayName: last write wins, custom, multi-region writes, multi-master
+                      href: ../conflict-resolution-policies.md
             - name: Global distribution - under the hood
               href: ../global-dist-under-the-hood.md
         - name: Security

articles/cosmos-db/nosql/TOC.yml

@@ -353,7 +353,7 @@
               items:
                 - name: Understanding multi-region writes
                   href: ../multi-region-writes.md
-                - name: Conflict types and resolution policies
+                - name: Conflict resolution
                   displayName: last write wins, custom, multi-region writes, multi-master
                   href: ../conflict-resolution-policies.md
         - name: Global distribution - under the hood

articles/cosmos-db/table/TOC.yml

@@ -191,10 +191,16 @@
           displayName: session, consistency prefix, strong, eventual, bounded staleness
           href: ../consistency-levels.md
         - name: High availability
-          href: ../high-availability.md
-        - name: Conflict types and resolution policies
-          displayName: last write wins, custom, multi-region writes, multi-master
-          href: ../conflict-resolution-policies.md
+          items:
+              - name: High availability overview
+                href: ../high-availability.md
+              - name: Multi-region writes
+                items:
+                  - name: Understanding multi-region writes
+                    href: ../multi-region-writes.md
+                  - name: Conflict resolution
+                    displayName: last write wins, custom, multi-region writes, multi-master
+                    href: ../conflict-resolution-policies.md
         - name: Global distribution - under the hood
           href: ../global-dist-under-the-hood.md
     - name: Security