[PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[Weijie Yuan]

Upstream documented the common 'git tag -s' workflow and cleaned up
unneeded RST markup. It briefly updated the automatic lore Link: hook
for Git 2.41 and HTTPS, then removed that guidance because Link: tags
should only point to useful additional information.

Add a SPDX-License-Identifier.

Remove a useless top-of-file label, as Jon always tries to do.

Update the translation through commit 944df7a31452
("docs: update the guidance for Link: tags").

Signed-off-by: Weijie Yuan <wy@wyuan.org>
---
Hi Jon, I added a SPDX-License-Identifier for this file while the
original English one doesn't have one yet. Should I do that? / Is it
"legal" to do so? , if XiangCheng would be happy with what I'm doing.

Also the same concern:

https://lore.kernel.org/linux-doc/20260823-maintainer-pgp-guide-v2-3-bea33b2ece54@wyuan.org/

Thanks.
---
 .../zh_CN/maintainer/configure-git.rst             | 50 ++++++----------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/Documentation/translations/zh_CN/maintainer/configure-git.rst b/Documentation/translations/zh_CN/maintainer/configure-git.rst
index a45ea736f73b..41a1fc0ae884 100644
--- a/Documentation/translations/zh_CN/maintainer/configure-git.rst
+++ b/Documentation/translations/zh_CN/maintainer/configure-git.rst
@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: GPL-2.0
+
 .. include:: ../disclaimer-zh_CN.rst
 
 :Original: Documentation/maintainer/configure-git.rst
@@ -5,58 +7,32 @@
 :译者:
 
  吴想成 Wu XiangCheng <bobwxc@email.cn>
+ 袁维杰 Weijie Yuan <wy@wyuan.org>
 
-.. _configuregit_zh:
+配置 Git
+========
 
-Git配置
-=======
+本章介绍维护者级别的 Git 配置。
 
-本章讲述了维护者级别的git配置。
-
-Documentation/maintainer/pull-requests.rst 中使用的标记分支应使用开发人员的
-GPG公钥进行签名。可以通过将 ``-u`` 标志传递给 ``git tag`` 来创建签名标记。
-但是，由于 *通常* 对同一项目使用同一个密钥，因此可以设置::
+拉取请求中使用的带标签分支（参见 Documentation/maintainer/pull-requests.rst）
+应使用开发者的 GPG 公钥签名。向 ``git tag`` 传递 ``-u <key-id>`` 可以创建签名标签。
+不过，由于你对同一项目 *通常* 会使用同一个密钥，因此可以在配置中设置该密钥并使用 ``-s``
+选项。使用以下命令设置默认的 ``key-id``::
 
 	git config user.signingkey "keyname"
 
-或者手动编辑你的 ``.git/config`` 或 ``~/.gitconfig`` 文件::
+也可以手动编辑你的 ``.git/config`` 或 ``~/.gitconfig`` 文件::
 
 	[user]
 		name = Jane Developer
 		email = jd@domain.org
 		signingkey = jd@domain.org
 
-你可能需要告诉 ``git`` 去使用 ``gpg2``::
+你可能需要让 ``git`` 使用 ``gpg2``::
 
 	[gpg]
 		program = /path/to/gpg2
 
-你可能也需要告诉 ``gpg`` 去使用哪个 ``tty`` （添加到你的shell rc文件中）::
+你可能还需要告诉 ``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

---
base-commit: 66fb95a521110da673090294561844c9f76ebe64
change-id: 20260823-configure-git-686aea09bf5b

Re: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[Alex Shi]

On 2026/8/23 23:13, Weijie Yuan wrote:
> Upstream documented the common 'git tag -s' workflow and cleaned up
> unneeded RST markup. It briefly updated the automatic lore Link: hook
> for Git 2.41 and HTTPS, then removed that guidance because Link: tags
> should only point to useful additional information.
> 
> Add a SPDX-License-Identifier.
> 
> Remove a useless top-of-file label, as Jon always tries to do.
> 
> Update the translation through commit 944df7a31452
> ("docs: update the guidance for Link: tags").
> 
> Signed-off-by: Weijie Yuan<wy@wyuan.org>
> ---
> Hi Jon, I added a SPDX-License-Identifier for this file while the
> original English one doesn't have one yet. Should I do that? / Is it
> "legal" to do so? , if XiangCheng would be happy with what I'm doing.
> 

I am not Jon. but usually changes should start from the original file. 
we don't add or change anything different from it.

Thanks!

Re: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[Weijie Yuan]

On Mon, Aug 24, 2026 at 09:59:47AM +0800, Alex Shi wrote:
> 
> 
> On 2026/8/23 23:13, Weijie Yuan wrote:
> > Upstream documented the common 'git tag -s' workflow and cleaned up
> > unneeded RST markup. It briefly updated the automatic lore Link: hook
> > for Git 2.41 and HTTPS, then removed that guidance because Link: tags
> > should only point to useful additional information.
> > 
> > Add a SPDX-License-Identifier.
> > 
> > Remove a useless top-of-file label, as Jon always tries to do.
> > 
> > Update the translation through commit 944df7a31452
> > ("docs: update the guidance for Link: tags").
> > 
> > Signed-off-by: Weijie Yuan<wy@wyuan.org>
> > ---
> > Hi Jon, I added a SPDX-License-Identifier for this file while the
> > original English one doesn't have one yet. Should I do that? / Is it
> > "legal" to do so? , if XiangCheng would be happy with what I'm doing.
> > 
> 
> I am not Jon. but usually changes should start from the original file. we
> don't add or change anything different from it.

Thanks, Alex. The reason why I asked Jon is because I have witnessed him
make some comments on this matter several times. And of course, you also
have much more experience. ;-)

