From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 13 Feb 2016 10:15:41 +0000 (+0100)
Subject: Merge pull request #2589 from keszybz/resolve-tool-2
X-Git-Tag: v230~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ba5ac7d0196074863ff08f5251689d324a6550;p=thirdparty%2Fsystemd.git

Merge pull request #2589 from keszybz/resolve-tool-2

Better support of OPENPGPKEY, CAA, TLSA packets and tests
---

91ba5ac7d0196074863ff08f5251689d324a6550
diff --cc man/systemd-resolve.xml
index 3779698be3b,0defa2d7fbb..802d9cbbe69
--- a/man/systemd-resolve.xml
+++ b/man/systemd-resolve.xml
@@@ -114,8 -121,12 +121,12 @@@
      is assumed to be a domain name, that is already prefixed with an SRV type, and an SRV lookup is done (no
      TXT).</para>
  
+     <para>The <option>--openpgp</option> switch may be use to query PGP keys stored as the
+     <ulink url="https://tools.ietf.org/html/draft-wouters-dane-openpgp-02">OPENPGPKEY</ulink> resource records.
+     When this option is specified one or more e-mail address must be specified.</para>
+ 
      <para>The <option>--statistics</option> switch may be used to show resolver statistics, including information about
 -    the number of succesful and failed DNSSEC validations.</para>
 +    the number of successful and failed DNSSEC validations.</para>
  
      <para>The <option>--reset-statistics</option> may be used to reset various statistics counters maintained the
      resolver, including those shown in the <option>--statistics</option> output. This operation requires root