From: Weijie Yuan <wy@wyuan.org>
To: Alex Shi <alexs@kernel.org>, Yanteng Si <si.yanteng@linux.dev>,
Dongliang Mu <dzm91@hust.edu.cn>,
Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 0/2] docs/zh_CN: update maintainer/configure-git.rst
Date: Sat, 05 Sep 2026 18:06:24 +0800 [thread overview]
Message-ID: <20260905-configure-git-v2-0-ab194db8c6b9@wyuan.org> (raw)
Update the translation of two files:
1) maintainer/configure-git.rst
2) maintainer/pull-requests.rst
I only update the first one in v1. However, I find a reference of
pull-requests.rst in configure-git.rst is in English, while we've had a
Chinese one. So, update both this time.
You may find some diffs are just about style, some are certain wordings.
That's because I find some current wordings feel like a little bit
machine-translated. So yes, diffs are ugly in some part. Sorry.
But at the same time, it touches many parts of this file. If do mind,
I'm glad to remove unnecessary parts.
Note that there's a warm tip from checkpatch,
checkpatch.pl: Documentation/translations/zh_CN/maintainer/pull-requests.rst:118: WARNING: Do not use whitespace before Signed-off-by:
.. which is caused by a sample Sob trailer.
---
Cover letter of v1
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.
Note:
The issue above is settled in the thread of v1. Thanks, Alex and Jon.
To: Alex Shi <alexs@kernel.org>
To: Yanteng Si <si.yanteng@linux.dev>
To: Dongliang Mu <dzm91@hust.edu.cn>
To: Jonathan Corbet <corbet@lwn.net>
To: Shuah Khan <skhan@linuxfoundation.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes in v2:
- Remove the SPDX identifier, see details and reasons in the thread of v1.
- Add a new translation.
- Link to v1: https://patch.msgid.link/20260823-configure-git-v1-1-3c65eefcc585@wyuan.org
To: Alex Shi <alexs@kernel.org>
To: Yanteng Si <si.yanteng@linux.dev>
To: Dongliang Mu <dzm91@hust.edu.cn>
To: Jonathan Corbet <corbet@lwn.net>
To: Shuah Khan <skhan@linuxfoundation.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Weijie Yuan (2):
docs/zh_CN: sync maintainer/configure-git with upstream
docs/zh_CN: improve maintainer/pull-requests translation
.../zh_CN/maintainer/configure-git.rst | 48 ++------
.../zh_CN/maintainer/pull-requests.rst | 127 +++++++++++----------
2 files changed, 77 insertions(+), 98 deletions(-)
Range-diff versus v1:
1: c4b4c818df9e ! 1: 74ad4a89ee0a docs/zh_CN: update maintainer/configure-git.rst translation
@@ Metadata
Author: Weijie Yuan <wy@wyuan.org>
## Commit message ##
- docs/zh_CN: update maintainer/configure-git.rst translation
+ docs/zh_CN: sync maintainer/configure-git with upstream
- 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.
+ The English document updated the signed-tag instructions to describe
+ selecting a key with -u <key-id>, configuring a default key, and using
+ -s. It also removed the explicit section label and the instructions for
+ adding Link trailers automatically with an applypatch-msg hook, because
+ Link: trailers should only point to useful additional information.
Update the translation through commit 944df7a31452
("docs: update the guidance for Link: tags").
+ Also point the pull-request reference to the Chinese translation.
+
Signed-off-by: Weijie Yuan <wy@wyuan.org>
## Documentation/translations/zh_CN/maintainer/configure-git.rst ##
-@@
-+.. SPDX-License-Identifier: GPL-2.0
-+
- .. include:: ../disclaimer-zh_CN.rst
-
- :Original: Documentation/maintainer/configure-git.rst
@@
:译者:
@@ Documentation/translations/zh_CN/maintainer/configure-git.rst
-Documentation/maintainer/pull-requests.rst 中使用的标记分支应使用开发人员的
-GPG公钥进行签名。可以通过将 ``-u`` 标志传递给 ``git tag`` 来创建签名标记。
-但是,由于 *通常* 对同一项目使用同一个密钥,因此可以设置::
-+拉取请求中使用的带标签分支(参见 Documentation/maintainer/pull-requests.rst)
++拉取请求中使用的带标签分支(参见 Documentation/translations/zh_CN/maintainer/pull-requests.rst)
+应使用开发者的 GPG 公钥签名。向 ``git tag`` 传递 ``-u <key-id>`` 可以创建签名标签。
-+不过,由于你对同一项目 *通常* 会使用同一个密钥,因此可以在配置中设置该密钥并使用 ``-s``
-+选项。使用以下命令设置默认的 ``key-id``::
++不过,由于你对同一项目 *通常* 会使用同一个密钥,因此可以在配置中设置该密钥并
++使用 ``-s`` 选项。使用以下命令设置默认的 ``key-id``::
git config user.signingkey "keyname"
-: ------------ > 2: 7a451e345578 docs/zh_CN: improve maintainer/pull-requests translation
---
base-commit: 66fb95a521110da673090294561844c9f76ebe64
change-id: 20260823-configure-git-686aea09bf5b
next reply other threads:[~2026-09-05 10:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-05 10:06 Weijie Yuan [this message]
2026-09-05 10:06 ` [PATCH v2 1/2] docs/zh_CN: sync maintainer/configure-git with upstream Weijie Yuan
2026-09-05 10:06 ` [PATCH v2 2/2] docs/zh_CN: improve maintainer/pull-requests translation Weijie Yuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260905-configure-git-v2-0-ab194db8c6b9@wyuan.org \
--to=wy@wyuan.org \
--cc=alexs@kernel.org \
--cc=corbet@lwn.net \
--cc=dzm91@hust.edu.cn \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=si.yanteng@linux.dev \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox