This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 27c37b8828 Fix grammar and spelling (#12937)
27c37b8828 is described below
commit 27c37b882840e4e373d966858e27793686bdc94c
Author: John Bampton <[email protected]>
AuthorDate: Sat Nov 19 01:03:34 2022 +1000
Fix grammar and spelling (#12937)
---
docs/docs/en/architecture/design.md | 4 ++--
docs/docs/en/contribute/api-standard.md | 2 +-
docs/docs/en/contribute/join/become-a-committer.md | 2 +-
docs/docs/en/faq.md | 2 +-
docs/docs/en/guide/parameter/priority.md | 2 +-
docs/docs/en/guide/task/mlflow.md | 2 +-
docs/docs/zh/architecture/design.md | 4 ++--
dolphinscheduler-master/src/main/resources/logback-spring.xml | 4 ++--
.../src/main/resources/logback-spring.xml | 4 ++--
dolphinscheduler-worker/src/main/resources/logback-spring.xml | 4 ++--
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/docs/en/architecture/design.md
b/docs/docs/en/architecture/design.md
index 72ca4e6458..c174f79867 100644
--- a/docs/docs/en/architecture/design.md
+++ b/docs/docs/en/architecture/design.md
@@ -197,7 +197,7 @@ In the early schedule design, if there is no priority
design and use the fair sc
- For details, please refer to the logback configuration of Master and Worker,
as shown in the following example:
```xml
-<conversionRule conversionWord="messsage"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
+<conversionRule conversionWord="message"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter class="org.apache.dolphinscheduler.service.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.service.log.TaskLogDiscriminator">
@@ -209,7 +209,7 @@ In the early schedule design, if there is no priority
design and use the fair sc
<file>${log.base}/${taskAppId}.log</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z}
[%thread] %logger{96}:[%line] - %messsage%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z}
[%thread] %logger{96}:[%line] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/docs/docs/en/contribute/api-standard.md
b/docs/docs/en/contribute/api-standard.md
index cebde7f3a7..2cae26798f 100644
--- a/docs/docs/en/contribute/api-standard.md
+++ b/docs/docs/en/contribute/api-standard.md
@@ -106,7 +106,7 @@ Method: PATCH
### ⑥ Others
-In addition to creating, deleting, modifying and quering, we also locate the
corresponding resource through url, and then append operations to it after the
path, such as:
+In addition to creating, deleting, modifying and querying, we also locate the
corresponding resource through url, and then append operations to it after the
path, such as:
```
/dolphinscheduler/alert-groups/verify-name
diff --git a/docs/docs/en/contribute/join/become-a-committer.md
b/docs/docs/en/contribute/join/become-a-committer.md
index f748a1638c..55f8e80a8f 100644
--- a/docs/docs/en/contribute/join/become-a-committer.md
+++ b/docs/docs/en/contribute/join/become-a-committer.md
@@ -119,7 +119,7 @@ The PMC member should add the new committer to the official
committer list throu
1. Go to [Apache Account Utility Platform](https://id.apache.org/), create
your password, set up your personal mailbox (`Forwarding email address`) and
GitHub account(`Your GitHub Username`). An organizational invite will be sent
to you via email shortly thereafter (within 2 hours).
2. If you would like to use the `[email protected]` email service, please refer
to [here](https://infra.apache.org/committer-email.html). Gmail is recommended,
because this forwarding mode is not easy to find in most mailbox service
settings.
-3. Follow the `Authorized GitHub 2FA wiki` to enable two-factor authorization
(2FA) on [Github](http://github.com/). When you set 2FA to "off", it will be
delisted by the corresponding Apache committer write permission group until you
set it up again. (**NOTE: Treat your recovery codes with the same level of
attention as you would your password!**)
+3. Follow the `Authorized GitHub 2FA wiki` to enable two-factor authorization
(2FA) on [GitHub](http://github.com/). When you set 2FA to "off", it will be
delisted by the corresponding Apache committer write permission group until you
set it up again. (**NOTE: Treat your recovery codes with the same level of
attention as you would your password!**)
4. Use [GitBox Account Linking Utility](https://gitbox.apache.org/setup/) to
obtain write permission of the Dolphinscheduler project.
If you would like to show up publicly in the Apache GitHub org, you need to go
to the [Apache GitHub org people page](https://github.com/orgs/apache/people),
diff --git a/docs/docs/en/faq.md b/docs/docs/en/faq.md
index 403614c727..dc7523fd63 100644
--- a/docs/docs/en/faq.md
+++ b/docs/docs/en/faq.md
@@ -498,7 +498,7 @@ Default is postgresql driver because of license problem.
A: 1, Where is the executed server? Specify one worker to run the task, you
can create worker group in Security Center, then the task can be send to the
particular worker. If a worker group have multiple servers, which server
actually execute is determined by scheduling and has randomness.
- 2, If it is a shell file of a path on the server, how to point to the
path? The server shell file, involving permissions issues, it is not
recommended to do so. It is recommended that you use the storage function of
the resource center, and then use the resource reference in the shell editor.
The system will help you download the script to the execution directory. If the
task dependent on resource center files, worker use "hdfs dfs -get" to get the
resource files in HDFS, then run the [...]
+ 2, If it is a shell file of a path on the server, how to point to the
path? The server shell file, involving permissions issues, it is not
recommended to do so. It is recommended that you use the storage function of
the resource center, and then use the resource reference in the shell editor.
The system will help you download the script to the execution directory. If the
task dependent on resource center files, worker use "hdfs dfs -get" to get the
resource files in HDFS, then run the [...]
3, Which user execute the task? Task is run by the tenant through "sudo -u
${tenant}", tenant is a linux user.
diff --git a/docs/docs/en/guide/parameter/priority.md
b/docs/docs/en/guide/parameter/priority.md
index 9088f96fd1..0586c9f385 100644
--- a/docs/docs/en/guide/parameter/priority.md
+++ b/docs/docs/en/guide/parameter/priority.md
@@ -17,7 +17,7 @@ In the case of upstream tasks can pass parameters to the
downstream, there may b
## Example
-Followings are examples showing task parameters priority problems:
+The following are examples showing task parameters priority problems:
1: Use shell nodes to explain the first case.
diff --git a/docs/docs/en/guide/task/mlflow.md
b/docs/docs/en/guide/task/mlflow.md
index 4ae92ef271..842682b424 100644
--- a/docs/docs/en/guide/task/mlflow.md
+++ b/docs/docs/en/guide/task/mlflow.md
@@ -81,7 +81,7 @@ The MLflow plugin currently supports and will support the
following:
| Repository | Repository url of MLflow Project, Support git address and
directory on worker. If it's in a subdirectory, We add `#` to support this
(same as `mlflow run`) , for example
`https://github.com/mlflow/mlflow#examples/xgboost/xgboost_native`. |
| Project Version | Version of the project, default master.
|
-You can now use this feature to run all MLFlow projects on Github (For example
[MLflow examples](https://github.com/mlflow/mlflow/tree/master/examples) ). You
can also create your own machine learning library to reuse your work, and then
use DolphinScheduler to use your library with one click.
+You can now use this feature to run all MLFlow projects on GitHub (For example
[MLflow examples](https://github.com/mlflow/mlflow/tree/master/examples) ). You
can also create your own machine learning library to reuse your work, and then
use DolphinScheduler to use your library with one click.
### MLflow Models
diff --git a/docs/docs/zh/architecture/design.md
b/docs/docs/zh/architecture/design.md
index 0726a79ad9..14a7b91142 100644
--- a/docs/docs/zh/architecture/design.md
+++ b/docs/docs/zh/architecture/design.md
@@ -195,7 +195,7 @@
- 详情可参考Master和Worker的logback配置，如下示例：
```xml
-<conversionRule conversionWord="messsage"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
+<conversionRule conversionWord="message"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter class="org.apache.dolphinscheduler.service.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.service.log.TaskLogDiscriminator">
@@ -207,7 +207,7 @@
<file>${log.base}/${taskAppId}.log</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z}
[%thread] %logger{96}:[%line] - %messsage%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z}
[%thread] %logger{96}:[%line] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-master/src/main/resources/logback-spring.xml
b/dolphinscheduler-master/src/main/resources/logback-spring.xml
index c18f621c51..6b9f3a7b79 100644
--- a/dolphinscheduler-master/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-master/src/main/resources/logback-spring.xml
@@ -27,7 +27,7 @@
</encoder>
</appender>
- <conversionRule conversionWord="messsage"
+ <conversionRule conversionWord="message"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter class="org.apache.dolphinscheduler.service.log.TaskLogFilter"/>
@@ -40,7 +40,7 @@
<file>${log.base}/${taskAppId}.log</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %messsage%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git
a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
index 79c3ae8ff9..59da2de6d6 100644
--- a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
@@ -47,7 +47,7 @@
<logger name="org.apache.hbase" level="WARN"/>
<logger name="org.apache.hadoop" level="WARN"/>
- <conversionRule conversionWord="messsage"
+ <conversionRule conversionWord="message"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter class="org.apache.dolphinscheduler.service.log.TaskLogFilter"/>
@@ -60,7 +60,7 @@
<file>${log.base}/${taskAppId}.log</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %messsage%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
index fb3d2226d8..7d0d9cd827 100644
--- a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
@@ -28,7 +28,7 @@
</encoder>
</appender>
- <conversionRule conversionWord="messsage"
+ <conversionRule conversionWord="message"
converterClass="org.apache.dolphinscheduler.service.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter class="org.apache.dolphinscheduler.service.log.TaskLogFilter"/>
@@ -41,7 +41,7 @@
<file>${log.base}/${taskAppId}.log</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %messsage%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
