This is an automated cherry-pick of pingcap#12354

Signed-off-by: ti-chi-bot <[email protected]>

br/backup-and-restore-storages.md

@@ -1,7 +1,11 @@
 ---
 title: Backup Storages
 summary: Describes the storage URL format used in TiDB backup and restore.
+<<<<<<< HEAD
 aliases: ['/tidb/v6.4/backup-storage-S3/','/tidb/v6.4/backup-storage-azblob/','/tidb/v6.4/backup-storage-gcs/']
+=======
+aliases: ['/docs/dev/br/backup-and-restore-storages/','/tidb/dev/backup-storage-S3/','/tidb/dev/backup-storage-azblob/','/tidb/dev/backup-storage-gcs/','/tidb/dev/external-storage/']
+>>>>>>> 3d78c8449 (*: move external storage to dumpling and lightning docs (#12354))
 ---
 
 # Backup Storages

develop/dev-guide-insert-data.md

@@ -208,7 +208,7 @@ The following are the recommended tools for bulk-insert:
 
 <CustomContent platform="tidb">
 
-- Data import: [TiDB Lightning](/tidb-lightning/tidb-lightning-overview.md). You can import **Dumpling** exported data, a **CSV** file, or [Migrate Data from Amazon Aurora to TiDB](/migrate-aurora-to-tidb.md). It also supports reading data from a local disk or [Amazon S3 cloud disk](/br/backup-and-restore-storages.md).
+- Data import: [TiDB Lightning](/tidb-lightning/tidb-lightning-overview.md). You can import **Dumpling** exported data, a **CSV** file, or [Migrate Data from Amazon Aurora to TiDB](/migrate-aurora-to-tidb.md). It also supports reading data from a local disk or Amazon S3 cloud disk.
 - Data replication: [TiDB Data Migration](/dm/dm-overview.md). You can replicate MySQL, MariaDB, and Amazon Aurora databases to TiDB. It also supports merging and migrating the sharded instances and tables from the source databases.
 - Data backup and restore: [Backup & Restore (BR)](/br/backup-and-restore-overview.md). Compared to **Dumpling**, **BR** is more suitable for **_big data_** scenario.