Merge branch 'pu/legacy-keyring-warning' into 'main'

Warn if the legacy trusted.gpg keyring is used for verification

See merge request apt-team/apt!209

1 files changed, 2 insertions, 2 deletions

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 6167a7826..5f2701e0c 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -202,14 +202,14 @@
 
 <para>If your existing use of <command>apt-key add</command> looks like this:</para>
 <para><literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add -</literal></para>
-<para>Then you can directly replace this with:</para>
+<para>Then you can directly replace this with (though note the recommendation below):</para>
 <para><literal>wget -qO- https://myrepo.example/myrepo.asc | sudo tee /etc/apt/trusted.gpg.d/myrepo.asc</literal></para>
 <para>Make sure to use the "<literal>asc</literal>" extension for ASCII armored
 keys and the "<literal>gpg</literal>" extension for the binary OpenPGP
 format (also known as "GPG key public ring"). The binary OpenPGP format works
 for all apt versions, while the ASCII armored format works for apt version >=
 1.4.</para>
-<para>Instead of placing keys into the <filename>/etc/apt/trusted.gpg.d</filename>
+<para><emphasis>Recommended:</emphasis> Instead of placing keys into the <filename>/etc/apt/trusted.gpg.d</filename>
 directory, you can place them anywhere on your filesystem by using the
 <literal>Signed-By</literal> option in your <literal>sources.list</literal> and
 pointing to the filename of the key. See &sources-list; for details.