Skip to content

Commit 0069480

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-db-update-global-distribution
2 parents e08ca36 + 7a4fb1b commit 0069480

27 files changed

Lines changed: 226 additions & 369 deletions

articles/cosmos-db/.openpublishing.redirection.cosmos-db.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/cosmos-db/introduction.md",
5+
"redirect_url": "/azure/cosmos-db/overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/cosmos-db/how-pricing-works.md",
10+
"redirect_url": "/azure/cosmos-db/overview",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path_from_root": "/articles/cosmos-db/partitioning-overview.md",
515
"redirect_url": "/azure/cosmos-db/partitioning",

articles/cosmos-db/TOC.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
- name: Overview
44
expanded: true
55
items:
6-
- name: Welcome to Azure Cosmos DB
7-
href: introduction.md
6+
- name: What is Azure Cosmos DB?
7+
href: overview.md
88
- name: FAQ
99
href: faq.yml
10-
- name: Overview
11-
href: overview.md
1210
- name: Understand distributed NoSQL
1311
href: distributed-nosql.md
1412
- name: Compare to Azure DocumentDB
@@ -215,7 +213,7 @@
215213
- name: Partitioning and horizontal scaling
216214
items:
217215
- name: Partitioning overview
218-
href: partitioning-overview.md?context=/azure/cosmos-db/context/context
216+
href: partitioning.md?context=/azure/cosmos-db/context/context
219217
- name: Designing multitenant applications
220218
href: /azure/architecture/guide/multitenant/service/cosmos-db?context=/azure/cosmos-db/context/context
221219
- name: Hierarchical partition keys
@@ -703,7 +701,7 @@
703701
- name: Migrate - DynamoDB data to API for NoSQL
704702
href: dynamodb-data-migration-cosmos-db.md
705703
- name: Migrate - HBase to API for NoSQL
706-
href: migrate-hbase-to-cosmos-db.md
704+
href: migrate-hbase.md
707705

708706
- name: High availability
709707
items:
@@ -715,7 +713,7 @@
715713
displayName: replication, replicate, geo distribution
716714
href: distribute-data-globally.md?context=/azure/cosmos-db/context/context
717715
- name: Global distribution - under the hood
718-
href: global-dist-under-the-hood.md?context=/azure/cosmos-db/context/context
716+
href: global-distribution.md?context=/azure/cosmos-db/context/context
719717
- name: Distribute data globally tutorial
720718
href: tutorial-global-distribution.md
721719
- name: Consistency

articles/cosmos-db/cassandra/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
- name: Partitioning
103103
items:
104104
- name: Partitioning overview
105-
href: ../partitioning-overview.md
105+
href: ../partitioning.md
106106
- name: Partitioning for API for Apache Cassandra
107107
href: partitioning.md
108108
- name: Throughput (RU/s)
@@ -173,7 +173,7 @@
173173
displayName: last write wins, custom, multi-region writes, multi-master
174174
href: ../conflict-resolution-policies.md
175175
- name: Global distribution - under the hood
176-
href: ../global-dist-under-the-hood.md
176+
href: ../global-distribution.md
177177
- name: Security
178178
items:
179179
- name: Considerations and guidance

articles/cosmos-db/how-pricing-works.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)