Skip to contentSkip to conversation

docs/zh_CN: Add translation zh_CN/maintainer

PATCH Superseded Wu XiangCheng 2 participants 8 messages Apr 25, 2021 – May 13, 2021

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover docs/zh_CN: Add translation zh_CN/maintainer

Hi all,

This set of patches aims to add translations zh_CN/maintainer.

v2:
* Modified some words in [Patch 3-4/6] under Yanteng Si's advices. Thanks for his review!
* Pick Yanteng Si's reviewed-by tag for [Patch 1-6/6]

v1:
<https://lore.kernel.org/linux-doc/[email protected]/T/#t>

Please note that since each patch need to modify their own entry in zh_CN/maintainer/index.rst, patches should be applied in order.

Thanks!

Base on jc/docs-next

Wu XiangCheng (6):
docs/zh_CN: Add translation zh_CN/maintainer/index.rst docs/zh_CN: Add translation zh_CN/maintainer/configure-git.rst docs/zh_CN: Add translation zh_CN/maintainer/rebasing-and-merging.rst docs/zh_CN: Add translation zh_CN/maintainer/pull-requests.rst docs/zh_CN: Add translation
zh_CN/maintainer/maintainer-entry-profile.rst
docs/zh_CN: Add translation zh_CN/maintainer/modifying-patches.rst

 Documentation/translations/zh_CN/index.rst    |   1 +
 .../zh_CN/maintainer/configure-git.rst        |  62 +++++++
 .../translations/zh_CN/maintainer/index.rst   |  21 +++
 .../maintainer/maintainer-entry-profile.rst   |  92 ++++++++++
 .../zh_CN/maintainer/modifying-patches.rst    |  51 ++++++
 .../zh_CN/maintainer/pull-requests.rst        | 148 ++++++++++++++++
 .../zh_CN/maintainer/rebasing-and-merging.rst | 166 ++++++++++++++++++
 7 files changed, 541 insertions(+)
 create mode 100644 Documentation/translations/zh_CN/maintainer/configure-git.rst
 create mode 100644 Documentation/translations/zh_CN/maintainer/index.rst
 create mode 100644 Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
 create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst
 create mode 100644 Documentation/translations/zh_CN/maintainer/pull-requests.rst
 create mode 100644 Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst

base-commit: 441ca977a84dadac6173db7c07c25db110b76c1e

Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/6 docs/zh_CN: Add translation zh_CN/maintainer/index.rst

Add a new translation
Documentation/translations/zh_CN/maintainer/index.rst
and link it to zh_CN/index.rst

---
 Documentation/translations/zh_CN/index.rst    |  1 +
 .../translations/zh_CN/maintainer/index.rst   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 Documentation/translations/zh_CN/maintainer/index.rst
Documentation/translations/zh_CN/index.rst +1 -0
index ee6b20ca9080..3bfecfe179b8 100644
@@ -21,6 +21,7 @@
    dev-tools/index
    doc-guide/index
    kernel-hacking/index
+   maintainer/index
    filesystems/index
    arm64/index
    sound/index
Documentation/translations/zh_CN/maintainer/index.rst new file +19 -0
new file mode 100644
index 000000000000..4ce27c12f370
@@ -0,0 +1,19 @@
+.. include:: ../disclaimer-zh_CN.rst
+
+:Original: Documentation/maintainer/index.rst
+
+==============
+内核维护者手册
+==============
+
+本文档本是内核维护者手册的首页。
+本手册还需要大量完善!请自由提出(和编写)本手册的补充内容。
+*译注:指英文原版*
+
+TODOList:
+
+-   configure-git
+-   rebasing-and-merging
+-   pull-requests
+-   maintainer-entry-profile
+-   modifying-patches
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/6 docs/zh_CN: Add translation zh_CN/maintainer/configure-git.rst

In reply to Wu XiangCheng

