pingcap · yikeke · Jul 16, 2020 · Jul 16, 2020 · Jul 16, 2020 · Jul 16, 2020
diff --git a/TOC.md b/TOC.md
@@ -190,7 +190,7 @@
     + [User Guide](/tispark-overview.md)
 + Reference
   + Cluster Architecture
-    + [Overview](/architecture.md)
+    + [Overview](/tidb-architecture.md)
   + Key Monitoring Metrics
     + [Overview](/grafana-overview-dashboard.md)
     + [TiDB](/grafana-tidb-dashboard.md)

diff --git a/_index.md b/_index.md
@@ -89,7 +89,7 @@ Designed for the cloud, TiDB provides flexible scalability, reliability and secu
 <NavColumn>
 <ColumnTitle>Reference</ColumnTitle>
 
-- [TiDB Architecture](/architecture.md)
+- [TiDB Architecture](/tidb-architecture.md)
 - [Key Monitoring Metrics](/grafana-overview-dashboard.md)
 - [Enable TLS](/enable-tls-between-clients-and-servers.md)
 - [Privilege Management](/privilege-management.md)

diff --git a/faq/tidb-faq.md b/faq/tidb-faq.md
@@ -20,7 +20,7 @@ TiDB is a distributed SQL database that features in horizontal scalability, high
 
 #### What is TiDB's architecture?
 
-The TiDB cluster has three components: the TiDB server, the PD (Placement Driver) server, and the TiKV server. For more details, see [TiDB architecture](/architecture.md).
+The TiDB cluster has three components: the TiDB server, the PD (Placement Driver) server, and the TiKV server. For more details, see [TiDB architecture](/tidb-architecture.md).
 
 #### Is TiDB based on MySQL?
 
