From 46debf3d498e9e3f7000a9da3d162c5612c3ac3a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 5 Feb 2020 20:46:46 +0100
Subject: [PATCH] wkd: mention that subdomains are available upon request in
 the checker

---
 dist/templates/about/usage.html.hbs         | 5 ++++-
 templates-untranslated/about/usage.html.hbs | 5 ++++-
 wkd-domain-checker/wkd-domain-checker.py    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dist/templates/about/usage.html.hbs b/dist/templates/about/usage.html.hbs
index 0272311..fcda05b 100644
--- a/dist/templates/about/usage.html.hbs
+++ b/dist/templates/about/usage.html.hbs
@@ -156,7 +156,10 @@
 
     <h2 style="padding-left: 3%;" id="wkd-as-a-service"><a style="color: #050505;" href="#wkd-as-a-service">WKD as a Service</a></h2>
 
-    <p> <span class="brand">keys.openpgp.org</span> can be used as a managed Web Key Directory (WKD) service for any domain.
+    <p> The Web Key Directory (WKD) is a standard for discovery of OpenPGP keys by email address, via the domain of its email provider.
+        It is used to discover unknown keys in some email clients, such as <a href="https://www.gpg4win.de/about.html" target="_blank">GpgOL</a>.
+
+    <p> <span class="brand">keys.openpgp.org</span> can be used as a managed WKD service for any domain.
         To do so, the domain simply needs a <tt>CNAME</tt> record that delegates its <tt>openpgpkey</tt> subdomain to <tt>wkd.keys.openpgp.org</tt>.
         It should be possible to do this in the web interface of any DNS hoster.
 
diff --git a/templates-untranslated/about/usage.html.hbs b/templates-untranslated/about/usage.html.hbs
index e3610cc..29e9776 100644
--- a/templates-untranslated/about/usage.html.hbs
+++ b/templates-untranslated/about/usage.html.hbs
@@ -155,7 +155,10 @@
 
     <h2 style="padding-left: 3%;" id="wkd-as-a-service"><a style="color: #050505;" href="#wkd-as-a-service">WKD as a Service</a></h2>
 
-    <p> <span class="brand">keys.openpgp.org</span> can be used as a managed Web Key Directory (WKD) service for any domain.
+    <p> The Web Key Directory (WKD) is a standard for discovery of OpenPGP keys by email address, via the domain of its email provider.
+        It is used to discover unknown keys in some email clients, such as <a href="https://www.gpg4win.de/about.html" target="_blank">GpgOL</a>.
+
+    <p> <span class="brand">keys.openpgp.org</span> can be used as a managed WKD service for any domain.
         To do so, the domain simply needs a <tt>CNAME</tt> record that delegates its <tt>openpgpkey</tt> subdomain to <tt>wkd.keys.openpgp.org</tt>.
         It should be possible to do this in the web interface of any DNS hoster.
 
diff --git a/wkd-domain-checker/wkd-domain-checker.py b/wkd-domain-checker/wkd-domain-checker.py
index b850b7e..97c2587 100644
--- a/wkd-domain-checker/wkd-domain-checker.py
+++ b/wkd-domain-checker/wkd-domain-checker.py
@@ -44,7 +44,7 @@ def check_domain(domain):
         return 'domain must have "openpgpkey" prefix\n', 400
 
     if domain != ("openpgpkey." + get_sld(domain)):
-        return 'domain must not be a subdomain!\n', 400
+        return 'subdomains can only be used upon request. send an email to <tt>support at keys dot openpgp dot org</tt>\n', 400
 
     req = requests.get(
         'https://cloudflare-dns.com/dns-query',