From nobody Mon Sep 28 10:44:10 2026 Received: from mta1.migadu.com (out-98.mta1.migadu.com [95.215.58.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3739B322B9F for ; Sun, 23 Aug 2026 07:15:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469325; cv=none; b=OG1X/Iy/thdoXC/E+E2IPaF+HTI59O5KOjB3GNbAgb7+OR70PYWNJHVC5xMjL/NSItRbldCx6S27YgUrUpR11xUyIpjeQFrpyx+bSiQSkcUKrXYLHjPEs057YbXj/cT9eQjdaDXavx5pU6JKA/G75g/X6V+6654xoHuLHJkpiMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469325; c=relaxed/simple; bh=aixwb0lFr5kmdgD8o0AI6k/dkAz3IrEfSku8gUtasis=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DUQS92vi4JRmhxH22O/ttPqsghznX8DuOz/m77Sox5G2kTKC/mve1IW8xb/XEp0pIL+iJcMVlENpfp9XZjNQuVKN2In6RGfNLxnEttLy/JPvO6aZkwh06i38ex9+265ncZ05pfEFCwOMEXXCj2iiIB7tunpT8kgPxhmYDDI+ca4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=xbas3oBe; arc=none smtp.client-ip=95.215.58.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="xbas3oBe" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=aixwb0lFr5kmdgD8o0AI6k/dkAz3IrEfSku8gUtasis=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787469319; v=1; x=1788074119; b=xbas3oBefFCfiUp067KaWqkrXpp0qn3y2umRCRXYD5UJ1d2eW0JAV7s6TPwZMUZE6z6Seue5 wduYf2Iy2PGUtXo6RQAIhCfgonUieORBwPRoxGIv4S/L/vCZeAXZ+DMu1KRzhQplfPZely3Ctxe 3wO4L2cDjjs/btKpoNdVHXqOjwlM1b4qUMvQZKchyVdY+B5GW8CBQYVf++VQCg5rziPnA5bQRl0 b2//HUTrnvPVRYBEB/Fb1J/mCOnQn2yTmoWR9gSniO8QSmPAPcLMCed+RIjCTjDbgI7kn+CcU0K tjw+YH/6LnRDrcxUAeRzoZY1KGoysId2jpTKlO5NKzgPA== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id 35742742ff65c0e7; Sun, 23 Aug 2026 07:15:19 +0000 X-Mizu-Trace-ID: 35742742ff65c0e7 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 15:14:57 +0800 Subject: [PATCH v2 1/5] docs/zh_CN: update maintainer-pgp-guide translation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-maintainer-pgp-guide-v2-1-bea33b2ece54@wyuan.org> References: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Konstantin Ryabitsev Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev Update Documentation/process/maintainer-pgp-guide.rst Chinese translation. Add missing labels from the initial translation. Update the translation through commit f44a29784f68 ("Documentation: update maintainer-pgp-guide for latest best practices") Assisted-by: LLM Signed-off-by: Weijie Yuan --- I used LLM to help me quickly locate where's the part that needs to be updated, as well as what's the suggested diff for it. And it helped me with some translation wording stuff. Well, I have to admit that LLM knows Chinese better than me nowadays. ;-) --- .../zh_CN/process/maintainer-pgp-guide.rst | 141 +++++++++++------= ---- 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.= rst b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst index eb12694a4c59..a526366a42fa 100644 --- a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst +++ b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst @@ -40,6 +40,8 @@ git =E4=BB=93=E5=BA=93=E5=92=8C tarball =E9=83=BD=E5=B8= =A6=E6=9C=89=E5=88=9B=E5=BB=BA=E5=AE=98=E6=96=B9=E5=86=85=E6=A0=B8=E7=89=88= =E6=9C=AC=E7=9A=84=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91=E8=80=85=E7=9A=84 PGP - git =E4=BB=93=E5=BA=93=E5=9C=A8=E6=89=80=E6=9C=89=E6=A0=87=E7=AD=BE=E4= =B8=8A=E6=8F=90=E4=BE=9B PGP =E7=AD=BE=E5=90=8D - tarball =E4=B8=BA=E6=89=80=E6=9C=89=E4=B8=8B=E8=BD=BD=E6=8F=90=E4=BE=9B= =E7=8B=AC=E7=AB=8B=E7=9A=84 PGP =E7=AD=BE=E5=90=8D =20 +.. _cn_devs_not_infra: + =E4=BF=A1=E4=BB=BB=E5=BC=80=E5=8F=91=E8=80=85=EF=BC=8C=E4=B8=8D=E8=A6=81= =E4=BF=A1=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD -------------------------- =20 @@ -47,14 +49,16 @@ git =E4=BB=93=E5=BA=93=E5=92=8C tarball =E9=83=BD=E5=B8= =A6=E6=9C=89=E5=88=9B=E5=BB=BA=E5=AE=98=E6=96=B9=E5=86=85=E6=A0=B8=E7=89=88= =E6=9C=AC=E7=9A=84=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91=E8=80=85=E7=9A=84 PGP =E5=88=99=E5=B0=B1=E6=98=AF=E5=81=87=E5=AE=9A=E5=9F=BA=E7=A1=80=E8=AE=BE= =E6=96=BD=E7=9A=84=E4=BB=BB=E4=BD=95=E9=83=A8=E5=88=86=E9=83=BD=E5=8F=AF=E8= =83=BD=E9=9A=8F=E6=97=B6=E5=8F=97=E5=88=B0=E5=85=A5=E4=BE=B5=E3=80=82=E5=9B= =A0=E6=AD=A4=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E7=89=B9=E6=84=8F=E9=87=87= =E5=8F=96=E6=8E=AA=E6=96=BD=EF=BC=8C =E5=BC=BA=E8=B0=83=E5=BF=85=E9=A1=BB=E5=A7=8B=E7=BB=88=E4=BF=A1=E4=BB=BB= =E5=BC=80=E5=8F=91=E8=80=85=EF=BC=8C=E4=B8=8D=E8=83=BD=E4=BF=A1=E4=BB=BB=E4= =BB=A3=E7=A0=81=E6=89=98=E7=AE=A1=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=EF=BC= =8C=E6=97=A0=E8=AE=BA=E5=90=8E=E8=80=85=E7=9A=84=E5=AE=89=E5=85=A8=E5=AE=9E= =E8=B7=B5=E6=9C=89=E5=A4=9A=E5=A5=BD=E3=80=82 =20 -=E4=B8=8A=E8=BF=B0=E6=8C=87=E5=AF=BC=E5=8E=9F=E5=88=99=E6=AD=A3=E6=98=AF= =E9=9C=80=E8=A6=81=E6=9C=AC=E6=8C=87=E5=8D=97=E7=9A=84=E5=8E=9F=E5=9B=A0=E3= =80=82=E5=B8=8C=E6=9C=9B=E7=A1=AE=E4=BF=9D=E9=80=9A=E8=BF=87=E5=AF=B9=E5=BC= =80=E5=8F=91=E8=80=85=E7=9A=84=E4=BF=A1=E4=BB=BB=EF=BC=8C=E6=88=91=E4=BB=AC= =E4=B8=8D=E4=BC=9A=E7=AE=80 -=E5=8D=95=E5=9C=B0=E5=B0=86=E6=9C=AA=E6=9D=A5=E6=BD=9C=E5=9C=A8=E5=AE=89= =E5=85=A8=E4=BA=8B=E4=BB=B6=E7=9A=84=E8=B4=A3=E4=BB=BB=E5=BD=92=E5=92=8E=E4= =BA=8E=E5=85=B6=E4=BB=96=E4=BA=BA=E3=80=82=E7=9B=AE=E7=9A=84=E6=98=AF=E6=8F= =90=E4=BE=9B=E4=B8=80=E5=A5=97=E6=8C=87=E5=AF=BC=E5=BC=80=E5=8F=91=E8=80=85= =E5=8F=AF=E4=BB=A5=E7=94=A8 -=E6=9D=A5=E5=88=9B=E5=BB=BA=E5=AE=89=E5=85=A8=E7=9A=84=E5=B7=A5=E4=BD=9C= =E7=8E=AF=E5=A2=83=E5=B9=B6=E4=BF=9D=E6=8A=A4=E7=94=A8=E4=BA=8E=E5=BB=BA=E7= =AB=8B Linux =E5=86=85=E6=A0=B8=E6=9C=AC=E8=BA=AB=E5=AE=8C=E6=95=B4=E6=80= =A7=E7=9A=84 PGP =E5=AF=86=E9=92=A5=E3=80=82 +=E4=B8=8A=E8=BF=B0=E6=8C=87=E5=AF=BC=E5=8E=9F=E5=88=99=E6=AD=A3=E6=98=AF= =E9=9C=80=E8=A6=81=E6=9C=AC=E6=8C=87=E5=8D=97=E7=9A=84=E5=8E=9F=E5=9B=A0=E3= =80=82=E5=B8=8C=E6=9C=9B=E7=A1=AE=E4=BF=9D=E9=80=9A=E8=BF=87=E5=AF=B9=E5=BC= =80=E5=8F=91=E8=80=85=E7=9A=84=E4=BF=A1=E4=BB=BB=EF=BC=8C=E6=88=91=E4=BB=AC= =E4=B8=8D=E4=BC=9A +=E4=BB=85=E4=BB=85=E5=B0=86=E6=9C=AA=E6=9D=A5=E6=BD=9C=E5=9C=A8=E5=AE=89= =E5=85=A8=E4=BA=8B=E4=BB=B6=E7=9A=84=E8=B4=A3=E4=BB=BB=E5=BD=92=E5=92=8E=E4= =BA=8E=E5=85=B6=E4=BB=96=E4=BA=BA=E3=80=82=E7=9B=AE=E7=9A=84=E6=98=AF=E6=8F= =90=E4=BE=9B=E4=B8=80=E5=A5=97=E6=8C=87=E5=AF=BC=E5=BC=80=E5=8F=91=E8=80=85= =E5=8F=AF=E4=BB=A5 +=E7=94=A8=E6=9D=A5=E5=88=9B=E5=BB=BA=E5=AE=89=E5=85=A8=E7=9A=84=E5=B7=A5= =E4=BD=9C=E7=8E=AF=E5=A2=83=E5=B9=B6=E4=BF=9D=E6=8A=A4=E7=94=A8=E4=BA=8E=E5= =BB=BA=E7=AB=8B Linux =E5=86=85=E6=A0=B8=E6=9C=AC=E8=BA=AB=E5=AE=8C=E6=95= =B4=E6=80=A7=E7=9A=84 PGP =E5=AF=86=E9=92=A5=E3=80=82 + +.. _cn_pgp_tools: =20 PGP =E5=B7=A5=E5=85=B7 =3D=3D=3D=3D=3D=3D=3D=3D =20 -=E4=BD=BF=E7=94=A8 GnuPG 2.2 =E6=88=96=E6=9B=B4=E9=AB=98=E7=89=88=E6=9C=AC +=E4=BD=BF=E7=94=A8 GnuPG 2.4 =E6=88=96=E6=9B=B4=E9=AB=98=E7=89=88=E6=9C=AC ------------------------- =20 =E9=BB=98=E8=AE=A4=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=BD=A0=E7=9A=84= =E5=8F=91=E8=A1=8C=E7=89=88=E5=BA=94=E8=AF=A5=E5=B7=B2=E7=BB=8F=E5=AE=89=E8= =A3=85=E4=BA=86 GnuPG=EF=BC=8C=E4=BD=A0=E5=8F=AA=E9=9C=80=E8=A6=81=E9=AA=8C= =E8=AF=81=E4=BD=A0=E4=BD=BF=E7=94=A8=E7=9A=84=E6=98=AF=E7=9B=B8=E5=BD=93=E6= =96=B0=E7=9A=84 @@ -62,8 +66,8 @@ PGP =E5=B7=A5=E5=85=B7 =20 $ gpg --version | head -n1 =20 -=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=9C=89 2.2 =E6=88=96=E6=9B=B4=E9=AB=98=E7=89= =88=E6=9C=AC=EF=BC=8C=E9=82=A3=E4=B9=88=E4=BD=A0=E5=B0=B1=E5=8F=AF=E4=BB=A5= =E5=BC=80=E5=A7=8B=E4=BA=86=E3=80=82=E5=A6=82=E6=9E=9C=E4=BD=A0=E7=9A=84=E7= =89=88=E6=9C=AC=E6=97=A9=E4=BA=8E 2.2=EF=BC=8C=E5=88=99=E6=9C=AC=E6=8C=87 -=E5=8D=97=E4=B8=AD=E7=9A=84=E6=9F=90=E4=BA=9B=E5=91=BD=E4=BB=A4=E5=8F=AF= =E8=83=BD=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8=E3=80=82 +=E5=A6=82=E6=9E=9C=E4=BD=A0=E7=9A=84=E7=89=88=E6=9C=AC=E4=B8=BA 2.4 =E6=88= =96=E6=9B=B4=E9=AB=98=EF=BC=8C=E9=82=A3=E4=B9=88=E4=B8=80=E5=88=87=E5=87=86= =E5=A4=87=E5=B0=B1=E7=BB=AA=E3=80=82=E5=A6=82=E6=9E=9C=E4=BD=BF=E7=94=A8=E7= =9A=84=E6=98=AF=E6=9B=B4=E6=97=A9=E7=9A=84=E7=89=88=E6=9C=AC=EF=BC=8C=E5=88= =99=E8=AF=A5 +GnuPG =E7=89=88=E6=9C=AC=E5=B7=B2=E5=81=9C=E6=AD=A2=E7=BB=B4=E6=8A=A4=EF= =BC=8C=E6=9C=AC=E6=8C=87=E5=8D=97=E4=B8=AD=E7=9A=84=E6=9F=90=E4=BA=9B=E5=91= =BD=E4=BB=A4=E5=8F=AF=E8=83=BD=E6=97=A0=E6=B3=95=E5=B7=A5=E4=BD=9C=E3=80=82 =20 =E9=85=8D=E7=BD=AE gpg-agent =E9=80=89=E9=A1=B9 ~~~~~~~~~~~~~~~~~~~ @@ -90,6 +94,8 @@ GnuPG agent=E6=98=AF=E4=B8=80=E4=B8=AA=E8=BE=85=E5=8A=A9= =E5=B7=A5=E5=85=B7=EF=BC=8C=E6=AF=8F=E5=BD=93=E4=BD=A0=E4=BD=BF=E7=94=A8=E8= =AF=A5=E5=91=BD=E4=BB=A4=E6=97=B6=EF=BC=8C=E5=AE=83=E9=83=BD=E4=BC=9A=E8=87= =AA=E5=8A=A8 rc =E6=96=87=E4=BB=B6=E6=9D=A5=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6= =9C=AC GnuPG =E4=B8=AD=E7=9A=84=E6=89=80=E6=9C=89=E5=86=85=E5=AE=B9=EF=BC= =8C=E5=9B=A0=E4=B8=BA=E5=AE=83=E5=8F=AF=E8=83=BD=E4=B8=8D=E5=86=8D=E5=81=9A= =E6=AD=A3=E7=A1=AE =E7=9A=84=E4=BA=8B=E6=83=85=E3=80=82 =20 +.. _cn_protect_your_key: + =E4=BF=9D=E6=8A=A4=E4=BD=A0=E7=9A=84 PGP =E5=AF=86=E9=92=A5 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 @@ -173,39 +179,32 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98= =E5=82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5= =AF=86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80= =82=E8=BF=99=E6=A0=B7 =20 $ gpg --quick-addkey [fpr] ed25519 sign =20 -.. note:: GnuPG =E4=B8=AD=E7=9A=84 ECC =E6=94=AF=E6=8C=81 - - =E8=AF=B7=E6=B3=A8=E6=84=8F=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=89= =93=E7=AE=97=E4=BD=BF=E7=94=A8=E4=B8=8D=E6=94=AF=E6=8C=81 ED25519 ECC =E5= =AF=86=E9=92=A5=E7=9A=84=E7=A1=AC=E4=BB=B6=E5=AF=86=E9=92=A5=EF=BC=8C=E5=88= =99 - =E5=BA=94=E9=80=89=E6=8B=A9=E2=80=9Cnistp256=E2=80=9D=E6=88=96=E2=80= =9Ced25519=E2=80=9D=E3=80=82=E8=AF=B7=E5=8F=82=E9=98=85=E4=B8=8B=E9=9D=A2= =E6=9C=89=E5=85=B3=E6=8E=A8=E8=8D=90=E7=A1=AC=E4=BB=B6=E8=AE=BE=E5=A4=87=E7= =9A=84 - =E9=83=A8=E5=88=86=E3=80=82 - - =E5=A4=87=E4=BB=BD=E4=BD=A0=E7=9A=84=E8=AF=81=E4=B9=A6=E5=AF=86=E9=92=A5= =E4=BB=A5=E8=BF=9B=E8=A1=8C=E7=81=BE=E9=9A=BE=E6=81=A2=E5=A4=8D ------------------------------ =20 =E4=BD=A0=E7=9A=84 PGP =E5=AF=86=E9=92=A5=E4=B8=8A=E6=9D=A5=E8=87=AA=E5=85= =B6=E4=BB=96=E5=BC=80=E5=8F=91=E8=80=85=E7=9A=84=E7=AD=BE=E5=90=8D=E8=B6=8A= =E5=A4=9A=EF=BC=8C=E5=87=BA=E4=BA=8E=E7=81=BE=E9=9A=BE=E6=81=A2=E5=A4=8D=E7= =9A=84=E5=8E=9F=E5=9B=A0=EF=BC=8C=E4=BD=A0=E5=B0=B1=E8=B6=8A =E6=9C=89=E7=90=86=E7=94=B1=E5=88=9B=E5=BB=BA=E4=B8=80=E4=B8=AA=E4=BD=8D= =E4=BA=8E=E6=95=B0=E5=AD=97=E5=AA=92=E4=BD=93=E4=B9=8B=E5=A4=96=E7=9A=84=E5= =A4=87=E4=BB=BD=E7=89=88=E6=9C=AC=E3=80=82 =20 -=E5=88=9B=E5=BB=BA=E7=A7=81=E9=92=A5=E7=9A=84=E5=8F=AF=E6=89=93=E5=8D=B0= =E7=A1=AC=E6=8B=B7=E8=B4=9D=E7=9A=84=E6=9C=80=E4=BD=B3=E6=96=B9=E6=B3=95=E6= =98=AF=E4=BD=BF=E7=94=A8 ``paperkey`` =E4=B8=BA=E6=AD=A4=E7=9B=AE=E7=9A=84= =E7=BC=96=E5=86=99 -=E7=9A=84=E8=BD=AF=E4=BB=B6=E3=80=82=E6=9C=89=E5=85=B3=E8=BE=93=E5=87=BA= =E6=A0=BC=E5=BC=8F=E5=8F=8A=E5=85=B6=E7=9B=B8=E5=AF=B9=E4=BA=8E=E5=85=B6=E4= =BB=96=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E7=9A=84=E4=BC=98=E5=8A=BF=E7=9A= =84=E6=9B=B4=E5=A4=9A=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AF=B7= =E5=8F=82 -=E9=98=85 ``paperkey`` =E5=8F=82=E8=80=83=E8=B5=84=E6=96=99=E3=80=82=E5=A4= =A7=E5=A4=9A=E6=95=B0=E5=8F=91=E8=A1=8C=E7=89=88=E9=83=BD=E5=BA=94=E8=AF=A5= =E5=B7=B2=E7=BB=8F=E6=89=93=E5=8C=85=E4=BA=86 Paperkey=E3=80=82 +=E5=88=9B=E5=BB=BA=E7=A7=81=E9=92=A5=E7=9A=84=E5=8F=AF=E6=89=93=E5=8D=B0= =E7=A1=AC=E6=8B=B7=E8=B4=9D=E6=97=B6=EF=BC=8C=E4=B8=80=E4=B8=AA=E5=A5=BD=E6= =96=B9=E6=B3=95=E6=98=AF=E4=BD=BF=E7=94=A8=E4=B8=93=E4=B8=BA=E6=AD=A4=E7=9B= =AE=E7=9A=84=E7=BC=96=E5=86=99=E7=9A=84 +``paperkey`` =E8=BD=AF=E4=BB=B6=E3=80=82=E6=9C=89=E5=85=B3=E8=BE=93=E5=87= =BA=E6=A0=BC=E5=BC=8F=E5=8F=8A=E5=85=B6=E7=9B=B8=E5=AF=B9=E4=BA=8E=E5=85=B6= =E4=BB=96=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E7=9A=84=E4=BC=98=E5=8A=BF=E7= =9A=84=E6=9B=B4=E5=A4=9A +=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AF=B7=E5=8F=82=E9=98=85 `= `paperkey`` =E5=8F=82=E8=80=83=E8=B5=84=E6=96=99=E3=80=82=E5=A4=A7=E5=A4=9A= =E6=95=B0=E5=8F=91=E8=A1=8C=E7=89=88=E9=83=BD=E5=BA=94=E8=AF=A5=E5=B7=B2=E7= =BB=8F=E6=89=93=E5=8C=85=E4=BA=86 +Paperkey=E3=80=82 =20 =E8=BF=90=E8=A1=8C=E4=BB=A5=E4=B8=8B=E5=91=BD=E4=BB=A4=E6=9D=A5=E5=88=9B= =E5=BB=BA=E7=A7=81=E9=92=A5=E7=9A=84=E7=A1=AC=E6=8B=B7=E8=B4=9D=E5=A4=87=E4= =BB=BD:: =20 $ gpg --export-secret-key [fpr] | paperkey -o /tmp/key-backup.txt =20 -=E6=89=93=E5=8D=B0=E5=87=BA=E8=AF=A5=E6=96=87=E4=BB=B6=EF=BC=88=E6=88=96= =E5=B0=86=E8=BE=93=E5=87=BA=E7=9B=B4=E6=8E=A5=E4=BC=A0=E8=BE=93=E5=88=B0 lp= r=EF=BC=89=EF=BC=8C=E7=84=B6=E5=90=8E=E7=94=A8=E7=AC=94=E5=9C=A8=E7=BA=B8= =E7=9A=84=E8=BE=B9=E7=BC=98=E5=86=99=E4=B8=8B=E4=BD=A0=E7=9A=84=E5=AF=86 -=E7=A0=81=E3=80=82 **=E5=BC=BA=E7=83=88=E5=BB=BA=E8=AE=AE=E8=BF=99=E6=A0= =B7=E5=81=9A**=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AF=86=E9=92=A5=E6=89=93=E5=8D= =B0=E8=BE=93=E5=87=BA=E4=BB=8D=E7=84=B6=E4=BD=BF=E7=94=A8=E8=AF=A5=E5=AF=86= =E7=A0=81=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=EF=BC=8C=E5=B9=B6=E4=B8=94 -=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=9B=B4=E6=94=B9=E4=BA=86=E5=AE=83=EF=BC=8C= =E4=BD=A0=E5=B0=86=E4=B8=8D=E8=AE=B0=E5=BE=97=E5=88=9B=E5=BB=BA=E5=A4=87=E4= =BB=BD=E6=97=B6=E5=AE=83=E6=9B=BE=E7=BB=8F=E6=98=AF=E4=BB=80=E4=B9=88 - *= =E4=BF=9D=E8=AF=81*=E3=80=82 +=E6=89=93=E5=8D=B0=E5=87=BA=E8=AF=A5=E6=96=87=E4=BB=B6=EF=BC=8C=E7=84=B6= =E5=90=8E=E7=94=A8=E7=AC=94=E5=9C=A8=E7=BA=B8=E7=9A=84=E8=BE=B9=E7=BC=98=E5= =86=99=E4=B8=8B=E4=BD=A0=E7=9A=84=E5=AF=86=E7=A0=81=E3=80=82 **=E5=BC=BA=E7= =83=88=E5=BB=BA=E8=AE=AE=E8=BF=99=E6=A0=B7=E5=81=9A**=EF=BC=8C=E5=9B=A0 +=E4=B8=BA=E5=AF=86=E9=92=A5=E6=89=93=E5=8D=B0=E8=BE=93=E5=87=BA=E4=BB=8D= =E7=84=B6=E4=BD=BF=E7=94=A8=E8=AF=A5=E5=AF=86=E7=A0=81=E8=BF=9B=E8=A1=8C=E5= =8A=A0=E5=AF=86=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=9B= =B4=E6=94=B9=E4=BA=86=E5=AE=83=EF=BC=8C=E4=BD=A0=E5=B0=86=E4=B8=8D=E8=AE=B0= =E5=BE=97 +=E5=88=9B=E5=BB=BA=E5=A4=87=E4=BB=BD=E6=97=B6=E5=AE=83=E6=9B=BE=E7=BB=8F= =E6=98=AF=E4=BB=80=E4=B9=88 - *=E4=BF=9D=E8=AF=81*=E3=80=82 =20 =E5=B0=86=E7=94=9F=E6=88=90=E7=9A=84=E6=89=93=E5=8D=B0=E8=BE=93=E5=87=BA= =E5=92=8C=E6=89=8B=E5=86=99=E5=AF=86=E7=A0=81=E6=94=BE=E5=85=A5=E4=BF=A1=E5= =B0=81=E4=B8=AD=EF=BC=8C=E5=B9=B6=E5=AD=98=E6=94=BE=E5=9C=A8=E5=AE=89=E5=85= =A8=E4=B8=94=E5=8F=97=E5=88=B0=E8=89=AF=E5=A5=BD=E4=BF=9D=E6=8A=A4=E7=9A=84= =E5=9C=B0 =E6=96=B9=EF=BC=8C=E6=9C=80=E5=A5=BD=E8=BF=9C=E7=A6=BB=E4=BD=A0=E7=9A=84= =E5=AE=B6=EF=BC=8C=E4=BE=8B=E5=A6=82=E9=93=B6=E8=A1=8C=E4=BF=9D=E9=99=A9=E6= =9F=9C=E3=80=82 =20 .. note:: =20 - =E4=BD=A0=E7=9A=84=E6=89=93=E5=8D=B0=E6=9C=BA=E5=8F=AF=E8=83=BD=E4=B8= =8D=E5=86=8D=E6=98=AF=E8=BF=9E=E6=8E=A5=E5=88=B0=E5=B9=B6=E8=A1=8C=E7=AB=AF= =E5=8F=A3=E7=9A=84=E7=AE=80=E5=8D=95=E5=93=91=E8=AE=BE=E5=A4=87=EF=BC=8C=E4= =BD=86=E7=94=B1=E4=BA=8E=E8=BE=93=E5=87=BA=E4=BB=8D=E7=84=B6=E4=BD=BF - =E7=94=A8=E4=BD=A0=E7=9A=84=E5=AF=86=E7=A0=81=E8=BF=9B=E8=A1=8C=E5=8A= =A0=E5=AF=86=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=8D=B3=E4=BD=BF=E2=80=9C=E4=BA=91= =E7=AB=AF=E6=89=93=E5=8D=B0=E2=80=9D=E7=9A=84=E7=8E=B0=E4=BB=A3=E6=89=93=E5= =8D=B0=E6=9C=BA=E4=B9=9F=E5=BA=94=E8=AF=A5=E4=BF=9D=E6=8C=81=E7=9B=B8 - =E5=AF=B9=E5=AE=89=E5=85=A8=E7=9A=84=E6=93=8D=E4=BD=9C + =E5=AF=86=E9=92=A5=E4=BB=8D=E7=84=B6=E4=BD=BF=E7=94=A8=E4=BD=A0=E7=9A= =84=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=8D=B3= =E4=BD=BF=E4=BD=BF=E7=94=A8=E4=B8=8E=E2=80=9C=E4=BA=91=E9=9B=86=E6=88=90=E7= =9A=84=E2=80=9D=E7=8E=B0=E4=BB=A3=E6=89=93=E5=8D=B0=E6=9C=BA=EF=BC=8C + =E6=89=93=E5=8D=B0=E4=B9=9F=E5=BA=94=E8=AF=A5=E4=BB=8D=E6=98=AF=E4=B8= =80=E9=A1=B9=E7=9B=B8=E5=AF=B9=E5=AE=89=E5=85=A8=E7=9A=84=E6=93=8D=E4=BD=9C= =E3=80=82 =20 =E5=A4=87=E4=BB=BD=E6=95=B4=E4=B8=AA GnuPG =E7=9B=AE=E5=BD=95 ------------------- @@ -219,13 +218,12 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98= =E5=82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5= =AF=86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80= =82=E8=BF=99=E6=A0=B7 =E4=BE=8B=E5=A6=82=E5=9C=A8=E4=BC=9A=E8=AE=AE=E5=92=8C=E5=B3=B0=E4=BC=9A= =E5=90=8E=E6=9B=B4=E6=94=B9=E4=BD=A0=E8=87=AA=E5=B7=B1=E7=9A=84=E5=AF=86=E9= =92=A5=E6=88=96=E7=AD=BE=E7=BD=B2=E5=85=B6=E4=BB=96=E4=BA=BA=E7=9A=84=E5=AF= =86=E9=92=A5=E6=97=B6=EF=BC=8C=E4=BD=A0=E8=BF=98=E5=B0=86=E4=BE=9D=E8=B5=96 =E8=BF=99=E4=BA=9B=E5=A4=96=E9=83=A8=E5=89=AF=E6=9C=AC=E3=80=82 =20 -=E9=A6=96=E5=85=88=E8=8E=B7=E5=8F=96=E4=B8=80=E4=B8=AA=E5=B0=8F=E5=9E=8B U= SB =E2=80=9C=E6=8B=87=E6=8C=87=E2=80=9D =E9=A9=B1=E5=8A=A8=E5=99=A8=EF=BC= =88=E6=9C=80=E5=A5=BD=E6=98=AF=E4=B8=A4=E4=B8=AA=EF=BC=81=EF=BC=89=EF=BC=8C= =E7=94=A8=E4=BA=8E=E5=A4=87=E4=BB=BD=E7=9B=AE=E7=9A=84=E3=80=82 -=E4=BD=A0=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8 LUKS =E5=AF=B9=E5=85=B6=E8= =BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E2=80=94=E2=80=94=E8=AF=B7=E5=8F=82=E9=98= =85=E4=BD=A0=E7=9A=84=E5=8F=91=E8=A1=8C=E7=89=88=E6=96=87=E6=A1=A3=E4=BB=A5= =E4=BA=86=E8=A7=A3=E5=A6=82=E4=BD=95=E5=AE=8C=E6=88=90 -=E6=AD=A4=E6=93=8D=E4=BD=9C=E3=80=82 +=E9=A6=96=E5=85=88=E5=87=86=E5=A4=87=E4=B8=80=E4=B8=AA=E5=A4=96=E9=83=A8= =E5=AD=98=E5=82=A8=E4=BB=8B=E8=B4=A8=EF=BC=88=E6=9C=80=E5=A5=BD=E5=87=86=E5= =A4=87=E4=B8=A4=E4=B8=AA=EF=BC=81=EF=BC=89=E7=94=A8=E4=BA=8E=E5=A4=87=E4=BB= =BD=E3=80=82=E4=BD=A0=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8 LUKS +=E5=9C=A8=E8=AF=A5=E8=AE=BE=E5=A4=87=E4=B8=8A=E5=88=9B=E5=BB=BA=E5=8A=A0= =E5=AF=86=E5=88=86=E5=8C=BA=E2=80=94=E2=80=94=E8=AF=B7=E5=8F=82=E9=98=85=E4= =BD=A0=E7=9A=84=E5=8F=91=E8=A1=8C=E7=89=88=E6=96=87=E6=A1=A3=E4=BB=A5=E4=BA= =86=E8=A7=A3=E5=A6=82=E4=BD=95=E5=AE=8C=E6=88=90=E6=AD=A4=E6=93=8D=E4=BD=9C= =E3=80=82 =20 =E5=AF=B9=E4=BA=8E=E5=8A=A0=E5=AF=86=E5=AF=86=E7=A0=81=EF=BC=8C=E4=BD=A0= =E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E4=B8=8E PGP =E5=AF=86=E9=92=A5=E7=9B= =B8=E5=90=8C=E7=9A=84=E5=AF=86=E7=A0=81=E3=80=82 =20 -=E5=8A=A0=E5=AF=86=E8=BF=87=E7=A8=8B=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C= =E9=87=8D=E6=96=B0=E6=8F=92=E5=85=A5 USB =E9=A9=B1=E5=8A=A8=E5=99=A8=E5=B9= =B6=E7=A1=AE=E4=BF=9D=E5=85=B6=E6=AD=A3=E7=A1=AE=E5=AE=89=E8=A3=85=E3=80=82= =E5=B0=86=E6=95=B4=E4=B8=AA ``.gnupg`` +=E5=8A=A0=E5=AF=86=E8=BF=87=E7=A8=8B=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C= =E9=87=8D=E6=96=B0=E6=8F=92=E5=85=A5=E8=AE=BE=E5=A4=87=E5=B9=B6=E7=A1=AE=E4= =BF=9D=E5=85=B6=E6=AD=A3=E7=A1=AE=E6=8C=82=E8=BD=BD=E3=80=82=E5=B0=86=E6=95= =B4=E4=B8=AA ``.gnupg`` =E7=9B=AE=E5=BD=95=E5=A4=8D=E5=88=B6=E5=88=B0=E5=8A=A0=E5=AF=86=E5=AD=98= =E5=82=A8:: =20 $ cp -a ~/.gnupg /media/disk/foo/gnupg-backup @@ -234,10 +232,9 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98=E5= =82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5=AF= =86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80=82= =E8=BF=99=E6=A0=B7 =20 $ gpg --homedir=3D/media/disk/foo/gnupg-backup --list-key [fpr] =20 -=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=87=BA=E7=8E=B0=E4=BB=BB=E4=BD=95= =E9=94=99=E8=AF=AF=EF=BC=8C=E9=82=A3=E4=B9=88=E5=B0=B1=E5=8F=AF=E4=BB=A5=E5= =BC=80=E5=A7=8B=E4=BA=86=E3=80=82=E5=8D=B8=E4=B8=8B USB =E9=A9=B1=E5=8A=A8= =E5=99=A8=EF=BC=8C=E7=BB=99=E5=AE=83=E8=B4=B4=E4=B8=8A -=E6=98=8E=E6=98=BE=E7=9A=84=E6=A0=87=E7=AD=BE=EF=BC=8C=E8=BF=99=E6=A0=B7= =E4=B8=8B=E6=AC=A1=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8=E9=9A=8F=E6=9C=BA US= B =E9=A9=B1=E5=8A=A8=E5=99=A8=E6=97=B6=E5=B0=B1=E4=B8=8D=E4=BC=9A=E6=8A=8A= =E5=AE=83=E5=90=B9=E8=B5=B0=EF=BC=8C=E7=84=B6=E5=90=8E -=E6=94=BE=E5=9C=A8=E5=AE=89=E5=85=A8=E7=9A=84=E5=9C=B0=E6=96=B9 - =E4=BD= =86=E4=B8=8D=E8=A6=81=E5=A4=AA=E8=BF=9C=EF=BC=8C=E5=9B=A0=E4=B8=BA=E4=BD=A0= =E6=AF=8F=E6=AC=A1=E9=83=BD=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8=E5=AE=83=E6= =97=B6=E4=B8=8D=E6=97=B6=E5=9C=B0=E7=94=A8=E4=BA=8E=E8=AF=B8 -=E5=A6=82=E7=BC=96=E8=BE=91=E8=BA=AB=E4=BB=BD=E3=80=81=E6=B7=BB=E5=8A=A0= =E6=88=96=E6=92=A4=E9=94=80=E5=AD=90=E5=AF=86=E9=92=A5=E6=88=96=E7=AD=BE=E7= =BD=B2=E5=85=B6=E4=BB=96=E4=BA=BA=E7=9A=84=E5=AF=86=E9=92=A5=E4=B9=8B=E7=B1= =BB=E7=9A=84=E4=BA=8B=E6=83=85=E3=80=82 +=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=87=BA=E7=8E=B0=E4=BB=BB=E4=BD=95= =E9=94=99=E8=AF=AF=EF=BC=8C=E9=82=A3=E4=B9=88=E5=B0=B1=E5=8F=AF=E4=BB=A5=E4= =BD=BF=E7=94=A8=E4=BA=86=E3=80=82=E5=8D=B8=E8=BD=BD=E8=AE=BE=E5=A4=87=EF=BC= =8C=E7=BB=99=E5=AE=83=E8=B4=B4=E4=B8=8A=E6=98=8E=E6=98=BE=E7=9A=84=E6=A0=87= =E7=AD=BE=EF=BC=8C +=E4=BB=A5=E5=85=8D=E6=84=8F=E5=A4=96=E8=A6=86=E7=9B=96=EF=BC=8C=E7=84=B6= =E5=90=8E=E6=94=BE=E5=9C=A8=E5=AE=89=E5=85=A8=E7=9A=84=E5=9C=B0=E6=96=B9=E2= =80=94=E2=80=94=E4=BD=86=E4=B8=8D=E8=A6=81=E5=A4=AA=E8=BF=9C=EF=BC=8C=E5=9B= =A0=E4=B8=BA=E4=BD=A0=E5=81=B6=E5=B0=94=E8=BF=98=E9=9C=80=E8=A6=81=E7=94=A8= =E5=AE=83 +=E7=BC=96=E8=BE=91=E8=BA=AB=E4=BB=BD=E3=80=81=E6=B7=BB=E5=8A=A0=E6=88=96= =E6=92=A4=E9=94=80=E5=AD=90=E5=AF=86=E9=92=A5=EF=BC=8C=E6=88=96=E7=AD=BE=E7= =BD=B2=E5=85=B6=E4=BB=96=E4=BA=BA=E7=9A=84=E5=AF=86=E9=92=A5=E3=80=82 =20 =E4=BB=8E=E4=BD=A0=E7=9A=84 homedir =E4=B8=AD=E5=88=A0=E9=99=A4 Certify = =E5=AF=86=E9=92=A5 ---------------------------------- @@ -260,7 +257,7 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98=E5= =82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5=AF= =86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80=82= =E8=BF=99=E6=A0=B7 =E8=AF=B7=E5=8F=82=E9=98=85=E4=B8=8A=E4=B8=80=E8=8A=82=E5=B9=B6=E7=A1= =AE=E4=BF=9D=E4=BD=A0=E5=B7=B2=E5=AE=8C=E6=95=B4=E5=A4=87=E4=BB=BD GnuPG = =E7=9B=AE=E5=BD=95=E3=80=82=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=B2=A1=E6=9C=89=E5= =8F=AF=E7=94=A8=E7=9A=84 =E5=A4=87=E4=BB=BD=EF=BC=8C=E6=88=91=E4=BB=AC=E8=A6=81=E5=81=9A=E7=9A= =84=E4=BA=8B=E6=83=85=E5=B0=86=E4=BD=BF=E4=BD=A0=E7=9A=84=E5=AF=86=E9=92=A5= =E6=AF=AB=E6=97=A0=E7=94=A8=E5=A4=84=EF=BC=81 =20 -=E9=A6=96=E5=85=88=EF=BC=8C=E7=A1=AE=E5=AE=9A=E4=BD=A0=E7=9A=84=E8=AF=81= =E4=B9=A6=E5=AF=86=E9=92=A5=E7=9A=84keygrip:: +=E9=A6=96=E5=85=88=EF=BC=8C=E7=A1=AE=E5=AE=9A=E4=BD=A0=E7=9A=84=E8=AF=81= =E4=B9=A6=E5=AF=86=E9=92=A5=E7=9A=84=E2=80=9Ckeygrip=E2=80=9D:: =20 $ gpg --with-keygrip --list-key [fpr] =20 @@ -284,7 +281,7 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98=E5= =82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5=AF= =86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80=82= =E8=BF=99=E6=A0=B7 2222000000000000000000000000000000000000.key 3333000000000000000000000000000000000000.key =20 -=E4=BD=A0=E6=89=80=E8=A6=81=E5=81=9A=E7=9A=84=E5=8F=AA=E6=98=AF=E5=88=A0= =E9=99=A4=E4=B8=8E=E8=AF=81=E4=B9=A6=E5=AF=86=E9=92=A5 keygrip =E5=AF=B9=E5= =BA=94=E7=9A=84 .key =E6=96=87=E4=BB=B6:: +=E5=8F=AA=E9=9C=80=E5=88=A0=E9=99=A4=E4=B8=8E=E8=AF=81=E4=B9=A6=E5=AF=86= =E9=92=A5 keygrip =E5=AF=B9=E5=BA=94=E7=9A=84 .key =E6=96=87=E4=BB=B6:: =20 $ cd ~/.gnupg/private-keys-v1.d $ rm 1111000000000000000000000000000000000000.key @@ -313,6 +310,7 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98=E5= =82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5=AF= =86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80=82= =E8=BF=99=E6=A0=B7 =E5=AE=8C=E6=88=90=E6=AD=A4=E6=93=8D=E4=BD=9C=E5=90=8E=EF=BC=8C=E8=AF=B7= =E7=A1=AE=E4=BF=9D=E5=88=A0=E9=99=A4=E8=BF=87=E6=97=B6=E7=9A=84 ``secring.g= pg`` =E6=96=87=E4=BB=B6=EF=BC=8C=E5=85=B6=E4=B8=AD=E4=BB=8D=E7=84=B6=E5=8C= =85=E5=90=AB=E4=BD=A0 =E7=9A=84=E7=A7=81=E9=92=A5=E3=80=82 =20 +.. _cn_smartcards: =20 =E5=B0=86=E5=AD=90=E5=AF=86=E9=92=A5=E7=A7=BB=E8=87=B3=E4=B8=93=E7=94=A8= =E5=8A=A0=E5=AF=86=E8=AE=BE=E5=A4=87 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -322,17 +320,17 @@ GnuPG =E5=9C=A8=E5=B0=86=E7=A7=81=E9=92=A5=E5=AD=98= =E5=82=A8=E5=88=B0=E7=A3=81=E7=9B=98=E4=B9=8B=E5=89=8D=E4=BD=BF=E7=94=A8=E5= =AF=86=E7=A0=81=E5=AF=B9=E5=85=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E3=80= =82=E8=BF=99=E6=A0=B7 =E9=81=93=E5=AF=86=E7=A0=81=EF=BC=89=E3=80=82=E6=AD=A4=E5=A4=96=EF=BC=8C= =E6=AF=8F=E6=AC=A1=E6=89=A7=E8=A1=8C GnuPG =E6=93=8D=E4=BD=9C=E6=97=B6=EF= =BC=8C=E5=AF=86=E9=92=A5=E9=83=BD=E4=BC=9A=E5=8A=A0=E8=BD=BD=E5=88=B0=E7=B3= =BB=E7=BB=9F=E5=86=85=E5=AD=98=E4=B8=AD=EF=BC=8C=E5=B9=B6 =E5=8F=AF=E8=83=BD=E8=A2=AB=E8=B6=B3=E5=A4=9F=E9=AB=98=E7=BA=A7=E7=9A=84= =E6=81=B6=E6=84=8F=E8=BD=AF=E4=BB=B6=EF=BC=88=E4=BE=8B=E5=A6=82 Meltdown = =E5=92=8C Spectre=EF=BC=89=E4=BB=8E=E9=82=A3=E9=87=8C=E7=AA=83=E5=8F=96=E3= =80=82 =20 -=E5=AE=8C=E5=85=A8=E4=BF=9D=E6=8A=A4=E5=AF=86=E9=92=A5=E7=9A=84=E6=9C=80= =E4=BD=B3=E6=96=B9=E6=B3=95=E6=98=AF=E5=B0=86=E5=AE=83=E4=BB=AC=E8=BD=AC=E7= =A7=BB=E5=88=B0=E8=83=BD=E5=A4=9F=E8=BF=9B=E8=A1=8C=E6=99=BA=E8=83=BD=E5=8D= =A1=E6=93=8D=E4=BD=9C=E7=9A=84=E4=B8=93=E7=94=A8=E7=A1=AC=E4=BB=B6=E8=AE=BE= =E5=A4=87=E4=B8=8A=E3=80=82 +=E5=AE=8C=E5=85=A8=E4=BF=9D=E6=8A=A4=E5=AF=86=E9=92=A5=E7=9A=84=E4=B8=80= =E4=B8=AA=E5=A5=BD=E6=96=B9=E6=B3=95=E6=98=AF=E5=B0=86=E5=AE=83=E4=BB=AC=E8= =BD=AC=E7=A7=BB=E5=88=B0=E8=83=BD=E5=A4=9F=E8=BF=9B=E8=A1=8C=E6=99=BA=E8=83= =BD=E5=8D=A1=E6=93=8D=E4=BD=9C=E7=9A=84=E4=B8=93=E7=94=A8=E7=A1=AC=E4=BB=B6= =E8=AE=BE=E5=A4=87=E4=B8=8A=E3=80=82 =20 =E6=99=BA=E8=83=BD=E5=8D=A1=E7=9A=84=E5=A5=BD=E5=A4=84 ------------ =20 =E6=99=BA=E8=83=BD=E5=8D=A1=E5=8C=85=E5=90=AB=E4=B8=80=E4=B8=AA=E5=8A=A0= =E5=AF=86=E8=8A=AF=E7=89=87=EF=BC=8C=E8=83=BD=E5=A4=9F=E5=AD=98=E5=82=A8=E7= =A7=81=E9=92=A5=E5=B9=B6=E7=9B=B4=E6=8E=A5=E5=9C=A8=E5=8D=A1=E6=9C=AC=E8=BA= =AB=E4=B8=8A=E6=89=A7=E8=A1=8C=E5=8A=A0=E5=AF=86=E6=93=8D=E4=BD=9C=E3=80=82= =E7=94=B1=E4=BA=8E =E5=AF=86=E9=92=A5=E5=86=85=E5=AE=B9=E6=B0=B8=E8=BF=9C=E4=B8=8D=E4=BC=9A= =E7=A6=BB=E5=BC=80=E6=99=BA=E8=83=BD=E5=8D=A1=EF=BC=8C=E5=9B=A0=E6=AD=A4=E6= =8F=92=E5=85=A5=E7=A1=AC=E4=BB=B6=E8=AE=BE=E5=A4=87=E7=9A=84=E8=AE=A1=E7=AE= =97=E6=9C=BA=E7=9A=84=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E6=97=A0=E6=B3=95= =E8=87=AA=E8=A1=8C -=E6=A3=80=E7=B4=A2=E7=A7=81=E9=92=A5=E3=80=82=E8=BF=99=E4=B8=8E=E6=88=91= =E4=BB=AC=E4=B9=8B=E5=89=8D=E7=94=A8=E4=BA=8E=E5=A4=87=E4=BB=BD=E7=9B=AE=E7= =9A=84=E7=9A=84=E5=8A=A0=E5=AF=86 USB =E5=AD=98=E5=82=A8=E8=AE=BE=E5=A4=87= =E6=9C=89=E5=BE=88=E5=A4=A7=E4=B8=8D=E5=90=8C=E2=80=94=E2=80=94=E5=BD=93 -USB =E8=AE=BE=E5=A4=87=E6=8F=92=E5=85=A5=E5=B9=B6=E5=AE=89=E8=A3=85=E6=97= =B6=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E8=83=BD=E5=A4=9F=E8=AE=BF= =E9=97=AE=E7=A7=81=E9=92=A5=E5=86=85=E5=AE=B9=E3=80=82 +=E6=A3=80=E7=B4=A2=E7=A7=81=E9=92=A5=E3=80=82=E8=BF=99=E4=B8=8E=E6=88=91= =E4=BB=AC=E4=B9=8B=E5=89=8D=E7=94=A8=E4=BA=8E=E5=A4=87=E4=BB=BD=E7=9B=AE=E7= =9A=84=E7=9A=84=E5=8A=A0=E5=AF=86=E4=BB=8B=E8=B4=A8=E5=AD=98=E5=82=A8=E8=AE= =BE=E5=A4=87=E6=9C=89=E5=BE=88=E5=A4=A7=E4=B8=8D=E5=90=8C=E2=80=94=E2=80=94= =E5=BD=93=E8=AF=A5 +=E8=AE=BE=E5=A4=87=E6=8F=92=E5=85=A5=E5=B9=B6=E6=8C=82=E8=BD=BD=E6=97=B6= =EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E8=83=BD=E5=A4=9F=E8=AE=BF=E9= =97=AE=E7=A7=81=E9=92=A5=E5=86=85=E5=AE=B9=E3=80=82 =20 -=E4=BD=BF=E7=94=A8=E5=A4=96=E9=83=A8=E5=8A=A0=E5=AF=86 USB =E4=BB=8B=E8=B4= =A8=E5=B9=B6=E4=B8=8D=E8=83=BD=E6=9B=BF=E4=BB=A3=E5=85=B7=E6=9C=89=E6=99=BA= =E8=83=BD=E5=8D=A1=E5=8A=9F=E8=83=BD=E7=9A=84=E8=AE=BE=E5=A4=87=E3=80=82 +=E4=BD=BF=E7=94=A8=E5=A4=96=E9=83=A8=E5=8A=A0=E5=AF=86=E4=BB=8B=E8=B4=A8= =E5=B9=B6=E4=B8=8D=E8=83=BD=E6=9B=BF=E4=BB=A3=E5=85=B7=E6=9C=89=E6=99=BA=E8= =83=BD=E5=8D=A1=E5=8A=9F=E8=83=BD=E7=9A=84=E8=AE=BE=E5=A4=87=E3=80=82 =20 =E5=8F=AF=E7=94=A8=E7=9A=84=E6=99=BA=E8=83=BD=E5=8D=A1=E8=AE=BE=E5=A4=87 ---------------- @@ -340,14 +338,13 @@ USB =E8=AE=BE=E5=A4=87=E6=8F=92=E5=85=A5=E5=B9=B6=E5= =AE=89=E8=A3=85=E6=97=B6=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E8=83= =BD=E5=A4=9F=E8=AE=BF=E9=97=AE=E7=A7=81=E9=92=A5=E5=86=85=E5=AE=B9=E3=80=82 =E9=99=A4=E9=9D=9E=E4=BD=A0=E7=9A=84=E6=89=80=E6=9C=89=E7=AC=94=E8=AE=B0= =E6=9C=AC=E7=94=B5=E8=84=91=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=AB=99=E9=83=BD=E6= =9C=89=E6=99=BA=E8=83=BD=E5=8D=A1=E8=AF=BB=E5=8D=A1=E5=99=A8=EF=BC=8C=E5=90= =A6=E5=88=99=E6=9C=80=E7=AE=80=E5=8D=95=E7=9A=84=E6=96=B9=E6=B3=95=E6=98=AF= =E8=8E=B7 =E5=8F=96=E5=AE=9E=E7=8E=B0=E6=99=BA=E8=83=BD=E5=8D=A1=E5=8A=9F=E8=83=BD= =E7=9A=84=E4=B8=93=E7=94=A8 USB =E8=AE=BE=E5=A4=87=E3=80=82=E6=9C=89=E5=A4= =9A=E7=A7=8D=E9=80=89=E6=8B=A9=EF=BC=9A: =20 -- `Nitrokey Start`_: =E5=BC=80=E6=94=BE=E7=A1=AC=E4=BB=B6=E5=92=8C=E5=85= =8D=E8=B4=B9=E8=BD=AF=E4=BB=B6=EF=BC=8C=E6=97=A5=E6=9C=AC=E5=9F=BA=E4=BA=8E= FSI=E7=9A=84 `Gnuk` =E3=80=82 - =E5=B0=91=E6=95=B0=E6=94=AF=E6=8C=81 ED25519 ECC =E5=AF=86=E9=92=A5=E7= =9A=84=E5=95=86=E7=94=A8=E8=AE=BE=E5=A4=87=E4=B9=8B=E4=B8=80=EF=BC=8C=E4=BD= =86=E6=8F=90=E4=BE=9B=E7=9A=84=E5=AE=89=E5=85=A8=E5=8A=9F=E8=83=BD=E6=9C=80= =E5=B0=91 - =EF=BC=88=E4=BE=8B=E5=A6=82=E9=98=B2=E7=AF=A1=E6=94=B9=E6=88=96=E6=9F=90= =E4=BA=9B=E6=97=81=E8=B7=AF=E6=94=BB=E5=87=BB=EF=BC=89=E3=80=82 -- `Nitrokey Pro 2`_: =E4=B8=8E Nitrokey Start =E7=B1=BB=E4=BC=BC=EF=BC=8C= =E4=BD=86=E6=9B=B4=E9=98=B2=E7=AF=A1=E6=94=B9=E5=B9=B6=E6=8F=90=E4=BE=9B - =E6=9B=B4=E5=A4=9A=E5=AE=89=E5=85=A8=E5=8A=9F=E8=83=BD=E3=80=82Pro 2 =E6= =94=AF=E6=8C=81 ECC =E5=8A=A0=E5=AF=86 (NISTP)=E3=80=82 -- `Yubikey 5`_: =E4=B8=93=E6=9C=89=E7=A1=AC=E4=BB=B6=E5=92=8C=E8=BD=AF=E4= =BB=B6=EF=BC=8C=E4=BD=86=E6=AF=94 Nitrokey Pro =E4=BE=BF=E5=AE=9C=EF=BC=8C= =E5=B9=B6=E4=B8=94=E4=BB=A5 - USB-C =E5=BD=A2=E5=BC=8F=E6=8F=90=E4=BE=9B=EF=BC=8C=E5=AF=B9=E4=BA=8E=E8= =BE=83=E6=96=B0=E7=9A=84=E7=AC=94=E8=AE=B0=E6=9C=AC=E7=94=B5=E8=84=91=E6=9B= =B4=E6=9C=89=E7=94=A8=E3=80=82=E6=8F=90=E4=BE=9B=E9=A2=9D=E5=A4=96=E7=9A=84= =E5=AE=89=E5=85=A8=E5=8A=9F=E8=83=BD=EF=BC=8C - =E4=BE=8B=E5=A6=82 FIDO U2F =E7=AD=89=EF=BC=8C=E7=8E=B0=E5=9C=A8=E7=BB= =88=E4=BA=8E=E6=94=AF=E6=8C=81 NISTP =E5=92=8C ED25519 ECC =E5=AF=86=E9=92= =A5=E3=80=82 +- `Nitrokey Start`_: =E5=BC=80=E6=94=BE=E7=A1=AC=E4=BB=B6=E5=92=8C=E8=87= =AA=E7=94=B1=E8=BD=AF=E4=BB=B6=EF=BC=8C=E5=9F=BA=E4=BA=8E=E6=97=A5=E6=9C=AC= FSI =E7=9A=84 `Gnuk`_=E3=80=82 + =E5=AE=83=E6=98=AF=E6=9C=80=E4=BE=BF=E5=AE=9C=E7=9A=84=E9=80=89=E6=8B=A9= =E4=B9=8B=E4=B8=80=EF=BC=8C=E4=BD=86=E6=8F=90=E4=BE=9B=E7=9A=84=E5=AE=89=E5= =85=A8=E5=8A=9F=E8=83=BD=E6=9C=80=E5=B0=91=EF=BC=88=E4=BE=8B=E5=A6=82=E9=98= =B2=E7=AF=A1=E6=94=B9=E6=88=96=E6=8A=B5=E5=BE=A1=E6=9F=90=E4=BA=9B + =E4=BE=A7=E4=BF=A1=E9=81=93=E6=94=BB=E5=87=BB=E7=9A=84=E8=83=BD=E5=8A=9B= =EF=BC=89=E3=80=82 +- `Nitrokey 3`_: =E4=B8=8E Nitrokey Start =E7=B1=BB=E4=BC=BC=EF=BC=8C=E4= =BD=86=E6=8A=97=E7=AF=A1=E6=94=B9=E8=83=BD=E5=8A=9B=E6=9B=B4=E5=BC=BA=EF=BC= =8C=E6=8F=90=E4=BE=9B=E6=9B=B4=E5=A4=9A + =E5=AE=89=E5=85=A8=E5=8A=9F=E8=83=BD=E5=92=8C USB =E5=A4=96=E5=BD=A2=E8= =A7=84=E6=A0=BC=E3=80=82=E6=94=AF=E6=8C=81 ECC =E5=AF=86=E7=A0=81=E5=AD=A6= =EF=BC=88ED25519 =E5=92=8C NISTP=EF=BC=89=E3=80=82 +- `Yubikey 5`_: =E4=B8=93=E6=9C=89=E7=A1=AC=E4=BB=B6=E5=92=8C=E8=BD=AF=E4= =BB=B6=EF=BC=8C=E4=BD=86=E6=AF=94 Nitrokey =E4=BE=BF=E5=AE=9C=EF=BC=8C=E5= =8A=9F=E8=83=BD=E9=9B=86=E4=B8=8E=E5=85=B6=E7=B1=BB=E4=BC=BC=E3=80=82 + =E6=94=AF=E6=8C=81 ECC =E5=AF=86=E7=A0=81=E5=AD=A6=EF=BC=88ED25519 =E5= =92=8C NISTP=EF=BC=89=E3=80=82 =20 =E4=BD=A0=E7=9A=84=E9=80=89=E6=8B=A9=E5=B0=86=E5=8F=96=E5=86=B3=E4=BA=8E= =E6=88=90=E6=9C=AC=E3=80=81=E4=BD=A0=E6=89=80=E5=9C=A8=E5=9C=B0=E7=90=86=E5= =8C=BA=E5=9F=9F=E7=9A=84=E8=B4=A7=E8=BF=90=E4=BE=BF=E5=88=A9=E6=80=A7=E4=BB= =A5=E5=8F=8A=E5=BC=80=E6=94=BE/=E4=B8=93=E6=9C=89=E7=A1=AC=E4=BB=B6=E8=80= =83=E8=99=91 =E5=9B=A0=E7=B4=A0=E3=80=82 @@ -357,8 +354,8 @@ USB =E8=AE=BE=E5=A4=87=E6=8F=92=E5=85=A5=E5=B9=B6=E5=AE= =89=E8=A3=85=E6=97=B6=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E8=83=BD= =E5=A4=9F=E8=AE=BF=E9=97=AE=E7=A7=81=E9=92=A5=E5=86=85=E5=AE=B9=E3=80=82 =E5=A6=82=E6=9E=9C=E4=BD=A0=E4=BD=8D=E5=88=97=E4=BA=8E MAINTAINERS =E4= =B8=AD=E6=88=96=E5=9C=A8 kernel.org =E4=B8=8A=E6=8B=A5=E6=9C=89=E5=B8=90=E6= =88=B7=EF=BC=8C=E5=88=99=E4=BD=A0=E6=9C=89 =E8=B5=84=E6=A0=BC=E8=8E=B7=E5=BE=97Linux =E5=9F=BA=E9=87=91=E4=BC=9A= =E6=8F=90=E4=BE=9B=E7=9A=84_`qualify for a free Nitrokey Start` =E3=80=82 =20 -.. _`Nitrokey Start`: https://shop.nitrokey.com/shop/product/nitrokey-star= t-6 -.. _`Nitrokey Pro 2`: https://shop.nitrokey.com/shop/product/nkpr2-nitroke= y-pro-2-3 +.. _`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-d= igital-tokens-for-kernel-developers.html @@ -529,7 +526,7 @@ USB =E8=AE=BE=E5=A4=87=E6=8F=92=E5=85=A5=E5=B9=B6=E5=AE= =89=E8=A3=85=E6=97=B6=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E8=83=BD= =E5=A4=9F=E8=AE=BF=E9=97=AE=E7=A7=81=E9=92=A5=E5=86=85=E5=AE=B9=E3=80=82 =E5=A6=82=E6=9E=9C=E6=9B=B4=E5=AE=B9=E6=98=93=E8=AE=B0=E4=BD=8F=EF=BC=8C= =E4=BD=A0=E4=B9=9F=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E7=89=B9=E5=AE=9A=E6= =97=A5=E6=9C=9F=EF=BC=88=E4=BE=8B=E5=A6=82=E4=BD=A0=E7=9A=84=E7=94=9F=E6=97= =A5=E3=80=811 =E6=9C=88 1 =E6=97=A5=E6=88=96=E5=8A=A0=E6=8B=BF=E5=A4=A7 =E5=9B=BD=E5=BA=86=E6=97=A5=EF=BC=89:: =20 - $ gpg --quick-set-expire [fpr] 2025-07-01 + $ gpg --quick-set-expire [fpr] 2038-07-01 =20 =E8=AF=B7=E8=AE=B0=E4=BD=8F=E5=B0=86=E6=9B=B4=E6=96=B0=E5=90=8E=E7=9A=84= =E5=AF=86=E9=92=A5=E5=8F=91=E9=80=81=E5=9B=9E=E5=AF=86=E9=92=A5=E6=9C=8D=E5= =8A=A1=E5=99=A8:: =20 @@ -558,6 +555,8 @@ gpg-agent=E3=80=82 =20 .. _`Agent=E9=80=9A=E8=BF=87SSH=E8=BD=AC=E5=8F=91`: https://wiki.gnupg.org= /AgentForwarding =20 +.. _cn_pgp_with_git: + =E5=B0=86 PGP =E4=B8=8E Git =E7=BB=93=E5=90=88=E4=BD=BF=E7=94=A8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 @@ -565,8 +564,8 @@ Git =E7=9A=84=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E4=B9= =8B=E4=B8=80=E6=98=AF=E5=AE=83=E7=9A=84=E5=88=86=E6=95=A3=E6=80=A7=E2=80=94= =E2=80=94=E4=B8=80=E6=97=A6=E5=B0=86=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86=E5= =88=B0=E4=BD=A0=E7=9A=84 =E9=A1=B9=E7=9B=AE=E7=9A=84=E5=AE=8C=E6=95=B4=E5=8E=86=E5=8F=B2=E8=AE=B0= =E5=BD=95=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=85=B6=E6=89=80=E6=9C=89=E6=A0=87=E7= =AD=BE=E3=80=81=E6=8F=90=E4=BA=A4=E5=92=8C=E5=88=86=E6=94=AF=E3=80=82=E7=84= =B6=E8=80=8C=EF=BC=8C=E9=9A=8F=E7=9D=80=E6=95=B0=E7=99=BE=E4=B8=AA=E5=85=8B= =E9=9A=86=E4=BB=93 =E5=BA=93=E7=9A=84=E5=87=BA=E7=8E=B0=EF=BC=8C=E4=BA=BA=E4=BB=AC=E5=A6=82= =E4=BD=95=E9=AA=8C=E8=AF=81=E4=BB=96=E4=BB=AC=E7=9A=84 linux.git =E5=89=AF= =E6=9C=AC=E6=B2=A1=E6=9C=89=E8=A2=AB=E6=81=B6=E6=84=8F=E7=AC=AC=E4=B8=89=E6= =96=B9=E7=AF=A1=E6=94=B9=EF=BC=9F =20 -=E6=88=96=E8=80=85=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9C=A8=E4=BB=A3=E7=A0=81= =E4=B8=AD=E5=8F=91=E7=8E=B0=E5=90=8E=E9=97=A8=EF=BC=8C=E5=B9=B6=E4=B8=94=E6= =8F=90=E4=BA=A4=E4=B8=AD=E7=9A=84=E2=80=9CAuthor=E2=80=9D=E8=A1=8C=E8=A1=A8= =E7=A4=BA=E5=AE=83=E6=98=AF=E7=94=B1=E4=BD=A0=E5=AE=8C=E6=88=90=E7=9A=84=EF= =BC=8C -=E8=80=8C=E4=BD=A0=E9=9D=9E=E5=B8=B8=E7=A1=AE=E5=AE=9A `=E8=87=AA=E5=B7=B1= =E4=B8=8E=E5=AE=83=E6=97=A0=E5=85=B3`_ =EF=BC=8C=E4=BC=9A=E5=8F=91=E7=94=9F= =E4=BB=80=E4=B9=88=EF=BC=9F +=E6=88=96=E8=80=85=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9C=A8=E5=86=85=E6=A0=B8= =E4=B8=AD=E5=8F=91=E7=8E=B0=E6=81=B6=E6=84=8F=E4=BB=A3=E7=A0=81=EF=BC=8C=E5= =B9=B6=E4=B8=94=E6=8F=90=E4=BA=A4=E4=B8=AD=E7=9A=84=E2=80=9CAuthor=E2=80=9D= =E8=A1=8C=E8=A1=A8=E7=A4=BA=E5=AE=83=E6=98=AF=E7=94=B1=E4=BD=A0=E5=AE=8C=E6= =88=90 +=E7=9A=84=EF=BC=8C=E8=80=8C=E4=BD=A0=E9=9D=9E=E5=B8=B8=E7=A1=AE=E5=AE=9A `= =E8=87=AA=E5=B7=B1=E4=B8=8E=E5=AE=83=E6=97=A0=E5=85=B3`_=EF=BC=8C=E4=BC=9A= =E5=8F=91=E7=94=9F=E4=BB=80=E4=B9=88=EF=BC=9F =20 =E4=B8=BA=E4=BA=86=E8=A7=A3=E5=86=B3=E8=BF=99=E4=B8=A4=E4=B8=AA=E9=97=AE= =E9=A2=98=EF=BC=8CGit =E5=BC=95=E5=85=A5=E4=BA=86 PGP =E9=9B=86=E6=88=90=E3= =80=82=E7=AD=BE=E5=90=8D=E7=9A=84=E6=A0=87=E7=AD=BE=E9=80=9A=E8=BF=87=E7=A1= =AE=E4=BF=9D=E5=85=B6=E5=86=85=E5=AE=B9=E4=B8=8E=E5=88=9B =E5=BB=BA=E6=A0=87=E7=AD=BE=E7=9A=84=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98= =E7=9A=84=E5=B7=A5=E4=BD=9C=E7=AB=99=E4=B8=8A=E7=9A=84=E5=86=85=E5=AE=B9=E5= =AE=8C=E5=85=A8=E7=9B=B8=E5=90=8C=E6=9D=A5=E8=AF=81=E6=98=8E=E4=BB=93=E5=BA= =93=E7=9A=84=E5=AE=8C=E6=95=B4=E6=80=A7=EF=BC=8C=E8=80=8C=E7=AD=BE=E5=90=8D= =E7=9A=84=E6=8F=90 @@ -586,7 +585,7 @@ Git =E7=9A=84=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E4=B9= =8B=E4=B8=80=E6=98=AF=E5=AE=83=E7=9A=84=E5=88=86=E6=95=A3=E6=80=A7=E2=80=94= =E2=80=94=E4=B8=80=E6=97=A6=E5=B0=86=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86=E5= =88=B0=E4=BD=A0=E7=9A=84 =E5=A6=82=E4=BD=95=E4=BD=BF=E7=94=A8=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE ---------------- =20 -=E8=A6=81=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE=EF=BC=8C= =E5=8F=AA=E9=9C=80=E5=B0=86 ``-s`` =E5=BC=80=E5=85=B3=E4=BC=A0=E9=80=92=E7= =BB=99 tag =E5=91=BD=E4=BB=A4:: +=E8=A6=81=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE=EF=BC=8C= =E5=B0=86 ``-s`` =E5=BC=80=E5=85=B3=E4=BC=A0=E9=80=92=E7=BB=99 tag =E5=91= =BD=E4=BB=A4:: =20 $ git tag -s [tagname] =20 @@ -596,7 +595,7 @@ Git =E7=9A=84=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E4=B9= =8B=E4=B8=80=E6=98=AF=E5=AE=83=E7=9A=84=E5=88=86=E6=95=A3=E6=80=A7=E2=80=94= =E2=80=94=E4=B8=80=E6=97=A6=E5=B0=86=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86=E5= =88=B0=E4=BD=A0=E7=9A=84 =E5=A6=82=E4=BD=95=E9=AA=8C=E8=AF=81=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE ~~~~~~~~~~~~~~~~ =20 -=E8=A6=81=E9=AA=8C=E8=AF=81=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE=EF=BC=8C= =E5=8F=AA=E9=9C=80=E4=BD=BF=E7=94=A8=E4=BB=A5=E4=B8=8B ``verify-tag`` =E5= =91=BD=E4=BB=A4:: +=E8=A6=81=E9=AA=8C=E8=AF=81=E7=AD=BE=E5=90=8D=E6=A0=87=E7=AD=BE=EF=BC=8C= =E4=BD=BF=E7=94=A8=E4=BB=A5=E4=B8=8B ``verify-tag`` =E5=91=BD=E4=BB=A4:: =20 $ git verify-tag [tagname] =20 @@ -614,8 +613,8 @@ Git =E7=9A=84=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E4=B9= =8B=E4=B8=80=E6=98=AF=E5=AE=83=E7=9A=84=E5=88=86=E6=95=A3=E6=80=A7=E2=80=94= =E2=80=94=E4=B8=80=E6=97=A6=E5=B0=86=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86=E5= =88=B0=E4=BD=A0=E7=9A=84 # gpg: Signature made [...] # gpg: Good signature from [...] =20 -=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=AD=A3=E5=9C=A8=E9=AA=8C=E8=AF=81=E5=85=B6= =E4=BB=96=E4=BA=BA=E7=9A=84 git =E6=A0=87=E7=AD=BE=EF=BC=8C=E9=82=A3=E4=B9= =88=E4=BD=A0=E5=B0=86=E9=9C=80=E8=A6=81=E5=AF=BC=E5=85=A5=E4=BB=96=E4=BB=AC= =E7=9A=84 PGP =E5=AF=86=E9=92=A5=E3=80=82 -=E8=AF=B7=E5=8F=82=E9=98=85=E4=B8=8B=E9=9D=A2=E7=9A=84":ref:`=E8=BA=AB=E4= =BB=BD=E9=AA=8C=E8=AF=81`"=E9=83=A8=E5=88=86=E3=80=82 +=E5=A6=82=E6=9E=9C=E4=BD=A0=E6=AD=A3=E5=9C=A8=E9=AA=8C=E8=AF=81=E5=85=B6= =E4=BB=96=E4=BA=BA=E7=9A=84 git =E6=A0=87=E7=AD=BE=EF=BC=8C=E5=88=99=E9=9C= =80=E8=A6=81=E5=85=88=E5=AF=BC=E5=85=A5=E4=BB=96=E4=BB=AC=E7=9A=84 PGP =E5= =AF=86=E9=92=A5=E3=80=82=E8=AF=B7=E5=8F=82=E9=98=85 +=E4=B8=8B=E9=9D=A2=E7=9A=84 :ref:`=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81` = =E9=83=A8=E5=88=86=E3=80=82 =20 =E9=85=8D=E7=BD=AE git =E5=A7=8B=E7=BB=88=E5=AF=B9=E5=B8=A6=E6=B3=A8=E9=87= =8A=E7=9A=84=E6=A0=87=E7=AD=BE=EF=BC=88annotated tags=EF=BC=89=E8=BF=9B=E8= =A1=8C=E7=AD=BE=E5=90=8Dannotated tags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -628,13 +627,12 @@ Git =E7=9A=84=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E4= =B9=8B=E4=B8=80=E6=98=AF=E5=AE=83=E7=9A=84=E5=88=86=E6=95=A3=E6=80=A7=E2=80= =94=E2=80=94=E4=B8=80=E6=97=A6=E5=B0=86=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86= =E5=88=B0=E4=BD=A0=E7=9A=84 =E5=A6=82=E4=BD=95=E4=BD=BF=E7=94=A8=E7=AD=BE=E5=90=8D=E7=9A=84=E6=8F=90= =E4=BA=A4 ------------------ =20 -=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=8F=90=E4=BA=A4=E5=BE=88=E5=AE=B9= =E6=98=93=EF=BC=8C=E4=BD=86=E5=9C=A8 Linux =E5=86=85=E6=A0=B8=E5=BC=80=E5= =8F=91=E4=B8=AD=E4=BD=BF=E7=94=A8=E5=AE=83=E4=BB=AC=E8=A6=81=E5=9B=B0=E9=9A= =BE=E5=BE=97=E5=A4=9A=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AE=83=E4=BE=9D=E8=B5=96 -=E4=BA=8E=E5=8F=91=E9=80=81=E5=88=B0=E9=82=AE=E4=BB=B6=E5=88=97=E8=A1=A8= =E7=9A=84=E8=A1=A5=E4=B8=81=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=AD=A4=E5=B7=A5=E4= =BD=9C=E6=B5=81=E7=A8=8B=E4=B8=8D=E4=BF=9D=E7=95=99 PGP =E6=8F=90=E4=BA=A4= =E7=AD=BE=E5=90=8D=E3=80=82=E6=AD=A4=E5=A4=96=EF=BC=8C=E5=BD=93=E9=87=8D=E6= =96=B0 -=E8=B0=83=E6=95=B4=E4=BB=93=E5=BA=93=E4=BB=A5=E5=8C=B9=E9=85=8D=E4=B8=8A= =E6=B8=B8=E6=97=B6=EF=BC=8C=E7=94=9A=E8=87=B3=E4=BD=A0=E8=87=AA=E5=B7=B1=E7= =9A=84 PGP =E6=8F=90=E4=BA=A4=E7=AD=BE=E5=90=8D=E6=9C=80=E7=BB=88=E4=B9=9F= =E4=BC=9A=E8=A2=AB=E4=B8=A2=E5=BC=83=E3=80=82=E5=9B=A0=E6=AD=A4=EF=BC=8C=E5= =A4=A7 -=E5=A4=9A=E6=95=B0=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98= =E4=B8=8D=E4=BC=9A=E8=B4=B9=E5=BF=83=E7=AD=BE=E7=BD=B2=E4=BB=96=E4=BB=AC=E7= =9A=84=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BC=9A=E5=BF=BD=E7=95= =A5=E4=BB=96=E4=BB=AC=E5=9C=A8=E5=B7=A5=E4=BD=9C=E4=B8=AD=E4=BE=9D=E8=B5=96= =E7=9A=84=E4=BB=BB=E4=BD=95 -=E5=A4=96=E9=83=A8=E4=BB=93=E5=BA=93=E4=B8=AD=E7=9A=84=E7=AD=BE=E5=90=8D= =E6=8F=90=E4=BA=A4=E3=80=82 +=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=8F=90= =E4=BA=A4=EF=BC=8C=E4=BD=86=E5=AE=83=E4=BB=AC=E5=9C=A8 Linux =E5=86=85=E6= =A0=B8=E5=BC=80=E5=8F=91=E4=B8=AD=E7=9A=84=E4=BD=9C=E7=94=A8=E6=9C=89=E9=99= =90=E3=80=82=E5=86=85=E6=A0=B8=E8=B4=A1=E7=8C=AE=E5=B7=A5=E4=BD=9C=E6=B5=81 +=E4=BE=9D=E8=B5=96=E4=BA=8E=E5=8F=91=E9=80=81=E8=A1=A5=E4=B8=81=EF=BC=8C= =E8=80=8C=E5=B0=86=E6=8F=90=E4=BA=A4=E8=BD=AC=E6=8D=A2=E4=B8=BA=E8=A1=A5=E4= =B8=81=E6=97=B6=E4=B8=8D=E4=BC=9A=E4=BF=9D=E7=95=99 git =E6=8F=90=E4=BA=A4= =E7=AD=BE=E5=90=8D=E3=80=82=E6=AD=A4=E5=A4=96=EF=BC=8C=E5=BD=93=E4=BD=A0=E6= =8A=8A +=E8=87=AA=E5=B7=B1=E7=9A=84=E4=BB=93=E5=BA=93=E5=8F=98=E5=9F=BA=E5=88=B0= =E6=9B=B4=E6=96=B0=E7=9A=84=E4=B8=8A=E6=B8=B8=E6=97=B6=EF=BC=8CPGP =E6=8F= =90=E4=BA=A4=E7=AD=BE=E5=90=8D=E6=9C=80=E7=BB=88=E4=BC=9A=E8=A2=AB=E4=B8=A2= =E5=BC=83=E3=80=82=E5=9B=A0=E6=AD=A4=EF=BC=8C=E5=A4=A7=E5=A4=9A=E6=95=B0=E5= =86=85=E6=A0=B8 +=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98=E4=B8=8D=E4=BC=9A=E8=B4=B9=E5=BF=83= =E7=AD=BE=E7=BD=B2=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=B9=B6=E4=BC=9A=E5=BF=BD=E7= =95=A5=E5=85=B6=E5=B7=A5=E4=BD=9C=E6=89=80=E4=BE=9D=E8=B5=96=E7=9A=84=E4=BB= =BB=E4=BD=95=E5=A4=96=E9=83=A8=E4=BB=93=E5=BA=93=E4=B8=AD=E7=9A=84=E7=AD=BE= =E5=90=8D=E6=8F=90=E4=BA=A4=E3=80=82 =20 -=E4=BD=86=E6=98=AF=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BD=A0=E7=9A=84=E5=B7=A5= =E4=BD=9C git =E6=A0=91=E5=9C=A8=E6=9F=90=E4=BA=9B git =E6=89=98=E7=AE=A1= =E6=9C=8D=E5=8A=A1=EF=BC=88kernel.org=E3=80=81 +=E4=B8=8D=E8=BF=87=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BD=A0=E7=9A=84=E5=B7=A5= =E4=BD=9C git =E6=A0=91=E5=9C=A8=E6=9F=90=E4=BA=9B git =E6=89=98=E7=AE=A1= =E6=9C=8D=E5=8A=A1=EF=BC=88kernel.org=E3=80=81 infradead.org=E3=80=81ozlabs.org =E6=88=96=E5=85=B6=E4=BB=96=EF=BC=89=E4= =B8=8A=E5=85=AC=E5=BC=80=E5=8F=AF=E7=94=A8=EF=BC=8C=E9=82=A3=E4=B9=88=E5=BB= =BA=E8=AE=AE=E4=BD=A0=E7=AD=BE=E7=BD=B2=E6=89=80=E6=9C=89 git =E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8D=B3=E4=BD=BF=E4=B8=8A=E6=B8=B8=E5=BC=80= =E5=8F=91=E4=BA=BA=E5=91=98=E4=B8=8D=E7=9B=B4=E6=8E=A5=E5=8F=97=E7=9B=8A=E4= =BA=8E=E8=BF=99=E7=A7=8D=E5=81=9A=E6=B3=95=E3=80=82 =20 @@ -642,15 +640,15 @@ infradead.org=E3=80=81ozlabs.org =E6=88=96=E5=85=B6= =E4=BB=96=EF=BC=89=E4=B8=8A=E5=85=AC=E5=BC=80=E5=8F=AF=E7=94=A8=EF=BC=8C=E9= =82=A3=E4=B9=88=E5=BB=BA=E8=AE=AE=E4=BD=A0=E7=AD=BE=E7=BD=B2 =20 1. =E5=A6=82=E6=9E=9C=E9=9C=80=E8=A6=81=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=A0= =81=E5=8F=96=E8=AF=81=E6=88=96=E8=B7=9F=E8=B8=AA=E4=BB=A3=E7=A0=81=E6=9D=A5= =E6=BA=90=EF=BC=8C=E5=8D=B3=E4=BD=BF=E6=98=AF=E5=A4=96=E9=83=A8=E7=BB=B4=E6= =8A=A4=E7=9A=84=E5=B8=A6=E6=9C=89 PGP =E6=8F=90=E4=BA=A4=E7=AD=BE=E5=90=8D =E7=9A=84=E6=A0=91=E5=AF=B9=E4=BA=8E=E6=AD=A4=E7=B1=BB=E9=97=AE=E9=A2= =98=E4=B9=9F=E5=BE=88=E6=9C=89=E4=BB=B7=E5=80=BC=E3=80=82 -2. =E5=A6=82=E6=9E=9C=E4=BD=A0=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E5=85= =8B=E9=9A=86=E6=9C=AC=E5=9C=B0=E4=BB=93=E5=BA=93=EF=BC=88=E4=BE=8B=E5=A6=82= =EF=BC=8C=E5=9C=A8=E7=A3=81=E7=9B=98=E6=95=85=E9=9A=9C=E5=90=8E=EF=BC=89=EF= =BC=8C=E8=BF=99=E5=8F=AF=E4=BB=A5=E8=AE=A9=E4=BD=A0=E5=9C=A8=E6=81=A2=E5=A4= =8D=E5=B7=A5 - =E4=BD=9C=E4=B9=8B=E5=89=8D=E8=BD=BB=E6=9D=BE=E9=AA=8C=E8=AF=81=E4=BB= =93=E5=BA=93=E7=9A=84=E5=AE=8C=E6=95=B4=E6=80=A7=E3=80=82 +2. =E5=A6=82=E6=9E=9C=E4=BD=A0=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E5=85= =8B=E9=9A=86=E6=9C=AC=E5=9C=B0=E4=BB=93=E5=BA=93=EF=BC=88=E4=BE=8B=E5=A6=82= =EF=BC=8C=E5=9C=A8=E9=87=8D=E8=A3=85=E7=B3=BB=E7=BB=9F=E5=90=8E=EF=BC=89=EF= =BC=8C=E8=BF=99=E5=8F=AF=E4=BB=A5=E8=AE=A9=E4=BD=A0=E5=9C=A8=E6=81=A2=E5=A4= =8D=E5=B7=A5 + =E4=BD=9C=E4=B9=8B=E5=89=8D=E9=AA=8C=E8=AF=81=E4=BB=93=E5=BA=93=E7=9A= =84=E5=AE=8C=E6=95=B4=E6=80=A7=E3=80=82 3. =E5=A6=82=E6=9E=9C=E6=9C=89=E4=BA=BA=E9=9C=80=E8=A6=81=E6=8C=91=E9=80= =89=E4=BD=A0=E7=9A=84=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=BF=99=E5=8F=AF=E4=BB=A5= =E8=AE=A9=E4=BB=96=E4=BB=AC=E5=9C=A8=E5=BA=94=E7=94=A8=E4=B9=8B=E5=89=8D=E5= =BF=AB=E9=80=9F=E9=AA=8C=E8=AF=81=E5=85=B6=E5=AE=8C=E6=95=B4=E6=80=A7=E3=80= =82 =20 =E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=8F=90=E4=BA=A4 ~~~~~~~~~~~~ =20 -=E8=A6=81=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=8F=90=E4=BA=A4=EF=BC=8C= =E4=BD=A0=E5=8F=AA=E9=9C=80=E5=B0=86 ``-S`` =E6=A0=87=E5=BF=97=E4=BC=A0=E9= =80=92=E7=BB=99 ``git commit`` =E5=91=BD=E4=BB=A4=EF=BC=88=E7=94=B1=E4=BA= =8E -=E4=B8=8E=E5=8F=A6=E4=B8=80=E4=B8=AA=E6=A0=87=E5=BF=97=E5=86=B2=E7=AA=81= =EF=BC=8C=E6=89=80=E4=BB=A5=E5=AE=83=E6=98=AF=E5=A4=A7=E5=86=99=E7=9A=84 ``= -S`` =EF=BC=89:: +=E8=A6=81=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90=8D=E6=8F=90=E4=BA=A4=EF=BC=8C= =E5=B0=86 ``-S`` =E6=A0=87=E5=BF=97=E4=BC=A0=E9=80=92=E7=BB=99 ``git commit= `` =E5=91=BD=E4=BB=A4=EF=BC=88=E7=94=B1=E4=BA=8E=E4=B8=8E=E5=8F=A6=E4=B8=80= =E4=B8=AA +=E6=A0=87=E5=BF=97=E5=86=B2=E7=AA=81=EF=BC=8C=E6=89=80=E4=BB=A5=E5=AE=83= =E6=98=AF=E5=A4=A7=E5=86=99=E7=9A=84 ``-S`` =EF=BC=89:: =20 $ git commit -S =20 @@ -667,7 +665,6 @@ infradead.org=E3=80=81ozlabs.org =E6=88=96=E5=85=B6=E4= =BB=96=EF=BC=89=E4=B8=8A=E5=85=AC=E5=BC=80=E5=8F=AF=E7=94=A8=EF=BC=8C=E9=82= =A3=E4=B9=88=E5=BB=BA=E8=AE=AE=E4=BD=A0=E7=AD=BE=E7=BD=B2 =20 .. _=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81: =20 - =E5=A6=82=E4=BD=95=E4=BD=BF=E7=94=A8=E7=AD=BE=E5=90=8D=E8=A1=A5=E4=B8=81 ---------------- =20 @@ -683,6 +680,10 @@ infradead.org=E3=80=81ozlabs.org =E6=88=96=E5=85=B6=E4= =BB=96=EF=BC=89=E4=B8=8A=E5=85=AC=E5=BC=80=E5=8F=AF=E7=94=A8=EF=BC=8C=E9=82= =A3=E4=B9=88=E5=BB=BA=E8=AE=AE=E4=BD=A0=E7=AD=BE=E7=BD=B2 =E5=AE=89=E8=A3=85=E5=92=8C=E9=85=8D=E7=BD=AE patatt ~~~~~~~~~~~~~~~~~ =20 +.. note:: + + =E5=A6=82=E6=9E=9C=E4=BD=A0=E4=BD=BF=E7=94=A8 B4 =E5=8F=91=E9=80=81=E8= =A1=A5=E4=B8=81=EF=BC=8C=E9=82=A3=E4=B9=88 patatt =E5=B7=B2=E5=AE=89=E8=A3= =85=E5=B9=B6=E9=9B=86=E6=88=90=E5=88=B0=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD= =E3=80=82 + Patatt =E5=B7=B2=E9=92=88=E5=AF=B9=E8=AE=B8=E5=A4=9A=E5=8F=91=E8=A1=8C=E7= =89=88=E8=BF=9B=E8=A1=8C=E4=BA=86=E6=89=93=E5=8C=85=EF=BC=8C=E5=9B=A0=E6=AD= =A4=E8=AF=B7=E5=85=88=E6=A3=80=E6=9F=A5=E9=82=A3=E9=87=8C=E3=80=82=E4=BD=A0= =E8=BF=98=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8 =E2=80=9C ``pip install patatt`` =E2=80=9D=E4=BB=8E pypi =E5=AE=89=E8=A3= =85=E5=AE=83=E3=80=82 =20 @@ -717,11 +718,13 @@ DKIM =E5=92=8C patatt =E7=AD=BE=E5=90=8D=EF=BC=8C=E4= =BE=8B=E5=A6=82:: Patatt =E5=92=8C b4 =E4=BB=8D=E5=9C=A8=E7=A7=AF=E6=9E=81=E5=BC=80=E5= =8F=91=E4=B8=AD=EF=BC=8C=E4=BD=A0=E5=BA=94=E8=AF=A5=E6=A3=80=E6=9F=A5=E8=BF= =99=E4=BA=9B=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=9C=80=E6=96=B0=E6=96=87=E6=A1=A3= =E4=BB=A5=E4=BA=86=E8=A7=A3=E4=BB=BB =E4=BD=95=E6=96=B0=E5=8A=9F=E8=83=BD=E6=88=96=E6=9B=B4=E6=96=B0=E5=8A= =9F=E8=83=BD=E3=80=82 =20 +.. _cn_kernel_identities: + =E5=A6=82=E4=BD=95=E9=AA=8C=E8=AF=81=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91= =E8=80=85=E8=BA=AB=E4=BB=BD =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -=E7=AD=BE=E7=BD=B2=E6=A0=87=E7=AD=BE=E5=92=8C=E6=8F=90=E4=BA=A4=E5=BE=88= =E5=AE=B9=E6=98=93=EF=BC=8C=E4=BD=86=E6=98=AF=E5=A6=82=E4=BD=95=E9=AA=8C=E8= =AF=81=E7=94=A8=E4=BA=8E=E7=AD=BE=E7=BD=B2=E6=9F=90=E9=A1=B9=E5=86=85=E5=AE= =B9=E7=9A=84=E5=AF=86=E9=92=A5=E6=98=AF=E5=90=A6=E5=B1=9E=E4=BA=8E=E5=AE=9E= =E9=99=85=E7=9A=84=E5=86=85 -=E6=A0=B8=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98=E8=80=8C=E4=B8=8D=E6=98=AF= =E6=81=B6=E6=84=8F=E5=86=92=E5=90=8D=E9=A1=B6=E6=9B=BF=E8=80=85=EF=BC=9F +=E7=AD=BE=E7=BD=B2=E6=A0=87=E7=AD=BE=E5=92=8C=E6=8F=90=E4=BA=A4=E5=B9=B6= =E4=B8=8D=E5=A4=8D=E6=9D=82=EF=BC=8C=E4=BD=86=E6=98=AF=E5=A6=82=E4=BD=95=E9= =AA=8C=E8=AF=81=E7=94=A8=E4=BA=8E=E7=AD=BE=E7=BD=B2=E6=9F=90=E9=A1=B9=E5=86= =85=E5=AE=B9=E7=9A=84=E5=AF=86=E9=92=A5=E6=98=AF=E5=90=A6=E5=B1=9E=E4=BA=8E= =E5=AE=9E=E9=99=85=E7=9A=84 +=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98=E8=80=8C=E4=B8=8D= =E6=98=AF=E6=81=B6=E6=84=8F=E5=86=92=E5=90=8D=E9=A1=B6=E6=9B=BF=E8=80=85=EF= =BC=9F =20 =E4=BD=BF=E7=94=A8 WKD =E5=92=8C DANE =E9=85=8D=E7=BD=AEauto-key-locate=EF= =BC=88=E8=87=AA=E5=8A=A8=E5=AF=86=E9=92=A5=E6=A3=80=E7=B4=A2=EF=BC=89 ---------------------------------------------------- @@ -760,14 +763,14 @@ HTTPS/TLS =E4=B8=96=E7=95=8C=E5=AF=B9=E9=9B=86=E4=B8= =AD=E5=BC=8F=E8=AF=81=E4=B9=A6=E9=A2=81=E5=8F=91=E6=9C=BA=E6=9E=84=E7=9A=84= =E9=9C=80=E6=B1=82=E3=80=82PGP =E5=B0=86=E8=BF=99=E4=B8=80=E8=B4=A3=E4=BB= =BB=E7=95=99 =E7=94=A8=E6=88=B7=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E7=94=B1=E5=90=84= =E7=A7=8D=E8=BD=AF=E4=BB=B6=E5=88=B6=E9=80=A0=E5=95=86=E8=A7=84=E5=AE=9A=E8= =B0=81=E5=BA=94=E8=AF=A5=E6=98=AF=E4=BD=A0=E5=80=BC=E5=BE=97=E4=BF=A1=E8=B5= =96=E7=9A=84=E8=AE=A4=E8=AF=81=E5=AE=9E=E4=BD=93=E3=80=82 =20 =E4=B8=8D=E5=B9=B8=E7=9A=84=E6=98=AF=EF=BC=8C=E5=BE=88=E5=B0=91=E6=9C=89= =E4=BA=BA=E4=BA=86=E8=A7=A3=E4=BF=A1=E4=BB=BB=E7=BD=91=E6=98=AF=E5=A6=82=E4= =BD=95=E8=BF=90=E4=BD=9C=E7=9A=84=E3=80=82=E8=99=BD=E7=84=B6=E5=AE=83=E4=BB= =8D=E7=84=B6=E6=98=AF OpenPGP =E8=A7=84 -=E8=8C=83=E7=9A=84=E4=B8=80=E4=B8=AA=E9=87=8D=E8=A6=81=E6=96=B9=E9=9D=A2= =EF=BC=8C=E4=BD=86=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84 GnuPG=EF=BC= =882.2 =E5=8F=8A=E6=9B=B4=E9=AB=98=E7=89=88=E6=9C=AC=EF=BC=89=E5=B7=B2=E7= =BB=8F=E5=AE=9E=E7=8E=B0=E4=BA=86 +=E8=8C=83=E7=9A=84=E9=87=8D=E8=A6=81=E7=BB=84=E6=88=90=E9=83=A8=E5=88=86= =EF=BC=8C=E4=BD=86=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84 GnuPG=EF=BC= =882.2 =E5=8F=8A=E6=9B=B4=E9=AB=98=E7=89=88=E6=9C=AC=EF=BC=89=E5=B7=B2=E7= =BB=8F=E5=AE=9E=E7=8E=B0=E4=BA=86 =E4=B8=80=E7=A7=8D=E7=A7=B0=E4=B8=BA=E2=80=9C=E9=A6=96=E6=AC=A1=E4=BD=BF= =E7=94=A8=E4=BF=A1=E4=BB=BB=E2=80=9D(TOFU) =E7=9A=84=E6=9B=BF=E4=BB=A3=E6= =9C=BA=E5=88=B6=E3=80=82=E4=BD=A0=E5=8F=AF=E4=BB=A5=E5=B0=86 TOFU =E8=A7=86= =E4=B8=BA=E2=80=9C=E7=B1=BB=E4=BC=BC SSH =E7=9A=84=E4=BF=A1=E4=BB=BB=E6=96=B9=E6=B3=95=E2=80=9D=E3=80=82=E4=BD= =BF=E7=94=A8 SSH=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=BF=9E=E6=8E=A5=E5= =88=B0=E8=BF=9C=E7=A8=8B=E7=B3=BB=E7=BB=9F=E6=97=B6=EF=BC=8C=E5=85=B6=E5=AF= =86=E9=92=A5=E6=8C=87=E7=BA=B9=E4=BC=9A=E8=A2=AB =E8=AE=B0=E5=BD=95=E5=B9=B6=E8=AE=B0=E4=BD=8F=E3=80=82=E5=A6=82=E6=9E=9C= =E5=B0=86=E6=9D=A5=E5=AF=86=E9=92=A5=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=EF= =BC=8CSSH =E5=AE=A2=E6=88=B7=E7=AB=AF=E5=B0=86=E5=90=91=E4=BD=A0=E5=8F=91= =E5=87=BA=E8=AD=A6=E6=8A=A5=E5=B9=B6=E6=8B=92=E7=BB=9D=E8=BF=9E =E6=8E=A5=EF=BC=8C=E8=BF=AB=E4=BD=BF=E4=BD=A0=E5=86=B3=E5=AE=9A=E6=98=AF= =E5=90=A6=E9=80=89=E6=8B=A9=E4=BF=A1=E4=BB=BB=E6=9B=B4=E6=94=B9=E5=90=8E=E7= =9A=84=E5=AF=86=E9=92=A5=E3=80=82=E5=90=8C=E6=A0=B7=EF=BC=8C=E7=AC=AC=E4=B8= =80=E6=AC=A1=E5=AF=BC=E5=85=A5=E6=9F=90=E4=BA=BA=E7=9A=84 PGP =E5=AF=86=E9=92=A5=E6=97=B6=EF=BC=8C=E5=AE=83=E8=A2=AB=E8=AE=A4=E4=B8=BA= =E6=98=AF=E6=9C=89=E6=95=88=E7=9A=84=E3=80=82=E5=A6=82=E6=9E=9C=E5=B0=86=E6= =9D=A5=E7=9A=84=E4=BB=BB=E4=BD=95=E6=97=B6=E5=80=99 GnuPG =E9=81=87=E5=88= =B0=E5=85=B7=E6=9C=89=E7=9B=B8=E5=90=8C=E6=A0=87 -=E8=AF=86=E7=9A=84=E5=8F=A6=E4=B8=80=E4=B8=AA=E5=AF=86=E9=92=A5=EF=BC=8C= =E5=88=99=E5=85=88=E5=89=8D=E5=AF=BC=E5=85=A5=E7=9A=84=E5=AF=86=E9=92=A5=E5= =92=8C=E6=96=B0=E5=AF=86=E9=92=A5=E9=83=BD=E5=B0=86=E8=A2=AB=E6=A0=87=E8=AE= =B0=E4=B8=BA=E6=97=A0=E6=95=88=EF=BC=8C=E4=BD=A0=E5=B0=86=E9=9C=80=E8=A6=81= =E6=89=8B -=E5=8A=A8=E7=A1=AE=E5=AE=9A=E4=BF=9D=E7=95=99=E5=93=AA=E4=B8=80=E4=B8=AA= =E3=80=82 +=E8=AF=86=E7=9A=84=E5=8F=A6=E4=B8=80=E4=B8=AA=E5=AF=86=E9=92=A5=EF=BC=8C= =E5=88=99=E5=85=88=E5=89=8D=E5=AF=BC=E5=85=A5=E7=9A=84=E5=AF=86=E9=92=A5=E5= =92=8C=E6=96=B0=E5=AF=86=E9=92=A5=E9=83=BD=E5=B0=86=E8=A2=AB=E6=A0=87=E8=AE= =B0=E4=B8=BA=E5=BE=85=E9=AA=8C=E8=AF=81=EF=BC=8C=E4=BD=A0=E5=B0=86=E9=9C=80= =E8=A6=81 +=E6=89=8B=E5=8A=A8=E7=A1=AE=E5=AE=9A=E4=BF=9D=E7=95=99=E5=93=AA=E4=B8=80= =E4=B8=AA=E3=80=82 =20 =E6=88=91=E4=BB=AC=E5=BB=BA=E8=AE=AE=E4=BD=A0=E4=BD=BF=E7=94=A8 TOFU+PGP = =E7=BB=84=E5=90=88=E4=BF=A1=E4=BB=BB=E6=A8=A1=E5=9E=8B=EF=BC=88=E8=BF=99=E6= =98=AF GnuPG v2 =E4=B8=AD=E6=96=B0=E9=BB=98=E8=AE=A4=E7=9A=84=EF=BC=89=E3= =80=82 =E8=8B=A5=E8=A6=81=E8=AE=BE=E7=BD=AE=E5=AE=83=EF=BC=8C=E5=9C=A8 ``~/.gnupg= /gpg.conf`` =E4=B8=AD=E6=B7=BB=E5=8A=A0=EF=BC=88=E6=88=96=E4=BF=AE=E6=94=B9= =EF=BC=89 --=20 2.55.0.822.g20453c30eb From nobody Mon Sep 28 10:44:10 2026 Received: from mta0.migadu.com (out-66.mta0.migadu.com [91.218.175.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16C5B3C1419 for ; Sun, 23 Aug 2026 07:15:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469330; cv=none; b=pVxAdV3jq2uiU4V1yBsfbcvwyw1RsGaA1xqvYhkYLSUBR/qs2c47bagxO3sKe8xlQpc/NYjSjtP6YdN7GBOWAC8aMIUQgnl07e1tJaBY5r+v9KMzIMYGHAGHm3vIJScithKFkjBX1xyfG1KkylpAz94Ev/BbWjwyKgJDBB06Fs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469330; c=relaxed/simple; bh=5ZuAEAQyybRW946rhgehF/uHgjS3z9Pt035+5ckDtMM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cZfrr7RvlI9hYtZ6JH5uoodHkE3GZmlGW6kLbbpuG0ru9T6Q/qHlNEFm9dRno94e8POPVChdLzd2Mg9vqMtXINPCsPp8aIx86nBC+y96Hx5tbMj7KGWYodoKoVNvoPitwdepY9inHbzdL/WX0w8Kte3wdxP2zA+iKZAwAVeT/Kk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=ITeMRx7L; arc=none smtp.client-ip=91.218.175.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="ITeMRx7L" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=5ZuAEAQyybRW946rhgehF/uHgjS3z9Pt035+5ckDtMM=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787469326; v=1; x=1788074126; b=ITeMRx7LnJ8oKdsDv+epybAPzapEn62vzjD2a0cvhIyOMaiK6ZXdaGQ64ptg1jntlYtSur9E FtT/eaW3u28TMRky32JFFMK5d1eaZHWgW655RjqwTGH21/epkJeyw8n2KjsCTXBzpQ7nc3s7E/+ GLrh0aO7HVV6m2Bi0brYzM3opVYd6fDO6BjmPTyOMwOC5LpTWUfaf3sJT69WhnUc/VpCcimrzmX pch+FUEzI+7K/JxPcV8cavKqJU+fm0qEBvcZWQA+ezsPAJtwhVjAlOHesAUocAFdXpFlKuzSZSV 1yuRVAeCSEJmGwz81YLa5RPidc110ncUYKU9SUrpr3A8A== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id 5188c006d38ebb33; Sun, 23 Aug 2026 07:15:25 +0000 X-Mizu-Trace-ID: 5188c006d38ebb33 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 15:14:58 +0800 Subject: [PATCH v2 2/5] docs/zh_CN: clarify free Nitrokey requirements Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-maintainer-pgp-guide-v2-2-bea33b2ece54@wyuan.org> References: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Konstantin Ryabitsev Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev 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 --- 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=E3=80=82 =20 .. note:: =20 - =E5=A6=82=E6=9E=9C=E4=BD=A0=E4=BD=8D=E5=88=97=E4=BA=8E MAINTAINERS =E4= =B8=AD=E6=88=96=E5=9C=A8 kernel.org =E4=B8=8A=E6=8B=A5=E6=9C=89=E5=B8=90=E6= =88=B7=EF=BC=8C=E5=88=99=E4=BD=A0=E6=9C=89 - =E8=B5=84=E6=A0=BC=E8=8E=B7=E5=BE=97Linux =E5=9F=BA=E9=87=91=E4=BC=9A= =E6=8F=90=E4=BE=9B=E7=9A=84_`qualify for a free Nitrokey Start` =E3=80=82 + =E5=A6=82=E6=9E=9C=E4=BD=A0=E8=A2=AB=E5=88=97=E5=9C=A8 MAINTAINERS =E7= =9A=84 `M:` =E6=9D=A1=E7=9B=AE=E4=B8=AD=EF=BC=8C=E6=88=96=E8=80=85=E6=8B=A5= =E6=9C=89 kernel.org =E5=B8=90=E6=88=B7=EF=BC=8C + =E5=88=99=E6=9C=89=E8=B5=84=E6=A0=BC=E8=8E=B7=E5=BE=97 Linux =E5=9F=BA= =E9=87=91=E4=BC=9A=E6=8F=90=E4=BE=9B=E7=9A=84 `=E5=85=8D=E8=B4=B9 Nitrokey = Start`_=E3=80=82 =20 .. _`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-d= igital-tokens-for-kernel-developers.html +.. _`=E5=85=8D=E8=B4=B9 Nitrokey Start`: https://www.kernel.org/nitrokey-d= igital-tokens-for-kernel-developers.html =20 =E9=85=8D=E7=BD=AE=E4=BD=A0=E7=9A=84=E6=99=BA=E8=83=BD=E5=8D=A1=E8=AE=BE= =E5=A4=87 ------------------ --=20 2.55.0.822.g20453c30eb From nobody Mon Sep 28 10:44:10 2026 Received: from mta0.migadu.com (out-71.mta0.migadu.com [91.218.175.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5050322B9F for ; Sun, 23 Aug 2026 07:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469336; cv=none; b=r+KNrg/E/G3zczgazFRg3c3KsoQzGABgcySIZRx3ukDqyMlmoJEBL83jL1JbEXgLs643npbEQw7O+H1F65clebVOt9biOoPj2MnAcSBo4aHGMWtEzXTWSTm070fT3mL7SRova/LzqYisyDk3oisa7WpvajYanBas7DyKY5lHnP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469336; c=relaxed/simple; bh=qexJyGJfCaiZjqvk9M9QZdvbtlJ5LbUJLqvPsvZZkRw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r0INCy+YVDXC/OnBd3m8w3rNea6DUv64Qf0V15HkBsH6SakcxrGnrgQqcAN0slemUk1i/SfFrZ+52c5szbgwhb8HgwRoxnAzvCU49smGY6dz0FuJRXR6Pj+40Zt+J/pcoJbk4ym2nsdaKt/u0sX/MMicCeYntpp9tgyKEYkKgzs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=YG939+cG; arc=none smtp.client-ip=91.218.175.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="YG939+cG" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=qexJyGJfCaiZjqvk9M9QZdvbtlJ5LbUJLqvPsvZZkRw=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787469332; v=1; x=1788074132; b=YG939+cGRo8CtaXapfGoNgjVlaOQwJVwLFT6+oVoCswLPW5bYjkVeArSMsTx/zVVLHlUPfry V7xhZ/4BDk8IrHnOUWnprNi0s/E8iAzxlGhvaWJkrMI6O9iFSdXOVh/e2QkcP9MIDZvYF9uwbV7 DAhklV9Mjcs8oA1cZq2qXN8DFdS8N0hwb/bewtTkHyhXk+8ZoaRi9iYvO7kWmg0ExdB+1dsxxJi kQEGVXYpQDTO4uCAmy33Fs1Zbx4bQkLFa6hPg5S+eK2E/nCY1t4FNCS4dq8ggYoZfpooWU6iejV ogFmt6BTJu6RpP9jwag7oFZdvBZg6lBnaL/2fhdO7P+KA== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id cdb8c1e5da88d3f1; Sun, 23 Aug 2026 07:15:32 +0000 X-Mizu-Trace-ID: cdb8c1e5da88d3f1 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 15:14:59 +0800 Subject: [PATCH v2 3/5] docs/zh_CN: update maintainer-pgp-guide kernel.org link Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-maintainer-pgp-guide-v2-3-bea33b2ece54@wyuan.org> References: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Konstantin Ryabitsev Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev Update the kernel.org documentation link for adding a kernel.org UID. The SPDX identifier added upstream already exists in the Chinese translation. Update the translation through commit 6c5c07bc8589 ("docs: process: maintainer-pgp-guide: update kernel.org docs link") Signed-off-by: Weijie Yuan --- 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. --- Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.= rst b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst index b329755cc960..6e29c9a74f4c 100644 --- a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst +++ b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst @@ -753,7 +753,7 @@ Greg Kroah-Hartman =E7=9A=84=E5=AF=86=E9=92=A5=EF=BC=88= =E5=A6=82=E6=9E=9C=E4=BD=A0=E8=BF=98=E6=B2=A1=E6=9C=89=E5=AE=83=E4=BB=AC=EF= =BC=89:: =E5=A6=82=E6=9E=9C=E4=BD=A0=E6=9C=89 kernel.org =E5=B8=90=E6=88=B7=EF=BC= =8C=E9=82=A3=E4=B9=88=E4=BD=A0=E5=BA=94=E8=AF=A5 `=E6=B7=BB=E5=8A=A0 kernel= .org UID =E5=88=B0=E4=BD=A0=E7=9A=84=E5=AF=86=E9=92=A5=E4=B8=AD`_ =E6=B7=BB=E5=8A=A0=E5=88=B0=E4=BD=A0=E7=9A=84=E5=AF=86=E9=92=A5=E4=B8=AD= =EF=BC=8C=E4=BB=A5=E4=BD=BF WKD =E5=AF=B9=E5=85=B6=E4=BB=96=E5=86=85=E6=A0= =B8=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98=E6=9B=B4=E6=9C=89=E7=94=A8=E3=80=82 =20 -.. _`=E6=B7=BB=E5=8A=A0 kernel.org UID =E5=88=B0=E4=BD=A0=E7=9A=84=E5=AF= =86=E9=92=A5=E4=B8=AD`: https://korg.wiki.kernel.org/userdoc/mail#adding_a_= kernelorg_uid_to_your_pgp_key +.. _`=E6=B7=BB=E5=8A=A0 kernel.org UID =E5=88=B0=E4=BD=A0=E7=9A=84=E5=AF= =86=E9=92=A5=E4=B8=AD`: https://korg.docs.kernel.org/mail.html#adding-a-ker= nel-org-uid-to-your-pgp-key =20 =E4=BF=A1=E4=BB=BB=E7=BD=91 (WOT) =E4=B8=8E=E9=A6=96=E6=AC=A1=E4=BD=BF=E7= =94=A8=E4=BF=A1=E4=BB=BB (TOFU) ----------------------------------- --=20 2.55.0.822.g20453c30eb From nobody Mon Sep 28 10:44:10 2026 Received: from mta0.migadu.com (out-75.mta0.migadu.com [91.218.175.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B3673559C9 for ; Sun, 23 Aug 2026 07:15:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.75 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469343; cv=none; b=q6E0sFILY0mMAx/gGmknPu2qCBp0OKpbFLZFKlTLNRPLyXj+YDduD3w93U9l7WbQLU2cybBh1jYCWELah4to4p+sJvQcIpWyLAw07W20BC+khkJhNjgLsDHmBaKlDjpSTp/136hIFdvQklPs0RLirdNjbAdVjzcdM5FOMlkvpqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469343; c=relaxed/simple; bh=sgwfqA9sAjgSBgQ/O6bwV3Csq7CjVG+v9NkaeSLCyvk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=anNjnruemsW0o4JDI/bwgCbOXHa58qp2tFUrSQi6Y6hyyocir55lbefDk5F5nUeeufHhGxxwbbT6kgaD3beg0g6pMRYziyytK9Dcf4S2wWjc78i9GevhYmT+l5PHmHFXrZwCPZF7LVVxFenu7gHckOIVvmQTV7/CtXDBA1vxIIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=T+jjI9xR; arc=none smtp.client-ip=91.218.175.75 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="T+jjI9xR" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=sgwfqA9sAjgSBgQ/O6bwV3Csq7CjVG+v9NkaeSLCyvk=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787469339; v=1; x=1788074139; b=T+jjI9xRPabguPxSlja/WQbzHJdwcQ6mOsYDQ0SNjhb3+gFF38g3gqlH0OcZ0XKXcf6bbtRg Cgc9BMkJIR2me17JO4CYAXlAidZpRfTCnvdn5eohPr+vL9kaoNre0+No1DU9tEYDsBeD83R0Jbw uJtbvqZ7VUSvnG7QSlE+CVCR9Re25AaxxxmjzmrShUmlcPqzEK126/Xau6k+PlP4BhIpWieLMtA patTOLDrWlbc/hV/KULMXkbOHbU+KjRKA+lnnK0NEGCrw0r9mdGahPzUl2HhGsBZ2WOL+m3oWr6 pI+GEkcAJStGrJsy/BI8/Eg9GcFEPqbuDtM2svH2uYwlg== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id e40a9d944dd2d7a0; Sun, 23 Aug 2026 07:15:39 +0000 X-Mizu-Trace-ID: e40a9d944dd2d7a0 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 15:15:00 +0800 Subject: [PATCH v2 4/5] docs/zh_CN: add kernel.org trust repository reference Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-maintainer-pgp-guide-v2-4-bea33b2ece54@wyuan.org> References: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Konstantin Ryabitsev Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev Add the kernel.org trust repository reference to the Chinese translation. Update the translation through commit 54857c52452a ("docs: maintainer-pgp-guide.rst: add a reference for kernel.org sign") Signed-off-by: Weijie Yuan --- Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.= rst b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst index 6e29c9a74f4c..79f8de3c1f5e 100644 --- a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst +++ b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst @@ -778,6 +778,8 @@ SSH =E7=9A=84=E4=BF=A1=E4=BB=BB=E6=96=B9=E6=B3=95=E2=80= =9D=E3=80=82=E4=BD=BF=E7=94=A8 SSH=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=AC=A1=E8= =BF=9E=E6=8E=A5=E5=88=B0=E8=BF=9C=E7=A8=8B=E7=B3=BB=E7=BB=9F=E6=97=B6=EF=BC= =8C=E5=85=B6=E5=AF=86 =20 trust-model tofu+pgp =20 +.. _cn_kernel_org_trust_repository: + =E4=BD=BF=E7=94=A8 kernel.org =E4=BF=A1=E4=BB=BB=E7=BD=91=E4=BB=93=E5=BA= =93 -------------------------- =20 --=20 2.55.0.822.g20453c30eb From nobody Mon Sep 28 10:44:10 2026 Received: from mta0.migadu.com (out-77.mta0.migadu.com [91.218.175.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B04F3BF665 for ; Sun, 23 Aug 2026 07:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.77 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469347; cv=none; b=IxJFbCitqofFp6djBqtRD2izMDgXaUw/2FV3Qyvper/1DzkBpegkD8Z32ylk1ehkpsLva/vn6Ky4e15aU2mO3l2zjQ4ynPXPLNyIU0/PiptSMwDDzlj8KvB+jGEco2t9T0fF50O9jH7S3mOzsDqCeXMX+ZuSrNdcrYONOV+gnPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787469347; c=relaxed/simple; bh=47hHxqsLHgwrz7E8qdpY0bnAmDZvtZmAEIICCBjwN9I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WOwrPUqzMveERqBjkOyqT3Rl/un56ZaTCDsg3xNQ2x1ZRQVa+xD7zyo9fusdzrEkVVSIOcuRNUqkyW49BjKyFiG4Jt02AbNN6U7q/y2hPvotQedM28YNBINEkKmTdBEbIHjEji4BaLPh0eQMq0PWhyUevAIj1jok0QA8p8hXAN4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=J8vzm7Zu; arc=none smtp.client-ip=91.218.175.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="J8vzm7Zu" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=47hHxqsLHgwrz7E8qdpY0bnAmDZvtZmAEIICCBjwN9I=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787469342; v=1; x=1788074142; b=J8vzm7ZuJrM1ETjemXBzk4Wb1ocNY++lhyDIH/Ckmkk/pMVOK1rywRmBRDmA2yVvCdL5oBsP 0vzousxFgMGjyAqHPVNJW9ZN7LCm5tUuw70J5FdEy7HYV6hiWcVKhUPmxJy06RIFuyo+rbJ2ai+ kf9AFcPT9s2FpHTTfD5Q8NFoUGbKYP+IavF/RHvUWu0JNee51lQ3vOxCk4l3ftXLFAYeJCiuGYf 1dDSqfainRcXGaxdHKO625LOh8p2rKlXSOJdsrlRdB4fRvoaM4112GlXjz78GacC9aOYy+Wvq46 k6a9xEyLwKX2OWCuYYySnqWkHwBRXCcs4sV3/+MYQO0Ag== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id 49e833447113b149; Sun, 23 Aug 2026 07:15:42 +0000 X-Mizu-Trace-ID: 49e833447113b149 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 15:15:01 +0800 Subject: [PATCH v2 5/5] docs/zh_CN: remove empty proofreader field from maintainer PGP guide Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-maintainer-pgp-guide-v2-5-bea33b2ece54@wyuan.org> References: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> In-Reply-To: <20260823-maintainer-pgp-guide-v2-0-bea33b2ece54@wyuan.org> To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Konstantin Ryabitsev Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev Remove the empty proofreader metadata field from the Chinese translation of the maintainer PGP guide. Signed-off-by: Weijie Yuan --- Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst | 3 --- 1 file changed, 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 79f8de3c1f5e..4ed311cf7d8a 100644 --- a/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst +++ b/Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst @@ -7,9 +7,6 @@ =20 =E5=8F=B8=E5=BB=B6=E8=85=BE Yanteng Si =20 -:=E6=A0=A1=E8=AF=91: - - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E5=86=85=E6=A0=B8=E7=BB=B4=E6=8A=A4=E8=80=85 PGP =E6=8C=87=E5=8D=97 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.55.0.822.g20453c30eb