[Doc] fix descriptions, add guide link (#54620)

(cherry picked from commit dc79ada) # Conflicts: # docs/en/sql-reference/sql-statements/backup_restore/BACKUP.md # docs/en/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md # docs/en/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md # docs/en/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md # docs/en/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md # docs/en/sql-reference/sql-statements/backup_restore/RESTORE.md # docs/en/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md # docs/en/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md # docs/zh/overview-pages/other-data-types.mdx # docs/zh/sql-reference/sql-statements/backup_restore/BACKUP.md # docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md # docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md # docs/zh/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md # docs/zh/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md # docs/zh/sql-reference/sql-statements/backup_restore/RESTORE.md # docs/zh/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md # docs/zh/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md # docs/zh/sql-reference/sql-statements/backup_restore/backup_restore.mdx
StarRocks · Jan 2, 2025 · c7be7a6 · c7be7a6
1 parent 8b431fe
commit c7be7a6
Show file tree

Hide file tree

Showing 21 changed files with 90 additions and 10 deletions.
diff --git a/docs/en/sql-reference/sql-statements/backup_restore/BACKUP.md b/docs/en/sql-reference/sql-statements/backup_restore/BACKUP.md
@@ -4,10 +4,18 @@ displayed_sidebar: docs
 
 # BACKUP
 
+<<<<<<< HEAD
 ## Description
 
 Backs up data in a specified database, table, or partition. Currently, StarRocks only supports backing up data in OLAP tables. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
 
+=======
+Backs up data in a specified database, table, or partition. Currently, StarRocks only supports backing up data in OLAP tables.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
+
+:::tip
+For an overview of backup and restore please see the [backup and restore guide](../../../administration/management/Backup_and_restore.md).
+:::
 
 BACKUP is an asynchronous operation. You can check the status of a BACKUP job status using [SHOW BACKUP](./SHOW_BACKUP.md), or cancel a BACKUP job using [CANCEL BACKUP](./CANCEL_BACKUP.md). You can view the snapshot information using [SHOW SNAPSHOT](./SHOW_SNAPSHOT.md).
 

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md b/docs/en/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # CANCEL BACKUP
 
+<<<<<<< HEAD
 ## Description
 
 Cancels an on-going BACKUP task in a specified database. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Cancels an ongoing BACKUP task in a specified database.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 ## Syntax
 

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md b/docs/en/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # CANCEL RESTORE
 
+<<<<<<< HEAD
 ## Description
 
 Cancels an on-going RESTORE task in a specified database. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Cancels an ongoing RESTORE task in a specified database.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **CAUTION**
 >

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md b/docs/en/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md
@@ -4,9 +4,17 @@ displayed_sidebar: docs
 
 # CREATE REPOSITORY
 
+<<<<<<< HEAD
 ## Description
 
 Creates a repository in a remote storage system that is used to store data snapshots for [backing up and restoring data](../../../administration/management/Backup_and_restore.md).
+=======
+Creates a repository in a remote storage system that is used to store data snapshots for backing up and restoring data.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
+
+:::tip
+For an overview of backup and restore please see the [backup and restore guide](../../../administration/management/Backup_and_restore.md).
+:::
 
 > **CAUTION**
 >

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md b/docs/en/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # DROP REPOSITORY
 
+<<<<<<< HEAD
 ## Description
 
 Deletes a repository. Repositories are used to store data snapshots for [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Deletes a repository. Repositories are used to store data snapshots for data backup and restoration.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **CAUTION**
 >

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/RECOVER.md b/docs/en/sql-reference/sql-statements/backup_restore/RECOVER.md
@@ -4,8 +4,6 @@ displayed_sidebar: docs
 
 # RECOVER
 
-## Description
-
 Recovers a database, table, or partition that was dropped by using the DROP command. The dropped database, table, or partition can be recovered within the period specified by the FE parameter `catalog_trash_expire_second` (1 day by default).
 
 Data deleted by using [TRUNCATE TABLE](../table_bucket_part_index/TRUNCATE_TABLE.md) cannot be recovered.

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/RESTORE.md b/docs/en/sql-reference/sql-statements/backup_restore/RESTORE.md
@@ -4,9 +4,17 @@ displayed_sidebar: docs
 
 # RESTORE
 
+<<<<<<< HEAD
 ## Description
 
 Restores data to a specified database, table, or partition. Currently, StarRocks only supports restoring data to OLAP tables. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Restores data to a specified database, table, or partition. Currently, StarRocks only supports restoring data to OLAP tables.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
+
+:::tip
+For an overview of backup and restore please see the [backup and restore guide](../../../administration/management/Backup_and_restore.md).
+:::
 
 RESTORE is an asynchronous operation. You can check the status of a RESTORE job using [SHOW RESTORE](./SHOW_RESTORE.md), or cancel a RESTORE job using [CANCEL RESTORE](./CANCEL_RESTORE.md).
 

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md b/docs/en/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # SHOW BACKUP
 
+<<<<<<< HEAD
 ## Description
 
 Views the last BACKUP task in a specified database. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Views the last BACKUP task in a specified database.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **NOTE**
 >

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/SHOW_REPOSITORIES.md b/docs/en/sql-reference/sql-statements/backup_restore/SHOW_REPOSITORIES.md
@@ -4,8 +4,6 @@ displayed_sidebar: docs
 
 # SHOW REPOSITORIES
 
-## Description
-
 Views the repositories created in StarRocks.
 
 ## Syntax

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md b/docs/en/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # SHOW RESTORE
 
+<<<<<<< HEAD
 ## Description
 
 Views the last RESTORE task in a specified database. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
+=======
+Views the last RESTORE task in a specified database.
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **NOTE**
 >

diff --git a/docs/en/sql-reference/sql-statements/backup_restore/SHOW_SNAPSHOT.md b/docs/en/sql-reference/sql-statements/backup_restore/SHOW_SNAPSHOT.md
@@ -4,8 +4,6 @@ displayed_sidebar: docs
 
 # SHOW SNAPSHOT
 
-## Description
-
 Views data snapshots in a specified repository. For more information, see [data backup and restoration](../../../administration/management/Backup_and_restore.md).
 
 ## Syntax

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/BACKUP.md b/docs/zh/sql-reference/sql-statements/backup_restore/BACKUP.md
@@ -5,9 +5,17 @@ keywords: ['beifen']
 
 # BACKUP
 
+<<<<<<< HEAD
 ## 功能
 
 备份指定数据库、表或分区的数据。当前 StarRocks 仅支持备份 OLAP 类型表。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
+=======
+备份指定数据库、表或分区的数据。当前 StarRocks 仅支持备份 OLAP 类型表。更多信息，请见 备份和恢复。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
+
+:::tip
+有关备份和恢复的概述，请参阅 [备份和恢复指南](../../../administration/management/Backup_and_restore.md) 中。
+:::
 
 数据备份为异步操作。您可以通过 [SHOW BACKUP](./SHOW_BACKUP.md) 语句查看备份作业状态，或通过 [CANCEL BACKUP](./CANCEL_BACKUP.md) 语句取消备份作业。作业成功后，您可以通过 [SHOW SNAPSHOT](./SHOW_SNAPSHOT.md) 查看特定仓库对应的数据快照信息。
 

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md b/docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_BACKUP.md
@@ -5,9 +5,13 @@ keywords: ['beifen']
 
 # CANCEL BACKUP
 
+<<<<<<< HEAD
 ## 功能
 
 取消指定数据库中一个正在进行的备份任务。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
+=======
+取消指定数据库中一个正在进行的备份任务。更多信息，请见 备份和恢复。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 ## 语法
 

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md b/docs/zh/sql-reference/sql-statements/backup_restore/CANCEL_RESTORE.md
@@ -5,9 +5,13 @@ keywords: ['beifen']
 
 # CANCEL RESTORE
 
+<<<<<<< HEAD
 ## 功能
 
 取消指定数据库中一个正在进行的恢复任务。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
+=======
+取消指定数据库中一个正在进行的恢复任务。更多信息，请见 备份和恢复。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **注意**
 >

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md b/docs/zh/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md
@@ -5,9 +5,17 @@ keywords: ['beifen']
 
 # CREATE REPOSITORY
 
+<<<<<<< HEAD
 ## 功能
 
 基于远端存储系统创建用于存储数据快照的仓库。仓库用于 [备份和恢复](../../../administration/management/Backup_and_restore.md) 数据库数据。
+=======
+基于远端存储系统创建用于存储数据快照的仓库。仓库用于 备份和恢复 数据库数据。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
+
+:::tip
+有关备份和恢复的概述，请参阅 [备份和恢复指南](../../../administration/management/Backup_and_restore.md) 中。
+:::
 
 > **注意**
 >

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md b/docs/zh/sql-reference/sql-statements/backup_restore/DROP_REPOSITORY.md
@@ -5,9 +5,13 @@ keywords: ['beifen']
 
 # DROP REPOSITORY
 
+<<<<<<< HEAD
 ## 功能
 
 删除一个仓库。仓库用于 [备份和恢复](../../../administration/management/Backup_and_restore.md) 数据库数据。
+=======
+删除一个仓库。仓库用于 备份和恢复 数据库数据。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **注意**
 >

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/RECOVER.md b/docs/zh/sql-reference/sql-statements/backup_restore/RECOVER.md
@@ -5,8 +5,6 @@ keywords: ['beifen']
 
 # RECOVER
 
-## 功能
-
 恢复之前通过 DROP 操作删除的 database、table 或者 partition。DROP 操作后只有在指定的时间内才能通过 RECOVER 恢复数据，超过这个时间无法恢复。该时间由 FE 动态参数 `catalog_trash_expire_second` 控制，默认 1 天。
 
 通过 [TRUNCATE TABLE](../table_bucket_part_index/TRUNCATE_TABLE.md) 命令删除的数据无法恢复。

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/RESTORE.md b/docs/zh/sql-reference/sql-statements/backup_restore/RESTORE.md
@@ -5,11 +5,21 @@ keywords: ['beifen']
 
 # RESTORE
 
+<<<<<<< HEAD
 ## 功能
 
 恢复指定数据库、表或分区的数据。当前 StarRocks 仅支持恢复 OLAP 类型表。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
 
 数据恢复为异步操作。您可以通过 [SHOW RESTORE](../backup_restore/SHOW_RESTORE.md) 语句查看恢复作业状态，或通过 [CANCEL RESTORE](../backup_restore//CANCEL_RESTORE.md) 语句取消恢复作业。
+=======
+恢复指定数据库、表或分区的数据。当前 StarRocks 仅支持恢复 OLAP 类型表。更多信息，请见 备份和恢复。
+
+:::tip
+有关备份和恢复的概述，请参阅 [备份和恢复指南](../../../administration/management/Backup_and_restore.md) 中。
+:::
+
+数据恢复为异步操作。您可以通过 [SHOW RESTORE](./SHOW_RESTORE.md) 语句查看恢复作业状态，或通过 [CANCEL RESTORE](./CANCEL_RESTORE.md) 语句取消恢复作业。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **注意**
 >

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md b/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_BACKUP.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # SHOW BACKUP
 
+<<<<<<< HEAD
 ## 功能
 
 查看指定数据库中的备份任务。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
+=======
+查看指定数据库中的备份任务。更多信息，请见 备份和恢复。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **说明**
 >

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_REPOSITORIES.md b/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_REPOSITORIES.md
@@ -4,8 +4,6 @@ displayed_sidebar: docs
 
 # SHOW REPOSITORIES
 
-## 功能
-
 查看当前已创建的仓库。
 
 ## 语法

diff --git a/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md b/docs/zh/sql-reference/sql-statements/backup_restore/SHOW_RESTORE.md
@@ -4,9 +4,13 @@ displayed_sidebar: docs
 
 # SHOW RESTORE
 
+<<<<<<< HEAD
 ## 功能
 
 查看指定数据库中的恢复任务。更多信息，请见 [备份和恢复](../../../administration/management/Backup_and_restore.md)。
+=======
+查看指定数据库中的恢复任务。更多信息，请见 备份和恢复。
+>>>>>>> dc79ada1d7 ([Doc] fix descriptions, add guide link (#54620))
 
 > **说明**
 >