@@ -52,7 +52,7 @@ This problem occurs because MySQL 8.0 changes the [authentication plugin](/secur
 
 #### How is TiDB highly available?
 
-TiDB is self-healing. All of the three components, TiDB, TiKV and PD, can tolerate failures of some of their instances. With its strong consistency guarantee, whether it’s data machine failures or even downtime of an entire data center, your data can be recovered automatically. For more information, see [TiDB architecture](/architecture.md).
+TiDB is self-healing. All of the three components, TiDB, TiKV and PD, can tolerate failures of some of their instances. With its strong consistency guarantee, whether it’s data machine failures or even downtime of an entire data center, your data can be recovered automatically. For more information, see [TiDB architecture](/tidb-architecture.md).
 
 #### How is TiDB strongly consistent?
 
@@ -64,7 +64,7 @@ At the bottom layer, TiKV uses a model of replication log + State Machine to rep
 
 Yes. TiDB distributes transactions across your cluster, whether it is a few nodes in a single location or many [nodes across multiple data centers](/multi-data-centers-in-one-city-deployment.md).
 
-Inspired by Google's Percolator, the transaction model in TiDB is mainly a two-phase commit protocol with some practical optimizations. This model relies on a timestamp allocator to assign the monotone increasing timestamp for each transaction, so conflicts can be detected. [PD](/architecture.md#placement-driver-pd-server) works as the timestamp allocator in a TiDB cluster.
+Inspired by Google's Percolator, the transaction model in TiDB is mainly a two-phase commit protocol with some practical optimizations. This model relies on a timestamp allocator to assign the monotone increasing timestamp for each transaction, so conflicts can be detected. [PD](/tidb-architecture.md#placement-driver-pd-server) works as the timestamp allocator in a TiDB cluster.
 
 #### What programming language can I use to work with TiDB?
 
@@ -110,7 +110,7 @@ As a standalone database, MySQL can only implement across-database transactions
 
 The display content of TiDB `show processlist` is almost the same as that of MySQL `show processlist`. TiDB `show processlist` does not display the system process ID. The ID that it displays is the current session ID. The differences between TiDB `show processlist` and MySQL `show processlist` are as follows:
 
-- As TiDB is a distributed database, the `tidb-server` instance is a stateless engine for parsing and executing the SQL statements (for details, see [TiDB architecture](/architecture.md)). `show processlist` displays the session list executed in the `tidb-server` instance that the user logs in to from the MySQL client, not the list of all the sessions running in the cluster. But MySQL is a standalone database and its `show processlist` displays all the SQL statements executed in MySQL.
+- As TiDB is a distributed database, the `tidb-server` instance is a stateless engine for parsing and executing the SQL statements (for details, see [TiDB architecture](/tidb-architecture.md)). `show processlist` displays the session list executed in the `tidb-server` instance that the user logs in to from the MySQL client, not the list of all the sessions running in the cluster. But MySQL is a standalone database and its `show processlist` displays all the SQL statements executed in MySQL.
 - The `State` column in TiDB is not continually updated during query execution. As TiDB supports parallel query, each statement may be in multiple _states_ at once, and thus it is difficult to simplify to a single value.
 
 #### How to modify the user password and privilege?

diff --git a/get-started-with-tidb-binlog.md b/get-started-with-tidb-binlog.md
@@ -8,7 +8,7 @@ aliases: ['/docs/dev/get-started-with-tidb-binlog/','/docs/dev/how-to/get-starte
 
 This tutorial starts with a simple TiDB Binlog deployment with a single node of each component (Placement Driver, TiKV Server, TiDB Server, Pump, and Drainer), set up to push data into a MariaDB Server instance.
 
-This tutorial is targeted toward users who have some familiarity with the [TiDB Architecture](/architecture.md), who may have already set up a TiDB cluster (not mandatory), and who wants to gain hands-on experience with TiDB Binlog. This tutorial is a good way to "kick the tires" of TiDB Binlog and to familiarize yourself with the concepts of its architecture.
+This tutorial is targeted toward users who have some familiarity with the [TiDB Architecture](/tidb-architecture.md), who may have already set up a TiDB cluster (not mandatory), and who wants to gain hands-on experience with TiDB Binlog. This tutorial is a good way to "kick the tires" of TiDB Binlog and to familiarize yourself with the concepts of its architecture.
 
 > **Warning:**
 >

diff --git a/production-deployment-from-binary-tarball.md b/production-deployment-from-binary-tarball.md
@@ -12,7 +12,7 @@ See also [local deployment](/deploy-tidb-from-binary.md) and [testing environmen
 
 ## Prepare
 
-Before you start, see [TiDB architecture](/architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md). Make sure the following requirements are satisfied:
+Before you start, see [TiDB architecture](/tidb-architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md). Make sure the following requirements are satisfied:
 
 ### Operating system
 

diff --git a/quick-start-with-tidb.md b/quick-start-with-tidb.md
@@ -307,7 +307,9 @@ Click to try TiDB-Wasm playground: <https://tour.tidb.io>. It takes about 10 sec
 - If you have just deployed a TiDB cluster for the local test environment:
 
     - Learn [Basic SQL operations in TiDB](/basic-sql-operations.md)
+    - [Migrate data to TiDB](/migration-overview.md)
     - Learn [TiDB key features and scenarios](/overview.md)
+    - Learn [TiDB's architecture](/tidb-architecture.md)
     - Learn [TiDB's compatibility with MySQL](/mysql-compatibility.md)
 
 - If you are ready to deploy a TiDB cluster for the production environment:

diff --git a/test-deployment-from-binary-tarball.md b/test-deployment-from-binary-tarball.md
@@ -12,7 +12,7 @@ See also [local deployment](/deploy-tidb-from-binary.md) and [production environ
 
 ## Prepare
 
-Before you start, see [TiDB architecture](/architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md). Make sure the following requirements are satisfied:
+Before you start, see [TiDB architecture](/tidb-architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md). Make sure the following requirements are satisfied:
 
 ### Operating system
 

diff --git a/test-deployment-using-docker.md b/test-deployment-using-docker.md
@@ -12,7 +12,7 @@ aliases: ['/docs/dev/test-deployment-using-docker/','/docs/dev/how-to/deploy/orc
 
 This document shows you how to manually deploy a multi-node TiDB cluster on multiple machines using Docker.
 
-To learn more, see [TiDB architecture](/architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md).
+To learn more, see [TiDB architecture](/tidb-architecture.md) and [Software and Hardware Recommendations](/hardware-and-software-requirements.md).
 
 ## Preparation
 

diff --git a/architecture.md → tidb-architecture.md b/architecture.md → tidb-architecture.md
@@ -1,7 +1,7 @@
 ---
 title: TiDB Architecture
 summary: The key architecture components of the TiDB platform
-aliases: ['/docs/dev/architecture/']
+aliases: ['/docs/dev/architecture/','/tidb/dev/architecture']
 ---
 
 # TiDB Architecture