Add a new translation
Documentation/translations/zh_CN/maintainer/configure-git.rst
and link it to zh_CN/maintainer/index.rst

---
 .../zh_CN/maintainer/configure-git.rst        | 62 +++++++++++++++++++
 .../translations/zh_CN/maintainer/index.rst   |  6 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/translations/zh_CN/maintainer/configure-git.rst
Documentation/translations/zh_CN/maintainer/configure-git.rst new file +62 -0
new file mode 100644
index 000000000000..a45ea736f73b
@@ -0,0 +1,62 @@
+.. include:: ../disclaimer-zh_CN.rst
+
+:Original: Documentation/maintainer/configure-git.rst
+
+:译者:
+
+ 吴想成 Wu XiangCheng <[email protected]>
+
+.. _configuregit_zh:
+
+Git配置
+=======
+
+本章讲述了维护者级别的git配置。
+
+Documentation/maintainer/pull-requests.rst 中使用的标记分支应使用开发人员的
+GPG公钥进行签名。可以通过将 ``-u`` 标志传递给 ``git tag`` 来创建签名标记。
+但是,由于 *通常* 对同一项目使用同一个密钥,因此可以设置::
+
+	git config user.signingkey "keyname"
+
+或者手动编辑你的 ``.git/config`` 或 ``~/.gitconfig`` 文件::
+
+	[user]
+		name = Jane Developer
+		email = [email protected]
+		signingkey = [email protected]
+
+你可能需要告诉 ``git`` 去使用 ``gpg2``::
+
+	[gpg]
+		program = /path/to/gpg2
+
+你可能也需要告诉 ``gpg`` 去使用哪个 ``tty`` (添加到你的shell rc文件中)::
+
+	export GPG_TTY=$(tty)
+
+
+创建链接到lore.kernel.org的提交
+-------------------------------
+
+http://lore.kernel.org 网站是所有涉及或影响内核开发的邮件列表的总存档。在这里
+存储补丁存档是推荐的做法,当维护人员将补丁应用到子系统树时,最好提供一个指向
+lore存档链接的标签,以便浏览提交历史的人可以找到某个更改背后的相关讨论和基本
+原理。链接标签如下所示:
+
+	Link: https://lore.kernel.org/r/<message-id>
+
+通过在git中添加以下钩子,可以将此配置为在发布 ``git am`` 时自动执行:
+
+.. code-block:: none
+
+	$ git config am.messageid true
+	$ cat >.git/hooks/applypatch-msg <<'EOF'
+	#!/bin/sh
+	. git-sh-setup
+	perl -pi -e 's|^Message-Id:\s*<?([^>]+)>?$|Link: https://lore.kernel.org/r/$1|g;' "$1"
+	test -x "$GIT_DIR/hooks/commit-msg" &&
+		exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+	:
+	EOF
+	$ chmod a+x .git/hooks/applypatch-msg
Documentation/translations/zh_CN/maintainer/index.rst +5 -1
index 4ce27c12f370..e263315f5e7a 100644
@@ -10,9 +10,13 @@
 本手册还需要大量完善!请自由提出(和编写)本手册的补充内容。
 *译注:指英文原版*
 
+.. toctree::
+   :maxdepth: 2
+
+   configure-git
+
 TODOList:
 
--   configure-git
 -   rebasing-and-merging
 -   pull-requests
 -   maintainer-entry-profile
Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 3/6 docs/zh_CN: Add translation zh_CN/maintainer/rebasing-and-merging.rst

In reply to Wu XiangCheng

Add a new translation
Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst
and link it to zh_CN/maintainer/index.rst

---
 .../translations/zh_CN/maintainer/index.rst   |   2 +-
 .../zh_CN/maintainer/rebasing-and-merging.rst | 166 ++++++++++++++++++
 2 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst
Documentation/translations/zh_CN/maintainer/index.rst +1 -1
index e263315f5e7a..21ab7cebf78b 100644
@@ -14,10 +14,10 @@
    :maxdepth: 2
 
    configure-git
