This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.1-prepare by this push:
new e04750b81d [doc] Correct descriptions in glossary.md (#12282)
e04750b81d is described below
commit e04750b81db206260741e304aeef88256aecf888
Author: fuchanghai <[email protected]>
AuthorDate: Mon Oct 10 09:37:15 2022 +0800
[doc] Correct descriptions in glossary.md (#12282)
---
docs/docs/en/about/glossary.md | 6 +++---
docs/docs/zh/about/glossary.md | 9 ++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/docs/docs/en/about/glossary.md b/docs/docs/en/about/glossary.md
index dc3df7bb5c..f60dc28d6d 100644
--- a/docs/docs/en/about/glossary.md
+++ b/docs/docs/en/about/glossary.md
@@ -17,10 +17,10 @@ there are no subsequent nodes. Examples are as follows:
manual start or scheduled scheduling. Each time the process definition runs, a
process instance is generated
**Task instance**: The task instance is the instantiation of the task node in
the process definition, which identifies
-the specific task execution status
+the specific task
**Task type**: Currently supports SHELL, SQL, SUB_PROCESS (sub-process),
PROCEDURE, MR, SPARK, PYTHON, DEPENDENT (
-depends), and plans to support dynamic plug-in expansion, note:
**SUB_PROCESS** It is also a separate process
+depends), and plans to support dynamic plug-in expansion, note:
**SUB_PROCESS** need relation with another workflow definition which also a
separate process
definition that can be started and executed separately
**Scheduling method**: The system supports scheduled scheduling and manual
scheduling based on cron expressions. Command
@@ -45,7 +45,7 @@ provided. **Continue** refers to regardless of the status of
the task running in
failure. **End** means that once a failed task is found, Kill will also run
the parallel task at the same time, and the
process fails and ends
-**Complement**: Supplement historical data，supports **interval parallel and
serial** two complement methods, and two types of date selection which include
**date range** and **date enumeration**.
+**Complement**: Supplement historical data，supports **interval parallel** and
**serial** two complement methods, and two types of date selection which
include **date range** and **date enumeration**.
### 2.Module introduction
diff --git a/docs/docs/zh/about/glossary.md b/docs/docs/zh/about/glossary.md
index 7642a4a4c1..859a1af295 100644
--- a/docs/docs/zh/about/glossary.md
+++ b/docs/docs/zh/about/glossary.md
@@ -10,12 +10,11 @@
**流程定义**：通过拖拽任务节点并建立任务节点的关联所形成的可视化**DAG**
-**流程实例**：流程实例是流程定义的实例化，可以通过手动启动或定时调度生成，流程定义每运行一次，产生一个流程实例
+**流程实例**：流程实例是流程定义的实例化，可以通过手动启动或定时调度生成。每运行一次流程定义，产生一个流程实例
-**任务实例**：任务实例是流程定义中任务节点的实例化，标识着具体的任务执行状态
+**任务实例**：任务实例是流程定义中任务节点的实例化，标识着某个具体的任务
-**任务类型**：目前支持有
SHELL、SQL、SUB_PROCESS(子流程)、PROCEDURE、MR、SPARK、PYTHON、DEPENDENT(依赖)，同时计划支持动态插件扩展，注意：其中子
**SUB_PROCESS**
-也是一个单独的流程定义，是可以单独启动执行的
+**任务类型**：目前支持有
SHELL、SQL、SUB_PROCESS(子流程)、PROCEDURE、MR、SPARK、PYTHON、DEPENDENT(依赖)，同时计划支持动态插件扩展，注意：其中
**SUB_PROCESS**类型的任务需要关联另外一个流程定义，被关联的流程定义是可以单独启动执行的
**调度方式**：系统支持基于 cron
表达式的定时调度和手动调度。命令类型支持：启动工作流、从当前节点开始执行、恢复被容错的工作流、恢复暂停流程、从失败节点开始执行、补数、定时、重跑、暂停、停止、恢复等待线程。
其中 **恢复被容错的工作流** 和 **恢复等待线程** 两种命令类型是由调度内部控制使用，外部无法调用
@@ -30,7 +29,7 @@
**失败策略**：对于并行运行的任务，如果有任务失败，提供两种失败策略处理方式，**继续**是指不管并行运行任务的状态，直到流程失败结束。**结束**是指一旦发现失败任务，则同时Kill掉正在运行的并行任务，流程失败结束
-**补数**：补历史数据，支持**区间并行和串行**两种补数方式，其日期选择方式包括**日期范围**和**日期枚举**两种
+**补数**：补历史数据，支持**区间并行**和**串行**两种补数方式，其日期选择方式包括**日期范围**和**日期枚举**两种
### 2.模块介绍
