Update downlad signature verification with new builder keys location

Author: darosior

_includes/templates/download.html

@@ -16,13 +16,11 @@
 {% capture SHORT_BUILDER_KEY %}
   {{example_builder_key | slice: 0, 4}}  {{ 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}}
+    replace: '$(EXAMPLE_BUILDER_KEY_FILE)', page.example_builder_key_file}}
 {% endcapture %}
 
 {% assign GPG_DOWNLOAD_URL = "https://www.gnupg.org/download/index.en.html#binary" %}
@@ -157,7 +155,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
 
       <li>{{OBTAIN_RELEASE_KEY}}
 
-        <pre class="highlight"><code>{{GPG}}{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
+        <pre class="highlight"><code>{{GPG}} --import {{page.example_builder_key_file}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>
 
@@ -205,7 +203,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
 
       <li>{{OBTAIN_RELEASE_KEY}}
 
-        <pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
+        <pre class="highlight"><code>gpg --import {{page.example_builder_key_file}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>
 
@@ -247,7 +245,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
 
       <li>{{OBTAIN_RELEASE_KEY}}
 
-        <pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
+        <pre class="highlight"><code>gpg --import {{page.example_builder_key_file}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>
 

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

@@ -80,19 +80,20 @@ verify_download_checksum: "Verify that the checksum of the release file is liste
 checksum_warning_and_ok: 'In the output produced by the above command, you can safely ignore any warnings and failures, but you must ensure the output lists "$(SHASUMS_OK)" after the name of the release file you downloaded.  For example:'
 
 example_builders_line: "E777299FC265DD04793070EB944D35F9AC3DB76A Michael Ford (fanquake)"
-builder_keys_url: "https://github.com/bitcoin/bitcoin/tree/master/contrib/builder-keys"
+builder_keys_url: "https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys"
+example_builder_key_file: "fanquake.gpg"
 
 obtain_release_key: >
   <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
+  href='$(BUILDER_KEYS_URL)'>bitcoin-core/guix.sigs repository</a>, which you can then load
   into your GPG key database.</p>
 
-  <p>For example, given the <a href='$(BUILDER_KEYS_TXT_URL)'><code>
-  builder-keys/keys.txt</code></a> line
-  <code>$(EXAMPLE_BUILDERS_LINE)</code>you could load that
-  key using this command:</p>
+  <p>For example, you could load the key <a
+  href='$(BUILDER_KEYS_URL)/$(EXAMPLE_BUILDER_KEY_FILE)'><code>
+  builder-keys/$(EXAMPLE_BUILDER_KEY_FILE)</code></a> by downloading the file as <code>
+  $(EXAMPLE_BUILDER_KEY_FILE)</code> and using this command:</p>
 
 choosing_builders: >
   It is recommended that you choose a few individuals from this list who you find