docs/CONTAINER_INTERFACE.md

@@ -336,7 +336,7 @@ care should be taken to avoid naming conflicts. `systemd` (and in particular
    actual attempt to make use of the audit subsystem will fail. Note that
    systemd's audit support is partially conditioned on these capabilities, thus
    by dropping them you ensure that you get an entirely clean boot, as systemd
-   will make no attempt to use it. If you pass the capabilities to the payload
+   will make no attempt to use it. If you pass the capabilites to the payload
    systemd will assume that audit is available and works, and some components
    will subsequently fail in various ways. Note that once the kernel learnt
    native support for container-virtualized audit, adding the capability to the

src/core/bpf/socket_bind/socket-bind-api.bpf.h

@@ -18,7 +18,7 @@
  * are matched by ports.
  * nr_ports and port_min fields specify a set of ports to match a user port
  * with.
- * If nr_ports is 0, matching by port is bypassed, making that rule applicable
+ * If nr_ports is 0, maching by port is bypassed, making that rule applicable
  * for all possible ports, e.g. [1, 65535] range. Thus a rule with
  * address_family and nr_ports equal to AF_UNSPEC and 0 correspondingly forms
  * 'allow any' or 'deny any' cases.

src/hostname/hostnamectl.c

@@ -158,10 +158,17 @@ static int print_status_info(StatusInfo *i) {
         }
 
         if (!isempty(i->os_pretty_name)) {
+                _cleanup_free_ char *formatted = NULL;
+                const char *t = i->os_pretty_name;
+
+                if (i->home_url) {
+                        if (terminal_urlify(i->home_url, i->os_pretty_name, &formatted) >= 0)
+                                t = formatted;
+                }
+
                 r = table_add_many(table,
                                    TABLE_STRING, "Operating System:",
-                                   TABLE_STRING, i->os_pretty_name,
-                                   TABLE_SET_URL, i->home_url);
+                                   TABLE_STRING, t);
                 if (r < 0)
                         return table_log_add_error(r);
         }