This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 3062b72a13 docs: Fixed a grammatical error. (#7625)
3062b72a13 is described below
commit 3062b72a13acd1b07c612f26bb6de6686af96fb0
Author: Asuka-star <[email protected]>
AuthorDate: Fri Sep 12 16:38:40 2025 +0800
docs: Fixed a grammatical error. (#7625)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 2 ++
.../seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java | 2 +-
tm/src/main/java/org/apache/seata/tm/api/DefaultFailureHandlerImpl.java | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 528a9cc446..ba415a2d16 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -75,6 +75,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7531](https://github.com/seata/seata/pull/7531)] Optimize the Readme and
change documents
- [[#7569](https://github.com/seata/seata/pull/7569)] Add hyperlink to
CONTRIBUTING.md in pull request template
- [[#7605](https://github.com/apache/incubator-seata/pull/7605)] Add the type
of registry as seata in application.yml
+- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] Polish
Javadoc for @EnableAutoDataSourceProxy and DefaultFailureHandlerImpl
Thanks to these contributors for their code commits. Please report an
unintended omission.
@@ -91,6 +92,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [keepConcentration](https://github.com/keepConcentration)
- [sunheyi6](https://github.com/sunheyi6)
- [WangzJi](https://github.com/WangzJi)
+- [Asuka-star](https://github.com/Asuka-star)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index c554583c69..b6567f2f6f 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -75,6 +75,7 @@
- [[#7531](https://github.com/seata/seata/pull/7531)] 优化 Readme 和 change 文档
- [[#7569](https://github.com/seata/seata/pull/7569)] 在拉取请求模板中添加
CONTRIBUTING.md 超链接
- [[#7605](https://github.com/apache/incubator-seata/pull/7605)]
在application.yml中增加了seata作为注册中心的注释
+- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] 改进
@EnableAutoDataSourceProxy 和 DefaultFailureHandlerImpl 的 Javadoc
非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
@@ -91,6 +92,7 @@
- [keepConcentration](https://github.com/keepConcentration)
- [sunheyi6](https://github.com/sunheyi6)
- [WangzJi](https://github.com/WangzJi)
+- [Asuka-star](https://github.com/Asuka-star)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git
a/spring/src/main/java/org/apache/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
b/spring/src/main/java/org/apache/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
index 7b0652fa6f..901d35deaa 100644
---
a/spring/src/main/java/org/apache/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
+++
b/spring/src/main/java/org/apache/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
@Documented
public @interface EnableAutoDataSourceProxy {
/**
- * Whether use JDK proxy instead of CGLIB proxy
+ * Whether to use JDK proxy instead of CGLIB proxy
*
* @return useJdkProxy
*/
diff --git
a/tm/src/main/java/org/apache/seata/tm/api/DefaultFailureHandlerImpl.java
b/tm/src/main/java/org/apache/seata/tm/api/DefaultFailureHandlerImpl.java
index 57faefe404..d374cdeaba 100644
--- a/tm/src/main/java/org/apache/seata/tm/api/DefaultFailureHandlerImpl.java
+++ b/tm/src/main/java/org/apache/seata/tm/api/DefaultFailureHandlerImpl.java
@@ -37,7 +37,7 @@ public class DefaultFailureHandlerImpl implements
TMFailureHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultFailureHandlerImpl.class);
/**
- * Retry 1 hours by default
+ * Retry 1 hour by default
*/
private static final int RETRY_MAX_TIMES = 6 * 60;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
