compatibility.md: Fix/Update Debian terminology

Debian doesn't have an 'armhl' architecture, but it does have 'armhf'
which I assume was meant.

In the Debian repository section, I replaced 'distro' with 'release' as
the distro is part of the url and the correct word for that part is
release. Also updated that in the Ubuntu section.
Added 'contrib' to the section list to make it complete and software in
contrib is Free Software itself (but depends on non-free software).

As oldstable and newer are supported, I updated the examples to use the
current oldstable and stable.

1 files changed, 13 insertions, 13 deletions

diff --git a/builds.sr.ht/compatibility.md b/builds.sr.ht/compatibility.md
index 5aed028..d0acb9e 100644
--- a/builds.sr.ht/compatibility.md
+++ b/builds.sr.ht/compatibility.md
@@ -281,7 +281,7 @@ See also: [upstream releases](https://www.debian.org/releases/)
       <td>weekly</td>
     </tr>
     <tr><td><code>arch: armel</code></td><td style="text-align: center"></td><td></td><td></td></tr>
-    <tr><td><code>arch: armhl</code></td><td style="text-align: center"></td><td></td><td></td></tr>
+    <tr><td><code>arch: armhf</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: i386</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips64el</code></td><td style="text-align: center"></td><td></td><td></td></tr>
@@ -316,7 +316,7 @@ See also: [upstream releases](https://www.debian.org/releases/)
       <td>daily</td>
     </tr>
     <tr><td><code>arch: armel</code></td><td style="text-align: center"></td><td></td><td></td></tr>
-    <tr><td><code>arch: armhl</code></td><td style="text-align: center"></td><td></td><td></td></tr>
+    <tr><td><code>arch: armhf</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: i386</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips64el</code></td><td style="text-align: center"></td><td></td><td></td></tr>
@@ -356,7 +356,7 @@ See also: [upstream releases](https://www.debian.org/releases/)
       <td>daily</td>
     </tr>
     <tr><td><code>arch: armel</code></td><td style="text-align: center"></td><td></td><td></td></tr>
-    <tr><td><code>arch: armhl</code></td><td style="text-align: center"></td><td></td><td></td></tr>
+    <tr><td><code>arch: armhf</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: i386</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips64el</code></td><td style="text-align: center"></td><td></td><td></td></tr>
@@ -391,7 +391,7 @@ See also: [upstream releases](https://www.debian.org/releases/)
       <td>manually</td>
     </tr>
     <tr><td><code>arch: armel</code></td><td style="text-align: center"></td><td></td><td></td></tr>
-    <tr><td><code>arch: armhl</code></td><td style="text-align: center"></td><td></td><td></td></tr>
+    <tr><td><code>arch: armhf</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: i386</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips</code></td><td style="text-align: center"></td><td></td><td></td></tr>
     <tr><td><code>arch: mips64el</code></td><td style="text-align: center"></td><td></td><td></td></tr>
@@ -407,14 +407,14 @@ The packages array is installed with `apt-get install`.
 
 **repositories**
 
-To add custom repositories, specify `url distro component key-id` (separated by
-spaces), where `url` is the URL of the package repository, `distro` is e.g.
-`jessie` or `stretch`, `component` is e.g. `main` or `non-free`, and `key-id` is
-an optional PGP key ID to add to the system keyring. Example:
+To add custom repositories, specify `url release component key-id` (separated by
+spaces), where `url` is the URL of the package repository, `release` is e.g.
+`buster` or `bullseye`, `component` is e.g. `main`, `contrib` or `non-free`, and
+`key-id` is an optional PGP key ID to add to the system keyring. Example:
 
 ```yaml
 repositories:
-  sr.ht: https://mirror.sr.ht/debian/sr.ht/ stretch main DEADBEEFCAFEF00D
+  sr.ht: https://mirror.sr.ht/debian/sr.ht/ bullseye main DEADBEEFCAFEF00D
 ```
 
 ## Fedora
@@ -1132,10 +1132,10 @@ The packages array is installed with `apt-get install`.
 
 **repositories**
 
-To add custom repositories, specify `url distro component key-id` (separated by
-spaces), where `url` is the URL of the package repository, `distro` is e.g.
-`bionic` or `cosmic`, `component` is e.g. `main` or `non-free`, and `key-id` is
-an optional PGP key ID to add to the system keyring. Example:
+To add custom repositories, specify `url release component key-id` (separated by
+spaces), where `url` is the URL of the package repository, `release` is e.g.
+`bionic` or `cosmic`, `component` is e.g. `main`, `contrib` or `non-free`, and
+`key-id` is an optional PGP key ID to add to the system keyring. Example:
 
 ```yaml
 repositories: