2019-04-16 02:27:10

by Alex Shi

[permalink] [raw]
Subject: [PATCH 1/2] docs/zh_CN: redirect CoC docs to Chinese version

That gives more natural reading experience for Chinese.

Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
.../zh_CN/process/code-of-conduct-interpretation.rst | 2 +-
Documentation/translations/zh_CN/process/code-of-conduct.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst b/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst
index a1daec0482e2..c323ce76e0cb 100644
--- a/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst
+++ b/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst
@@ -8,7 +8,7 @@
Linux内核贡献者契约行为准则解释
===============================

-:ref:`code_of_conduct` 准则是一个通用文档,旨在为几乎所有开源社区提供一套规则。
+:ref:`cn_code_of_conduct` 准则是一个通用文档,旨在为几乎所有开源社区提供一套规则。
每个开源社区都是独一无二的,Linux内核也不例外。因此,本文描述了Linux内核社区中
如何解释它。我们也不希望这种解释随着时间的推移是静态的,并将根据需要进行调整。

diff --git a/Documentation/translations/zh_CN/process/code-of-conduct.rst b/Documentation/translations/zh_CN/process/code-of-conduct.rst
index 4054daafedf1..99024df058e9 100644
--- a/Documentation/translations/zh_CN/process/code-of-conduct.rst
+++ b/Documentation/translations/zh_CN/process/code-of-conduct.rst
@@ -69,4 +69,4 @@ https://www.contributor-covenant.org/version/1/4/code-of-conduct.html 获取。
解释
====

-有关Linux内核社区如何解释此文档,请参阅 :ref:`code_of_conduct_interpretation`
+有关Linux内核社区如何解释此文档,请参阅 :ref:`cn_code_of_conduct_interpretation`
--
2.19.1.856.g8858448bb


2019-04-16 02:27:21

by Alex Shi

[permalink] [raw]
Subject: [PATCH 2/2] docs/zh_CN: fix typos in 1.Intro.rst file

Fixed uncapital issues, thanks for Jonathan Neuschäfer, I am insensitive
on captial custom as a non-captial native language reader. Sorry.

Also fix a typo. And replace more colloquial words in Chinese.

Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Jonathan Neuschäfer <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
Documentation/translations/zh_CN/process/1.Intro.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/translations/zh_CN/process/1.Intro.rst b/Documentation/translations/zh_CN/process/1.Intro.rst
index 03bbafc00bd2..10a15f3dc282 100644
--- a/Documentation/translations/zh_CN/process/1.Intro.rst
+++ b/Documentation/translations/zh_CN/process/1.Intro.rst
@@ -79,13 +79,13 @@ Linux最引人注目的特性之一是这些开发人员可以访问它;任何
致谢
----

-本文件由jonathan corbet撰写,[email protected]。以下人员的建议使之更为完善:
+本文件由Jonathan Corbet撰写,[email protected]。以下人员的建议使之更为完善:
Johannes Berg, James Berry, Alex Chiang, Roland Dreier, Randy Dunlap,
Jake Edge, Jiri Kosina, Matt Mackall, Arthur Marsh, Amanda McPherson,
Andrew Morton, Andrew Price, Tsugikazu Shibata, 和 Jochen Voß.

-这项工作得到了Linux基金会的支持,特别感谢Amanda McPherson,他看到了这香工作
-的价值并使之发生。
+这项工作得到了Linux基金会的支持,特别感谢Amanda McPherson,他看到了这项工作
+的价值并把它变成现实。

代码进入主线的重要性
--------------------
--
2.19.1.856.g8858448bb