+   rebasing-and-merging
 
 TODOList:
 
--   rebasing-and-merging
 -   pull-requests
 -   maintainer-entry-profile
 -   modifying-patches
Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst new file +166 -0

166 lines not on this page · raw message

Signature · 1 line
2.20.1
#4 lore raw

PATCH v2 4/6 docs/zh_CN: Add translation zh_CN/maintainer/pull-requests.rst

In reply to Wu XiangCheng

Add a new translation
Documentation/translations/zh_CN/maintainer/pull-requests.rst
and link it to zh_CN/maintainer/index.rst

---
 .../translations/zh_CN/maintainer/index.rst   |   2 +-
 .../zh_CN/maintainer/pull-requests.rst        | 148 ++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/translations/zh_CN/maintainer/pull-requests.rst
Documentation/translations/zh_CN/maintainer/index.rst +1 -1
index 21ab7cebf78b..1a1222b78715 100644
@@ -15,9 +15,9 @@
 
    configure-git
    rebasing-and-merging
+   pull-requests
 
 TODOList:
 
--   pull-requests
 -   maintainer-entry-profile
 -   modifying-patches
Documentation/translations/zh_CN/maintainer/pull-requests.rst new file +148 -0

148 lines not on this page · raw message

Signature · 1 line
2.20.1
#5 lore raw

PATCH v2 5/6 docs/zh_CN: Add translation zh_CN/maintainer/maintainer-entry-profile.rst

In reply to Wu XiangCheng

Add a new translation
Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
and link it to zh_CN/maintainer/index.rst

---
 .../translations/zh_CN/maintainer/index.rst   |  2 +-
 .../maintainer/maintainer-entry-profile.rst   | 92 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
Documentation/translations/zh_CN/maintainer/index.rst +1 -1
index 1a1222b78715..18a820741f52 100644
@@ -16,8 +16,8 @@
    configure-git
    rebasing-and-merging
    pull-requests
+   maintainer-entry-profile
 
 TODOList:
 
--   maintainer-entry-profile
 -   modifying-patches
Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst new file +92 -0

92 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

PATCH v2 6/6 docs/zh_CN: Add translation zh_CN/maintainer/modifying-patches.rst

In reply to Wu XiangCheng

Add a new translation
Documentation/translations/zh_CN/maintainer/modifying-patches.rst
and link it to zh_CN/maintainer/index.rst

---
 .../translations/zh_CN/maintainer/index.rst   |  4 +-
 .../zh_CN/maintainer/modifying-patches.rst    | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst
Documentation/translations/zh_CN/maintainer/index.rst +1 -3
index 18a820741f52..eb75ccea9a21 100644
@@ -17,7 +17,5 @@
    rebasing-and-merging
    pull-requests
    maintainer-entry-profile
+   modifying-patches
 
-TODOList:
-
--   modifying-patches
Documentation/translations/zh_CN/maintainer/modifying-patches.rst new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
2.20.1
maintainer
#7 lore raw
In reply to Wu XiangCheng
Quoted 12 lines · Wu XiangCheng

Hi all,

This set of patches aims to add translations zh_CN/maintainer.

v2:
* Modified some words in [Patch 3-4/6] under Yanteng Si's advices. Thanks for his review!
* Pick Yanteng Si's reviewed-by tag for [Patch 1-6/6]

v1:
<https://lore.kernel.org/linux-doc/[email protected]/T/#t>

Quoted 6 lines

Please note that since each patch need to modify their own entry in zh_CN/maintainer/index.rst, patches should be applied in order.

Thanks!

Base on jc/docs-next

So my apologies but ... can I get you to resend this against current docs-next? There have been enough changes to the index.rst files that I'm not confident in trying to merge things.

Sorry for the delays - the merge window tends to do that.

Thanks,

jon