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>,
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/5] docs/zh_CN: clarify free Nitrokey requirements
Date: Sun, 23 Aug 2026 15:14:58 +0800 [thread overview]
Message-ID: <20260823-maintainer-pgp-guide-v2-2-bea33b2ece54@wyuan.org> (raw)
In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org>
Update Documentation/process/maintainer-pgp-guide.rst Chinese
translation to clarify that developers must be listed in an M: entry
in MAINTAINERS or have a kernel.org account to qualify for a free
Nitrokey Start.
Also translate the Nitrokey link text and fix its RST reference markup.
Update the translation through commit 273aa250f138
("Documentation: Improve wording on requirements for a free Nitrokey")
Signed-off-by: Weijie Yuan <wy@wyuan.org>
---
Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst
index a526366a42fa..b329755cc960 100644
--- a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst
+++ b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst
@@ -351,14 +351,14 @@ Paperkey。
.. note::
- 如果你位列于 MAINTAINERS 中或在 kernel.org 上拥有帐户,则你有
- 资格获得Linux 基金会提供的_`qualify for a free Nitrokey Start` 。
+ 如果你被列在 MAINTAINERS 的 `M:` 条目中,或者拥有 kernel.org 帐户,
+ 则有资格获得 Linux 基金会提供的 `免费 Nitrokey Start`_。
.. _`Nitrokey Start`: https://www.nitrokey.com/products/nitrokeys
.. _`Nitrokey 3`: https://www.nitrokey.com/products/nitrokeys
.. _`Yubikey 5`: https://www.yubico.com/products/yubikey-5-overview/
.. _Gnuk: https://www.fsij.org/doc-gnuk/
-.. _`qualify for a free Nitrokey Start`: https://www.kernel.org/nitrokey-digital-tokens-for-kernel-developers.html
+.. _`免费 Nitrokey Start`: https://www.kernel.org/nitrokey-digital-tokens-for-kernel-developers.html
配置你的智能卡设备
------------------
--
2.55.0.822.g20453c30eb
next prev parent reply other threads:[~2026-08-23 7:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-23 7:14 [PATCH v2 0/5] Update maintainer-pgp-guide.rst Chinese translation Weijie Yuan
2026-08-23 7:14 ` [PATCH v2 1/5] docs/zh_CN: update maintainer-pgp-guide translation Weijie Yuan
2026-08-23 7:14 ` Weijie Yuan [this message]
2026-08-23 7:14 ` [PATCH v2 3/5] docs/zh_CN: update maintainer-pgp-guide kernel.org link Weijie Yuan
2026-08-23 7:15 ` [PATCH v2 4/5] docs/zh_CN: add kernel.org trust repository reference Weijie Yuan
2026-08-23 7:15 ` [PATCH v2 5/5] docs/zh_CN: remove empty proofreader field from maintainer PGP guide 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=20260823-maintainer-pgp-guide-v2-2-bea33b2ece54@wyuan.org \
--to=wy@wyuan.org \
--cc=alexs@kernel.org \
--cc=corbet@lwn.net \
--cc=dzm91@hust.edu.cn \
--cc=konstantin@linuxfoundation.org \
--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