And it seems that I haven't quite figured out how to handle this
identifier in different situations for our translation.

I also asked this question on another topic. The original English text
at that time did not have this identifier, but the Chinese translation
added it:

Quote [1]:

| The SPDX identifier of this translation was added at its birth, while
| the SPDX identifier of its original English version was added this year
| 2026. Although it has been added, I'm quite curious about whether it is
| "legal" to add the identifier on top of the Chinese translation while
| the English original does not have one back in 2023.
| 
| I know Jon has been a little bit careful about it, so I'd better leave
| my thoughts here for future reference.
| 
| Thanks.

Also, I need to take a closer look at the description of this
identifier.

Ultimately, however, I agree that our top principle should be to
maintain consistency with the original text.

Thanks!

[1] https://lore.kernel.org/linux-doc/20260823-maintainer-pgp-guide-v2-3-bea33b2ece54@wyuan.org/

Re: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[Jonathan Corbet]

Weijie Yuan <wy@wyuan.org> writes:

> Upstream documented the common 'git tag -s' workflow and cleaned up
> unneeded RST markup. It briefly updated the automatic lore Link: hook
> for Git 2.41 and HTTPS, then removed that guidance because Link: tags
> should only point to useful additional information.
>
> Add a SPDX-License-Identifier.
>
> Remove a useless top-of-file label, as Jon always tries to do.
>
> Update the translation through commit 944df7a31452
> ("docs: update the guidance for Link: tags").
>
> Signed-off-by: Weijie Yuan <wy@wyuan.org>
> ---
> Hi Jon, I added a SPDX-License-Identifier for this file while the
> original English one doesn't have one yet. Should I do that? / Is it
> "legal" to do so? , if XiangCheng would be happy with what I'm doing.

It's sort of an interesting case, actually.

We don't know what license the original contributor intended, so it is
hard to add an SPDX line to the original file.  That contributor hasn't
been seen in the community for a while, so it may or may not be easy to
track him down and ask.

A translation, though, is a derived product.  Since everything in the
kernel *can* be distributed under GPLv2, it is fair to say that your
work is GPLv2, so the result of the translation effort must be too.

That said, I think it's better to stick with the original where
possible.

Note, however, that I am *not* a lawyer, and that taking legal advice
from me is probably a bad idea :)

Thanks,

jon

Re: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation

[Weijie Yuan]

On Mon, Aug 24, 2026 at 07:20:56AM -0600, Jonathan Corbet wrote:
> Weijie Yuan <wy@wyuan.org> writes:
> 
> > Upstream documented the common 'git tag -s' workflow and cleaned up
> > unneeded RST markup. It briefly updated the automatic lore Link: hook
> > for Git 2.41 and HTTPS, then removed that guidance because Link: tags
> > should only point to useful additional information.
> >
> > Add a SPDX-License-Identifier.
> >
> > Remove a useless top-of-file label, as Jon always tries to do.
> >
> > Update the translation through commit 944df7a31452
> > ("docs: update the guidance for Link: tags").
> >
> > Signed-off-by: Weijie Yuan <wy@wyuan.org>
> > ---
> > Hi Jon, I added a SPDX-License-Identifier for this file while the
> > original English one doesn't have one yet. Should I do that? / Is it
> > "legal" to do so? , if XiangCheng would be happy with what I'm doing.
> 
> It's sort of an interesting case, actually.
> 
> We don't know what license the original contributor intended, so it is
> hard to add an SPDX line to the original file.  That contributor hasn't
> been seen in the community for a while, so it may or may not be easy to
> track him down and ask.
> 
> A translation, though, is a derived product.  Since everything in the
> kernel *can* be distributed under GPLv2, it is fair to say that your
> work is GPLv2, so the result of the translation effort must be too.

Yes, this is exactly what I'm thinking about.

> That said, I think it's better to stick with the original where
> possible.

OK, agreed. Will do that.

> Note, however, that I am *not* a lawyer, and that taking legal advice
> from me is probably a bad idea :)

Aha, yes. ;) Then I'd better be cautious.

Thanks!