Browse code

verification: apply few more hints

- remove cruft
- use macOS everywhere
- link signing-keys page

traumschule authored on 30/08/2018 12:25:04
Showing 1 changed files
... ...
@@ -156,7 +156,7 @@
156 156
 
157 157
    <p><span class="hint">Choose your operating system:</span>
158 158
    <label for="ac-2-1"><a name="KeyWindows">&#9658; Windows</a></label>
159
-   <label for="ac-2-2"><a name="KeyMacOS">&#9658; Mac OS X</a></label>
159
+   <label for="ac-2-2"><a name="KeyMacOS">&#9658; macOS</a></label>
160 160
    <label for="ac-2-3"><a name="KeyLinux">&#9658; Linux</a></label>
161 161
    </p>
162 162
 <!-- Windows -->
... ...
@@ -186,11 +186,11 @@
186 186
     <p>
187 187
    </article>
188 188
   </div>
189
-<!-- MacOS -->
189
+<!-- macOS -->
190 190
   <div>
191 191
    <input id="ac-2-2" name="accordion-2" type="radio" />
192 192
    <article class="ac-os">
193
-    <h3>Import OpenPGP key on Mac OS</h3>
193
+    <h3>Import OpenPGP key on macOS</h3>
194 194
     <p>
195 195
     You need to have GnuPG installed before you can verify
196 196
     signatures. Install it from
... ...
@@ -270,7 +270,7 @@ sub   rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12]
270 270
   <article class="ac-box">
271 271
    <p><span class="hint">Choose your operating system:</span>
272 272
    <label for="ac-3-1"><a name="VerifyWindows">&#9658; Windows</a></label>
273
-   <label for="ac-3-2"><a name="VerifyMacOS">&#9658; Mac OS X</a></label>
273
+   <label for="ac-3-2"><a name="VerifyMacOS">&#9658; macOS</a></label>
274 274
    <label for="ac-3-3"><a name="VerifyLinux">&#9658; Linux</a></label>
275 275
    </p>
276 276
    <p>
... ...
@@ -305,11 +305,11 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
305 305
     </pre>
306 306
    </article>
307 307
   </div>
308
-<!-- MacOS -->
308
+<!-- macOS -->
309 309
   <div>
310 310
    <input id="ac-3-2" name="accordion-3" type="radio" />
311 311
    <article class="ac-os">
312
-    <h3>Verify with OpenPGP signature on Mac OS</h3>
312
+    <h3>Verify with OpenPGP signature on macOS</h3>
313 313
     <p>
314 314
     To verify the signature of the package you downloaded, you will need
315 315
     to download the ".asc" file as well. Assuming you downloaded the
... ...
@@ -317,8 +317,8 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
317 317
     </p>
318 318
 
319 319
     <p>
320
-    The easiest way to verify an "asc" file is to open it by double-clicking
321
-    on it, or using the keying command-O. Alternatively type into the terminal:
320
+    The easiest way to verify an ".asc" file is to open it by double-clicking
321
+    on it (or using the keying command-O), better type into the terminal:
322 322
     </p>
323 323
 
324 324
     <pre>
... ...
@@ -393,8 +393,10 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
393 393
     Notice that there is a warning because you haven't assigned a trust
394 394
     index to this person. This means that GnuPG verified that the key made
395 395
     that signature, but it's up to you to decide if that key really belongs
396
-    to the developer. As international travel to meet the developer might be
397
-    unfeasable you are left with trusting other people who signed this key.
396
+    to the developer. Since international travel to meet the developer might be
397
+    unfeasable you can ignore this warning or try to use another device or
398
+    another internet connection to compare the key fingerprints listed
399
+    <a href="<page doc/signing-keys>">here</a>.
398 400
     </p>
399 401
 
400 402
     <p>To learn more about GnuPG see
... ...
@@ -460,10 +462,6 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
460 462
 
461 463
     <label for="ac-4-1"><a name="ChecksumsWindows">&#9658; Windows</a></label>
462 464
    </span>
463
-   <!--<span>
464
-   <input id="ac-4-2" name="accordion-4" type="radio" />
465
-   <label for="ac-4-2"><a name="ChecksumMacOS">MacOS</a></label>
466
-   </span>-->
467 465
    <span>
468 466
     <label for="ac-4-3"><a name="ChecksumsLinux">&#9658; Linux</a></label>
469 467
    </span>
... ...
@@ -473,9 +471,6 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
473 471
   <div>
474 472
     <input id="ac-4-1" name="accordion-4" type="radio" checked />
475 473
    <article class="ac-os">
476
-    <!--<pre id="ttb-key">
477
-    > gpg.exe --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290
478
-    </pre>-->
479 474
     <h3>Verififcation with a checksum on Windows</h3>
480 475
     <h4>Verify the signature of the checksum file</h4>
481 476
     <p>
... ...
@@ -513,21 +508,11 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
513 508
     </pre>
514 509
    </article>
515 510
   </div>
516
-<!-- Mac OS --><!--
517
- <div>
518
-   <article class="ac-os">
519
-     This process does not work on macOS yet due to Apple's codesigning requirement.
520
-   </article>
521
- </div>
522 511
 
523 512
 <!-- Linux -->
524 513
   <div>
525 514
    <input id="ac-4-3" name="accordion-4" type="radio" />
526 515
    <article class="ac-os ac-4-3">
527
-    <!--<pre id="ttb-key">
528
-    $ gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290
529
-    </pre>-->
530 516
     <h3>Verififcation with a checksum on Linux</h3>
531 517
     <h4>Verify the signature of the checksum file</h4>
532 518
     <ul>