Clean up obtain_release_key and add keys.txt link

Author: jamesob

_includes/templates/download.html

@@ -10,6 +10,15 @@
 {% capture FILE_PREFIX %}bitcoin-{{CURRENT_RELEASE}}{% endcapture %}
 {% capture SIGNING_KEY_FINGERPRINT_EXPLODED %}{% include fingerprint-split.html hex=page.example_builder_key %}{% endcapture %}
 {% capture SHORT_BUILDER_KEY %}{{page.example_builder_key | slice: 0, 4}}  {{ page.example_builder_key | slice: 4, 4 }}...{% endcapture %}
+{% capture BUILDER_KEYS_TXT_URL %}{{page.builder_keys_url}}/keys.txt{% endcapture %}
+
+{% capture OBTAIN_RELEASE_KEY %}
+  {{page.obtain_release_key | 
+    replace: '$(BUILDER_KEYS_URL)', page.builder_keys_url | 
+    replace: '$(EXAMPLE_BUILDERS_LINE)', page.example_builders_line | 
+    replace: '$(BUILDER_KEYS_TXT_URL)', BUILDER_KEYS_TXT_URL}}
+{% endcapture %}
+
 {% assign GPG_DOWNLOAD_URL = "https://www.gnupg.org/download/index.en.html#binary" %}
 {% assign GPG_MACOS_DOWNLOAD_URL = "https://gpgtools.org/" %}
 {% assign GPG_WINDOWS_DOWNLOAD_URL = "https://gpg4win.org/download.html" %}
@@ -123,7 +132,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
       {{page.gpg_download_other}}
       <a href="{{GPG_DOWNLOAD_URL}}">{{page.gpg_download_options}}</a></p></li>
 
-      <li><p>{{page.obtain_release_key | replace: '$(BUILDER_KEYS_URL)', page.builder_keys_url | replace: '$(EXAMPLE_BUILDERS_LINE)', page.example_builders_line}}</p>
+      <li><p>{{OBTAIN_RELEASE_KEY}}</p>
 
         <pre class="highlight"><code>{{GPG}}{{site.strings.gpg_keyserver}} --recv-keys {{page.example_builder_key}}</code></pre>
 

_posts/en/pages/2017-01-01-download.md

@@ -84,13 +84,16 @@ example_builders_line: "E777299FC265DD04793070EB944D35F9AC3DB76A Michael Ford (f
 builder_keys_url: "https://github.com/bitcoin/bitcoin/tree/master/contrib/builder-keys"
 
 obtain_release_key: >
-  Bitcoin releases are signed by a number of individuals, each with a unique public
+  <p>Bitcoin releases are signed by a number of individuals, each with a unique public
   key. In order to recognize the validity of signatures, you must use GPG to load these
   public keys locally. You can find many developer keys listed in the <a
   href='$(BUILDER_KEYS_URL)'>bitcoin/bitcoin repository</a>, which you can then load
-  into your GPG key database. For example, if you saw the line <pre
-  class='highlight'><code>$(EXAMPLE_BUILDERS_LINE)</code></pre>you could load that key
-  using this command:
+  into your GPG key database.</p>
+
+  <p>For example, given the <a href='$(BUILDER_KEYS_TXT_URL)'><code>
+  builders-key/keys.txt</code></a> line
+  <pre class='highlight'><code>$(EXAMPLE_BUILDERS_LINE)</code></pre>you could load that
+  key using this command:</p>
 
 choosing_builders: >
   It is recommended that you choose a few individuals from this list who you find