man: condense version information for functions

Use a more compact form like 'a, b, and c were added in version x'

100 files changed, 448 insertions, 447 deletions

diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index f429ed3c7f..4021b8844b 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -269,13 +269,13 @@ int main(int argc, char **argv) {
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_id128_equal()</function> was added in version 252.</para>
-    <para><function>sd_id128_in_set()</function> was added in version 252.</para>
-    <para><function>sd_id128_in_set_sentinel()</function> was added in version 252.</para>
-    <para><function>sd_id128_in_setv()</function> was added in version 252.</para>
-    <para><function>sd_id128_is_allf()</function> was added in version 252.</para>
-    <para><function>sd_id128_is_null()</function> was added in version 252.</para>
-    <para><function>sd_id128_string_equal()</function> was added in version 252.</para>
+    <para><function>sd_id128_equal()</function>,
+    <function>sd_id128_string_equal()</function>,
+    <function>sd_id128_is_null()</function>,
+    <function>sd_id128_is_allf()</function>,
+    <function>sd_id128_in_setv()</function>,
+    <function>sd_id128_in_set_sentinel()</function>, and
+    <function>sd_id128_in_set()</function> were added in version 252.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_add_match.xml b/man/sd_bus_add_match.xml
index 80fc849485..15376d4ce2 100644
--- a/man/sd_bus_add_match.xml
+++ b/man/sd_bus_add_match.xml
@@ -155,10 +155,11 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_add_match()</function> was added in version 231.</para>
-    <para><function>sd_bus_add_match_async()</function> was added in version 237.</para>
-    <para><function>sd_bus_match_signal()</function> was added in version 237.</para>
-    <para><function>sd_bus_match_signal_async()</function> was added in version 237.</para>
+    <para><function>sd_bus_add_match()</function> and
+    <function>sd_bus_message_handler_t()</function> were added in version 231.</para>
+    <para><function>sd_bus_add_match_async()</function>,
+    <function>sd_bus_match_signal()</function>, and
+    <function>sd_bus_match_signal_async()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_add_node_enumerator.xml b/man/sd_bus_add_node_enumerator.xml
index 8afa0435a3..f97746c677 100644
--- a/man/sd_bus_add_node_enumerator.xml
+++ b/man/sd_bus_add_node_enumerator.xml
@@ -135,7 +135,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_add_node_enumerator()</function> was added in version 246.</para>
+    <para><function>sd_bus_node_enumerator_t()</function> and
+    <function>sd_bus_add_node_enumerator()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_add_object.xml b/man/sd_bus_add_object.xml
index c757f80912..db667e3aee 100644
--- a/man/sd_bus_add_object.xml
+++ b/man/sd_bus_add_object.xml
@@ -723,11 +723,14 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_add_fallback()</function> was added in version 246.</para>
-    <para><function>sd_bus_add_fallback_vtable()</function> was added in version 246.</para>
-    <para><function>sd_bus_add_filter()</function> was added in version 246.</para>
-    <para><function>sd_bus_add_object()</function> was added in version 246.</para>
-    <para><function>sd_bus_add_object_vtable()</function> was added in version 246.</para>
+    <para><function>sd_bus_property_get_t()</function>,
+    <function>sd_bus_property_set_t()</function>,
+    <function>sd_bus_object_find_t()</function>,
+    <function>sd_bus_add_object()</function>,
+    <function>sd_bus_add_fallback()</function>,
+    <function>sd_bus_add_object_vtable()</function>,
+    <function>sd_bus_add_fallback_vtable()</function>, and
+    <function>sd_bus_add_filter()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_attach_event.xml b/man/sd_bus_attach_event.xml
index 42b5572411..979783cc9c 100644
--- a/man/sd_bus_attach_event.xml
+++ b/man/sd_bus_attach_event.xml
@@ -104,9 +104,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_attach_event()</function> was added in version 240.</para>
-    <para><function>sd_bus_detach_event()</function> was added in version 240.</para>
-    <para><function>sd_bus_get_event()</function> was added in version 240.</para>
+    <para><function>sd_bus_attach_event()</function>,
+    <function>sd_bus_detach_event()</function>, and
+    <function>sd_bus_get_event()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_call.xml b/man/sd_bus_call.xml
index 862f65526d..0bd863d604 100644
--- a/man/sd_bus_call.xml
+++ b/man/sd_bus_call.xml
@@ -199,8 +199,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_call()</function> was added in version 246.</para>
-    <para><function>sd_bus_call_async()</function> was added in version 246.</para>
+    <para><function>sd_bus_call()</function> and
+    <function>sd_bus_call_async()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_call_method.xml b/man/sd_bus_call_method.xml
index 9fce59074c..f25c8c7b41 100644
--- a/man/sd_bus_call_method.xml
+++ b/man/sd_bus_call_method.xml
@@ -141,10 +141,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_call_method()</function> was added in version 246.</para>
-    <para><function>sd_bus_call_method_async()</function> was added in version 246.</para>
-    <para><function>sd_bus_call_method_asyncv()</function> was added in version 246.</para>
-    <para><function>sd_bus_call_methodv()</function> was added in version 246.</para>
+    <para><function>sd_bus_call_method()</function>,
+    <function>sd_bus_call_methodv()</function>,
+    <function>sd_bus_call_method_async()</function>, and
+    <function>sd_bus_call_method_asyncv()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_close.xml b/man/sd_bus_close.xml
index 7ad2b5a29e..997e67bf4f 100644
--- a/man/sd_bus_close.xml
+++ b/man/sd_bus_close.xml
@@ -107,8 +107,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_close()</function> was added in version 240.</para>
-    <para><function>sd_bus_flush()</function> was added in version 240.</para>
+    <para><function>sd_bus_close()</function> and
+    <function>sd_bus_flush()</function> were added in version 240.</para>
     <para><function>sd_bus_default_flush_close()</function> was added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 5346c01309..66fcaa7253 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -509,39 +509,39 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_creds_get_audit_login_uid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_audit_session_id()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_cgroup()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_cmdline()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_comm()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_exe()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_gid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_owner_uid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_pid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_selinux_context()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_session()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_slice()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_tid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_tid_comm()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_unique_name()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_unit()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_user_unit()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_well_known_names()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_has_bounding_cap()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_has_effective_cap()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_has_inheritable_cap()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_has_permitted_cap()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_get_description()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_egid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_euid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_fsgid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_fsuid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_ppid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_sgid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_suid()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_supplementary_gids()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_tty()</function> was added in version 220.</para>
-    <para><function>sd_bus_creds_get_uid()</function> was added in version 220.</para>
+    <para><function>sd_bus_creds_get_pid()</function>,
+    <function>sd_bus_creds_get_tid()</function>,
+    <function>sd_bus_creds_get_gid()</function>,
+    <function>sd_bus_creds_get_comm()</function>,
+    <function>sd_bus_creds_get_tid_comm()</function>,
+    <function>sd_bus_creds_get_exe()</function>,
+    <function>sd_bus_creds_get_cmdline()</function>,
+    <function>sd_bus_creds_get_cgroup()</function>,
+    <function>sd_bus_creds_get_unit()</function>,
+    <function>sd_bus_creds_get_user_unit()</function>,
+    <function>sd_bus_creds_get_slice()</function>,
+    <function>sd_bus_creds_get_session()</function>,
+    <function>sd_bus_creds_get_owner_uid()</function>,
+    <function>sd_bus_creds_has_effective_cap()</function>,
+    <function>sd_bus_creds_has_permitted_cap()</function>,
+    <function>sd_bus_creds_has_inheritable_cap()</function>,
+    <function>sd_bus_creds_has_bounding_cap()</function>,
+    <function>sd_bus_creds_get_selinux_context()</function>,
+    <function>sd_bus_creds_get_audit_session_id()</function>,
+    <function>sd_bus_creds_get_audit_login_uid()</function>,
+    <function>sd_bus_creds_get_unique_name()</function>, and
+    <function>sd_bus_creds_get_well_known_names()</function> were added in version 209.</para>
+    <para><function>sd_bus_creds_get_ppid()</function>,
+    <function>sd_bus_creds_get_uid()</function>,
+    <function>sd_bus_creds_get_euid()</function>,
+    <function>sd_bus_creds_get_suid()</function>,
+    <function>sd_bus_creds_get_fsuid()</function>,
+    <function>sd_bus_creds_get_egid()</function>,
+    <function>sd_bus_creds_get_sgid()</function>,
+    <function>sd_bus_creds_get_fsgid()</function>,
+    <function>sd_bus_creds_get_supplementary_gids()</function>,
+    <function>sd_bus_creds_get_tty()</function>, and
+    <function>sd_bus_creds_get_description()</function> were added in version 220.</para>
     <para><function>sd_bus_creds_get_user_slice()</function> was added in version 223.</para>
   </refsect1>
 
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 5d77fe1891..239f996fa3 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -301,10 +301,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_creds_get_mask()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_new_from_pid()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_ref()</function> was added in version 209.</para>
-    <para><function>sd_bus_creds_unref()</function> was added in version 209.</para>
+    <para><function>sd_bus_creds_new_from_pid()</function>,
+    <function>sd_bus_creds_get_mask()</function>,
+    <function>sd_bus_creds_ref()</function>, and
+    <function>sd_bus_creds_unref()</function> were added in version 209.</para>
     <para><function>sd_bus_creds_get_augmented_mask()</function> was added in version 223.</para>
     <para><function>sd_bus_creds_unrefp()</function> was added in version 229.</para>
   </refsect1>
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 989af69966..05c438f9a5 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -334,17 +334,17 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_default()</function> was added in version 220.</para>
-    <para><function>sd_bus_default_system()</function> was added in version 220.</para>
-    <para><function>sd_bus_default_user()</function> was added in version 220.</para>
-    <para><function>sd_bus_open()</function> was added in version 220.</para>
-    <para><function>sd_bus_open_system()</function> was added in version 220.</para>
-    <para><function>sd_bus_open_system_machine()</function> was added in version 220.</para>
-    <para><function>sd_bus_open_system_remote()</function> was added in version 220.</para>
-    <para><function>sd_bus_open_user()</function> was added in version 220.</para>
-    <para><function>sd_bus_open_system_with_description()</function> was added in version 240.</para>
-    <para><function>sd_bus_open_user_with_description()</function> was added in version 240.</para>
-    <para><function>sd_bus_open_with_description()</function> was added in version 240.</para>
+    <para><function>sd_bus_default()</function>,
+    <function>sd_bus_default_user()</function>,
+    <function>sd_bus_default_system()</function>,
+    <function>sd_bus_open()</function>,
+    <function>sd_bus_open_user()</function>,
+    <function>sd_bus_open_system()</function>,
+    <function>sd_bus_open_system_remote()</function>, and
+    <function>sd_bus_open_system_machine()</function> were added in version 220.</para>
+    <para><function>sd_bus_open_with_description()</function>,
+    <function>sd_bus_open_user_with_description()</function>, and
+    <function>sd_bus_open_system_with_description()</function> were added in version 240.</para>
     <para><function>sd_bus_open_user_machine()</function> was added in version 248.</para>
   </refsect1>
 
diff --git a/man/sd_bus_emit_signal.xml b/man/sd_bus_emit_signal.xml
index 634feb2693..7444e1249c 100644
--- a/man/sd_bus_emit_signal.xml
+++ b/man/sd_bus_emit_signal.xml
@@ -269,18 +269,18 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_emit_interfaces_added()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_interfaces_added_strv()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_interfaces_removed()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_interfaces_removed_strv()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_object_added()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_object_removed()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_properties_changed()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_properties_changed_strv()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_signal()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_signalv()</function> was added in version 246.</para>
-    <para><function>sd_bus_emit_signal_to()</function> was added in version 253.</para>
-    <para><function>sd_bus_emit_signal_tov()</function> was added in version 253.</para>
+    <para><function>sd_bus_emit_signal()</function>,
+    <function>sd_bus_emit_signalv()</function>,
+    <function>sd_bus_emit_interfaces_added()</function>,
+    <function>sd_bus_emit_interfaces_added_strv()</function>,
+    <function>sd_bus_emit_interfaces_removed()</function>,
+    <function>sd_bus_emit_interfaces_removed_strv()</function>,
+    <function>sd_bus_emit_properties_changed()</function>,
+    <function>sd_bus_emit_properties_changed_strv()</function>,
+    <function>sd_bus_emit_object_added()</function>, and
+    <function>sd_bus_emit_object_removed()</function> were added in version 246.</para>
+    <para><function>sd_bus_emit_signal_to()</function> and
+    <function>sd_bus_emit_signal_tov()</function> were added in version 253.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 25d55ebffe..847051a6a2 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -394,16 +394,16 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_error_copy()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_free()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_get_errno()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_has_name()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_is_set()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_set()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_set_const()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_set_errno()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_set_errnof()</function> was added in version 209.</para>
-    <para><function>sd_bus_error_setf()</function> was added in version 209.</para>
+    <para><function>sd_bus_error_free()</function>,
+    <function>sd_bus_error_set()</function>,
+    <function>sd_bus_error_setf()</function>,
+    <function>sd_bus_error_set_const()</function>,
+    <function>sd_bus_error_set_errno()</function>,
+    <function>sd_bus_error_set_errnof()</function>,
+    <function>sd_bus_error_get_errno()</function>,
+    <function>sd_bus_error_copy()</function>,
+    <function>sd_bus_error_is_set()</function>, and
+    <function>sd_bus_error_has_name()</function> were added in version 209.</para>
     <para><function>sd_bus_error_set_errnofv()</function> was added in version 223.</para>
     <para><function>sd_bus_error_move()</function> was added in version 240.</para>
     <para><function>sd_bus_error_has_names_sentinel()</function> was added in version 247.</para>
diff --git a/man/sd_bus_get_current_handler.xml b/man/sd_bus_get_current_handler.xml
index 87e6e084a8..a1eefc1cc9 100644
--- a/man/sd_bus_get_current_handler.xml
+++ b/man/sd_bus_get_current_handler.xml
@@ -76,10 +76,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_current_handler()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_current_message()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_current_slot()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_current_userdata()</function> was added in version 246.</para>
+    <para><function>sd_bus_get_current_handler()</function>,
+    <function>sd_bus_get_current_message()</function>,
+    <function>sd_bus_get_current_slot()</function>, and
+    <function>sd_bus_get_current_userdata()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index 5dfdbcd5e1..5931527834 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -163,8 +163,8 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_get_fd()</function> was added in version 231.</para>
-    <para><function>sd_bus_get_events()</function> was added in version 240.</para>
-    <para><function>sd_bus_get_timeout()</function> was added in version 240.</para>
+    <para><function>sd_bus_get_events()</function> and
+    <function>sd_bus_get_timeout()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_n_queued_read.xml b/man/sd_bus_get_n_queued_read.xml
index 7f647558e5..e37b54c42a 100644
--- a/man/sd_bus_get_n_queued_read.xml
+++ b/man/sd_bus_get_n_queued_read.xml
@@ -87,8 +87,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_n_queued_read()</function> was added in version 238.</para>
-    <para><function>sd_bus_get_n_queued_write()</function> was added in version 238.</para>
+    <para><function>sd_bus_get_n_queued_read()</function> and
+    <function>sd_bus_get_n_queued_write()</function> were added in version 238.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_name_creds.xml b/man/sd_bus_get_name_creds.xml
index 18fb49a453..d7531af92c 100644
--- a/man/sd_bus_get_name_creds.xml
+++ b/man/sd_bus_get_name_creds.xml
@@ -121,8 +121,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_name_creds()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_owner_creds()</function> was added in version 246.</para>
+    <para><function>sd_bus_get_name_creds()</function> and
+    <function>sd_bus_get_owner_creds()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_interface_name_is_valid.xml b/man/sd_bus_interface_name_is_valid.xml
index 772e75913b..bd526a1b22 100644
--- a/man/sd_bus_interface_name_is_valid.xml
+++ b/man/sd_bus_interface_name_is_valid.xml
@@ -89,10 +89,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_interface_name_is_valid()</function> was added in version 246.</para>
-    <para><function>sd_bus_member_name_is_valid()</function> was added in version 246.</para>
-    <para><function>sd_bus_object_path_is_valid()</function> was added in version 246.</para>
-    <para><function>sd_bus_service_name_is_valid()</function> was added in version 246.</para>
+    <para><function>sd_bus_interface_name_is_valid()</function>,
+    <function>sd_bus_service_name_is_valid()</function>,
+    <function>sd_bus_member_name_is_valid()</function>, and
+    <function>sd_bus_object_path_is_valid()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml
index 07d1e9b59f..586d1f671b 100644
--- a/man/sd_bus_is_open.xml
+++ b/man/sd_bus_is_open.xml
@@ -93,8 +93,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_is_open()</function> was added in version 237.</para>
-    <para><function>sd_bus_is_ready()</function> was added in version 237.</para>
+    <para><function>sd_bus_is_open()</function> and
+    <function>sd_bus_is_ready()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 3dcabe9fab..ee41bf4b96 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -96,8 +96,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_cookie()</function> was added in version 209.</para>
-    <para><function>sd_bus_message_get_reply_cookie()</function> was added in version 209.</para>
+    <para><function>sd_bus_message_get_cookie()</function> and
+    <function>sd_bus_message_get_reply_cookie()</function> were added in version 209.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index d34ac0cd33..2e7017a884 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -127,9 +127,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_monotonic_usec()</function> was added in version 209.</para>
-    <para><function>sd_bus_message_get_realtime_usec()</function> was added in version 209.</para>
-    <para><function>sd_bus_message_get_seqnum()</function> was added in version 209.</para>
+    <para><function>sd_bus_message_get_monotonic_usec()</function>,
+    <function>sd_bus_message_get_realtime_usec()</function>, and
+    <function>sd_bus_message_get_seqnum()</function> were added in version 209.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_get_signature.xml b/man/sd_bus_message_get_signature.xml
index 9f2028fbad..6eac36cf05 100644
--- a/man/sd_bus_message_get_signature.xml
+++ b/man/sd_bus_message_get_signature.xml
@@ -100,9 +100,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_signature()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_has_signature()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_is_empty()</function> was added in version 240.</para>
+    <para><function>sd_bus_message_get_signature()</function>,
+    <function>sd_bus_message_is_empty()</function>, and
+    <function>sd_bus_message_has_signature()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_get_type.xml b/man/sd_bus_message_get_type.xml
index 2fabb17ca0..b2edaa8e20 100644
--- a/man/sd_bus_message_get_type.xml
+++ b/man/sd_bus_message_get_type.xml
@@ -153,13 +153,13 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_type()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_is_method_call()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_is_method_error()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_is_signal()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_creds()</function> was added in version 246.</para>
-    <para><function>sd_bus_message_get_errno()</function> was added in version 246.</para>
-    <para><function>sd_bus_message_get_error()</function> was added in version 246.</para>
+    <para><function>sd_bus_message_get_type()</function>,
+    <function>sd_bus_message_is_signal()</function>,
+    <function>sd_bus_message_is_method_call()</function>, and
+    <function>sd_bus_message_is_method_error()</function> were added in version 240.</para>
+    <para><function>sd_bus_message_get_error()</function>,
+    <function>sd_bus_message_get_errno()</function>, and
+    <function>sd_bus_message_get_creds()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_new.xml b/man/sd_bus_message_new.xml
index 98b18e52f0..b9a6b2fe46 100644
--- a/man/sd_bus_message_new.xml
+++ b/man/sd_bus_message_new.xml
@@ -173,11 +173,11 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_bus()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_new()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_ref()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_unref()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_unrefp()</function> was added in version 240.</para>
+    <para><function>sd_bus_message_new()</function>,
+    <function>sd_bus_message_ref()</function>,
+    <function>sd_bus_message_unref()</function>,
+    <function>sd_bus_message_unrefp()</function>, and
+    <function>sd_bus_message_get_bus()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_new_method_call.xml b/man/sd_bus_message_new_method_call.xml
index 29666daa6c..5a29cb0b0e 100644
--- a/man/sd_bus_message_new_method_call.xml
+++ b/man/sd_bus_message_new_method_call.xml
@@ -159,8 +159,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_new_method_call()</function> was added in version 246.</para>
-    <para><function>sd_bus_message_new_method_return()</function> was added in version 246.</para>
+    <para><function>sd_bus_message_new_method_call()</function> and
+    <function>sd_bus_message_new_method_return()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_read.xml b/man/sd_bus_message_read.xml
index b00164b063..65497aa165 100644
--- a/man/sd_bus_message_read.xml
+++ b/man/sd_bus_message_read.xml
@@ -263,8 +263,8 @@ fd_copy = fcntl(fd, FD_DUPFD_CLOEXEC, 3);</programlisting>
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_read()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_readv()</function> was added in version 240.</para>
+    <para><function>sd_bus_message_read()</function> and
+    <function>sd_bus_message_readv()</function> were added in version 240.</para>
     <para><function>sd_bus_message_peek_type()</function> was added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_bus_message_set_destination.xml b/man/sd_bus_message_set_destination.xml
index 85ba88be3c..d8cff27275 100644
--- a/man/sd_bus_message_set_destination.xml
+++ b/man/sd_bus_message_set_destination.xml
@@ -139,13 +139,13 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_set_destination()</function> was added in version 237.</para>
-    <para><function>sd_bus_message_set_sender()</function> was added in version 237.</para>
-    <para><function>sd_bus_message_get_destination()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_interface()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_member()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_path()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_sender()</function> was added in version 240.</para>
+    <para><function>sd_bus_message_set_destination()</function> and
+    <function>sd_bus_message_set_sender()</function> were added in version 237.</para>
+    <para><function>sd_bus_message_get_destination()</function>,
+    <function>sd_bus_message_get_path()</function>,
+    <function>sd_bus_message_get_interface()</function>,
+    <function>sd_bus_message_get_member()</function>, and
+    <function>sd_bus_message_get_sender()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_set_expect_reply.xml b/man/sd_bus_message_set_expect_reply.xml
index 97438ee572..674b8841dd 100644
--- a/man/sd_bus_message_set_expect_reply.xml
+++ b/man/sd_bus_message_set_expect_reply.xml
@@ -137,12 +137,12 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_get_auto_start()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_expect_reply()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_set_auto_start()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_set_expect_reply()</function> was added in version 240.</para>
-    <para><function>sd_bus_message_get_allow_interactive_authorization()</function> was added in version 246.</para>
-    <para><function>sd_bus_message_set_allow_interactive_authorization()</function> was added in version 246.</para>
+    <para><function>sd_bus_message_set_expect_reply()</function>,
+    <function>sd_bus_message_get_expect_reply()</function>,
+    <function>sd_bus_message_set_auto_start()</function>, and
+    <function>sd_bus_message_get_auto_start()</function> were added in version 240.</para>
+    <para><function>sd_bus_message_set_allow_interactive_authorization()</function> and
+    <function>sd_bus_message_get_allow_interactive_authorization()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index fa02c1bd88..d7d3a51bde 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -153,9 +153,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_negotiate_creds()</function> was added in version 212.</para>
-    <para><function>sd_bus_negotiate_fds()</function> was added in version 212.</para>
-    <para><function>sd_bus_negotiate_timestamp()</function> was added in version 212.</para>
+    <para><function>sd_bus_negotiate_fds()</function>,
+    <function>sd_bus_negotiate_timestamp()</function>, and
+    <function>sd_bus_negotiate_creds()</function> were added in version 212.</para>
     <para><function>sd_bus_get_creds_mask()</function> was added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 1b4004786d..1e614813e3 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -184,14 +184,14 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_new()</function> was added in version 209.</para>
-    <para><function>sd_bus_ref()</function> was added in version 209.</para>
-    <para><function>sd_bus_unref()</function> was added in version 209.</para>
+    <para><function>sd_bus_new()</function>,
+    <function>sd_bus_ref()</function>, and
+    <function>sd_bus_unref()</function> were added in version 209.</para>
     <para><function>sd_bus_unrefp()</function> was added in version 229.</para>
-    <para><function>sd_bus_flush_close_unref()</function> was added in version 240.</para>
-    <para><function>sd_bus_flush_close_unrefp()</function> was added in version 240.</para>
-    <para><function>sd_bus_close_unref()</function> was added in version 241.</para>
-    <para><function>sd_bus_close_unrefp()</function> was added in version 241.</para>
+    <para><function>sd_bus_flush_close_unref()</function> and
+    <function>sd_bus_flush_close_unrefp()</function> were added in version 240.</para>
+    <para><function>sd_bus_close_unref()</function> and
+    <function>sd_bus_close_unrefp()</function> were added in version 241.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index f116c27fbb..e1b0dfc928 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -142,10 +142,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_path_decode()</function> was added in version 211.</para>
-    <para><function>sd_bus_path_encode()</function> was added in version 211.</para>
-    <para><function>sd_bus_path_decode_many()</function> was added in version 227.</para>
-    <para><function>sd_bus_path_encode_many()</function> was added in version 227.</para>
+    <para><function>sd_bus_path_encode()</function> and
+    <function>sd_bus_path_decode()</function> were added in version 211.</para>
+    <para><function>sd_bus_path_encode_many()</function> and
+    <function>sd_bus_path_decode_many()</function> were added in version 227.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_query_sender_creds.xml b/man/sd_bus_query_sender_creds.xml
index 63effb2367..52c1da3aa8 100644
--- a/man/sd_bus_query_sender_creds.xml
+++ b/man/sd_bus_query_sender_creds.xml
@@ -128,8 +128,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_query_sender_creds()</function> was added in version 246.</para>
-    <para><function>sd_bus_query_sender_privilege()</function> was added in version 246.</para>
+    <para><function>sd_bus_query_sender_creds()</function> and
+    <function>sd_bus_query_sender_privilege()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index c6fb84a9aa..4fa2e2043b 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -204,10 +204,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_release_name()</function> was added in version 209.</para>
-    <para><function>sd_bus_request_name()</function> was added in version 209.</para>
-    <para><function>sd_bus_release_name_async()</function> was added in version 237.</para>
-    <para><function>sd_bus_request_name_async()</function> was added in version 237.</para>
+    <para><function>sd_bus_request_name()</function> and
+    <function>sd_bus_release_name()</function> were added in version 209.</para>
+    <para><function>sd_bus_request_name_async()</function> and
+    <function>sd_bus_release_name_async()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_send.xml b/man/sd_bus_send.xml
index 164ff79cd9..0f2f90c41a 100644
--- a/man/sd_bus_send.xml
+++ b/man/sd_bus_send.xml
@@ -168,8 +168,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_send()</function> was added in version 246.</para>
-    <para><function>sd_bus_send_to()</function> was added in version 246.</para>
+    <para><function>sd_bus_send()</function> and
+    <function>sd_bus_send_to()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_address.xml b/man/sd_bus_set_address.xml
index 38106f0104..558349d6ae 100644
--- a/man/sd_bus_set_address.xml
+++ b/man/sd_bus_set_address.xml
@@ -184,9 +184,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_address()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_address()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_exec()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_address()</function>,
+    <function>sd_bus_get_address()</function>, and
+    <function>sd_bus_set_exec()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_close_on_exit.xml b/man/sd_bus_set_close_on_exit.xml
index 099846b38f..c467df843a 100644
--- a/man/sd_bus_set_close_on_exit.xml
+++ b/man/sd_bus_set_close_on_exit.xml
@@ -95,8 +95,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_close_on_exit()</function> was added in version 240.</para>
-    <para><function>sd_bus_set_close_on_exit()</function> was added in version 240.</para>
+    <para><function>sd_bus_set_close_on_exit()</function> and
+    <function>sd_bus_get_close_on_exit()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_connected_signal.xml b/man/sd_bus_set_connected_signal.xml
index 84ee520c55..c8e5c4404a 100644
--- a/man/sd_bus_set_connected_signal.xml
+++ b/man/sd_bus_set_connected_signal.xml
@@ -96,8 +96,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_connected_signal()</function> was added in version 237.</para>
-    <para><function>sd_bus_set_connected_signal()</function> was added in version 237.</para>
+    <para><function>sd_bus_set_connected_signal()</function> and
+    <function>sd_bus_get_connected_signal()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_description.xml b/man/sd_bus_set_description.xml
index 2978b21c66..0cc0ee77e9 100644
--- a/man/sd_bus_set_description.xml
+++ b/man/sd_bus_set_description.xml
@@ -239,17 +239,17 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_allow_interactive_authorization()</function> was added in version 240.</para>
-    <para><function>sd_bus_get_description()</function> was added in version 240.</para>
-    <para><function>sd_bus_set_allow_interactive_authorization()</function> was added in version 240.</para>
-    <para><function>sd_bus_set_anonymous()</function> was added in version 240.</para>
-    <para><function>sd_bus_set_description()</function> was added in version 240.</para>
-    <para><function>sd_bus_set_trusted()</function> was added in version 240.</para>
-    <para><function>sd_bus_get_scope()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_tid()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_unique_name()</function> was added in version 246.</para>
-    <para><function>sd_bus_is_anonymous()</function> was added in version 246.</para>
-    <para><function>sd_bus_is_trusted()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_description()</function>,
+    <function>sd_bus_get_description()</function>,
+    <function>sd_bus_set_anonymous()</function>,
+    <function>sd_bus_set_trusted()</function>,
+    <function>sd_bus_set_allow_interactive_authorization()</function>, and
+    <function>sd_bus_get_allow_interactive_authorization()</function> were added in version 240.</para>
+    <para><function>sd_bus_is_anonymous()</function>,
+    <function>sd_bus_is_trusted()</function>,
+    <function>sd_bus_get_scope()</function>,
+    <function>sd_bus_get_tid()</function>, and
+    <function>sd_bus_get_unique_name()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_exit_on_disconnect.xml b/man/sd_bus_set_exit_on_disconnect.xml
index 36cc490513..de4105b48f 100644
--- a/man/sd_bus_set_exit_on_disconnect.xml
+++ b/man/sd_bus_set_exit_on_disconnect.xml
@@ -108,8 +108,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_exit_on_disconnect()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_exit_on_disconnect()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_exit_on_disconnect()</function> and
+    <function>sd_bus_get_exit_on_disconnect()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_method_call_timeout.xml b/man/sd_bus_set_method_call_timeout.xml
index 06f579bdf9..293bbcb67d 100644
--- a/man/sd_bus_set_method_call_timeout.xml
+++ b/man/sd_bus_set_method_call_timeout.xml
@@ -96,8 +96,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_method_call_timeout()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_method_call_timeout()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_method_call_timeout()</function> and
+    <function>sd_bus_get_method_call_timeout()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_property.xml b/man/sd_bus_set_property.xml
index ae5b253cd6..2c39874224 100644
--- a/man/sd_bus_set_property.xml
+++ b/man/sd_bus_set_property.xml
@@ -162,12 +162,12 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_property()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_property_string()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_property_strv()</function> was added in version 246.</para>
-    <para><function>sd_bus_get_property_trivial()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_property()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_propertyv()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_property()</function>,
+    <function>sd_bus_set_propertyv()</function>,
+    <function>sd_bus_get_property()</function>,
+    <function>sd_bus_get_property_trivial()</function>,
+    <function>sd_bus_get_property_string()</function>, and
+    <function>sd_bus_get_property_strv()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_sender.xml b/man/sd_bus_set_sender.xml
index dc157e372f..e767df3cd9 100644
--- a/man/sd_bus_set_sender.xml
+++ b/man/sd_bus_set_sender.xml
@@ -92,8 +92,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_sender()</function> was added in version 237.</para>
-    <para><function>sd_bus_set_sender()</function> was added in version 237.</para>
+    <para><function>sd_bus_set_sender()</function> and
+    <function>sd_bus_get_sender()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_server.xml b/man/sd_bus_set_server.xml
index f67e8607c7..cfea163d4a 100644
--- a/man/sd_bus_set_server.xml
+++ b/man/sd_bus_set_server.xml
@@ -193,13 +193,13 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_bus_id()</function> was added in version 246.</para>
-    <para><function>sd_bus_is_bus_client()</function> was added in version 246.</para>
-    <para><function>sd_bus_is_monitor()</function> was added in version 246.</para>
-    <para><function>sd_bus_is_server()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_bus_client()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_monitor()</function> was added in version 246.</para>
-    <para><function>sd_bus_set_server()</function> was added in version 246.</para>
+    <para><function>sd_bus_set_server()</function>,
+    <function>sd_bus_is_server()</function>,
+    <function>sd_bus_get_bus_id()</function>,
+    <function>sd_bus_set_bus_client()</function>,
+    <function>sd_bus_is_bus_client()</function>,
+    <function>sd_bus_set_monitor()</function>, and
+    <function>sd_bus_is_monitor()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_set_watch_bind.xml b/man/sd_bus_set_watch_bind.xml
index 03a4f2db23..faf31550f4 100644
--- a/man/sd_bus_set_watch_bind.xml
+++ b/man/sd_bus_set_watch_bind.xml
@@ -102,8 +102,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_watch_bind()</function> was added in version 237.</para>
-    <para><function>sd_bus_set_watch_bind()</function> was added in version 237.</para>
+    <para><function>sd_bus_set_watch_bind()</function> and
+    <function>sd_bus_get_watch_bind()</function> were added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_get_bus.xml b/man/sd_bus_slot_get_bus.xml
index a6c91c7014..f24d944c57 100644
--- a/man/sd_bus_slot_get_bus.xml
+++ b/man/sd_bus_slot_get_bus.xml
@@ -80,10 +80,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_get_bus()</function> was added in version 246.</para>
-    <para><function>sd_bus_slot_get_current_handler()</function> was added in version 246.</para>
-    <para><function>sd_bus_slot_get_current_message()</function> was added in version 246.</para>
-    <para><function>sd_bus_slot_get_current_userdata()</function> was added in version 246.</para>
+    <para><function>sd_bus_slot_get_bus()</function>,
+    <function>sd_bus_slot_get_current_handler()</function>,
+    <function>sd_bus_slot_get_current_message()</function>, and
+    <function>sd_bus_slot_get_current_userdata()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_ref.xml b/man/sd_bus_slot_ref.xml
index 1923b1e015..055bf00976 100644
--- a/man/sd_bus_slot_ref.xml
+++ b/man/sd_bus_slot_ref.xml
@@ -81,9 +81,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_ref()</function> was added in version 240.</para>
-    <para><function>sd_bus_slot_unref()</function> was added in version 240.</para>
-    <para><function>sd_bus_slot_unrefp()</function> was added in version 240.</para>
+    <para><function>sd_bus_slot_ref()</function>,
+    <function>sd_bus_slot_unref()</function>, and
+    <function>sd_bus_slot_unrefp()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_set_description.xml b/man/sd_bus_slot_set_description.xml
index 9f4f6b57da..b24f8e1773 100644
--- a/man/sd_bus_slot_set_description.xml
+++ b/man/sd_bus_slot_set_description.xml
@@ -93,8 +93,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_get_description()</function> was added in version 240.</para>
-    <para><function>sd_bus_slot_set_description()</function> was added in version 240.</para>
+    <para><function>sd_bus_slot_set_description()</function> and
+    <function>sd_bus_slot_get_description()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_set_destroy_callback.xml b/man/sd_bus_slot_set_destroy_callback.xml
index f33e2238e4..404db6edbf 100644
--- a/man/sd_bus_slot_set_destroy_callback.xml
+++ b/man/sd_bus_slot_set_destroy_callback.xml
@@ -115,10 +115,11 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_get_destroy_callback()</function> was added in version 239.</para>
-    <para><function>sd_bus_slot_set_destroy_callback()</function> was added in version 239.</para>
-    <para><function>sd_bus_track_get_destroy_callback()</function> was added in version 239.</para>
-    <para><function>sd_bus_track_set_destroy_callback()</function> was added in version 239.</para>
+    <para><function>sd_bus_destroy_t()</function>,
+    <function>sd_bus_slot_set_destroy_callback()</function>,
+    <function>sd_bus_slot_get_destroy_callback()</function>,
+    <function>sd_bus_track_set_destroy_callback()</function>, and
+    <function>sd_bus_track_get_destroy_callback()</function> were added in version 239.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_set_floating.xml b/man/sd_bus_slot_set_floating.xml
index 649c645c82..df2cbc6fba 100644
--- a/man/sd_bus_slot_set_floating.xml
+++ b/man/sd_bus_slot_set_floating.xml
@@ -105,8 +105,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_get_floating()</function> was added in version 239.</para>
-    <para><function>sd_bus_slot_set_floating()</function> was added in version 239.</para>
+    <para><function>sd_bus_slot_set_floating()</function> and
+    <function>sd_bus_slot_get_floating()</function> were added in version 239.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_slot_set_userdata.xml b/man/sd_bus_slot_set_userdata.xml
index 8a1fa9e5ac..691ed2d36f 100644
--- a/man/sd_bus_slot_set_userdata.xml
+++ b/man/sd_bus_slot_set_userdata.xml
@@ -75,8 +75,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_slot_get_userdata()</function> was added in version 240.</para>
-    <para><function>sd_bus_slot_set_userdata()</function> was added in version 240.</para>
+    <para><function>sd_bus_slot_set_userdata()</function> and
+    <function>sd_bus_slot_get_userdata()</function> were added in version 240.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_track_add_name.xml b/man/sd_bus_track_add_name.xml
index 393e5a2132..d52fb2156d 100644
--- a/man/sd_bus_track_add_name.xml
+++ b/man/sd_bus_track_add_name.xml
@@ -217,16 +217,16 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_track_add_name()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_add_sender()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_contains()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_count()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_count_name()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_count_sender()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_first()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_next()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_remove_name()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_remove_sender()</function> was added in version 232.</para>
+    <para><function>sd_bus_track_add_name()</function>,
+    <function>sd_bus_track_add_sender()</function>,
+    <function>sd_bus_track_remove_name()</function>,
+    <function>sd_bus_track_remove_sender()</function>,
+    <function>sd_bus_track_count()</function>,
+    <function>sd_bus_track_count_name()</function>,
+    <function>sd_bus_track_count_sender()</function>,
+    <function>sd_bus_track_contains()</function>,
+    <function>sd_bus_track_first()</function>, and
+    <function>sd_bus_track_next()</function> were added in version 232.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_track_new.xml b/man/sd_bus_track_new.xml
index 80133ce35c..de6b48d0a1 100644
--- a/man/sd_bus_track_new.xml
+++ b/man/sd_bus_track_new.xml
@@ -220,15 +220,15 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_track_get_bus()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_get_recursive()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_get_userdata()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_new()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_ref()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_set_recursive()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_set_userdata()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_unref()</function> was added in version 232.</para>
-    <para><function>sd_bus_track_unrefp()</function> was added in version 232.</para>
+    <para><function>sd_bus_track_new()</function>,
+    <function>sd_bus_track_ref()</function>,
+    <function>sd_bus_track_unref()</function>,
+    <function>sd_bus_track_unrefp()</function>,
+    <function>sd_bus_track_get_recursive()</function>,
+    <function>sd_bus_track_set_recursive()</function>,
+    <function>sd_bus_track_get_bus()</function>,
+    <function>sd_bus_track_get_userdata()</function>, and
+    <function>sd_bus_track_set_userdata()</function> were added in version 232.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_device_get_syspath.xml b/man/sd_device_get_syspath.xml
index 73e4667009..c8adacd8e2 100644
--- a/man/sd_device_get_syspath.xml
+++ b/man/sd_device_get_syspath.xml
@@ -195,17 +195,17 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_device_get_devname()</function> was added in version 251.</para>
-    <para><function>sd_device_get_devnum()</function> was added in version 251.</para>
-    <para><function>sd_device_get_devpath()</function> was added in version 251.</para>
-    <para><function>sd_device_get_devtype()</function> was added in version 251.</para>
-    <para><function>sd_device_get_diskseq()</function> was added in version 251.</para>
-    <para><function>sd_device_get_driver()</function> was added in version 251.</para>
-    <para><function>sd_device_get_ifindex()</function> was added in version 251.</para>
-    <para><function>sd_device_get_subsystem()</function> was added in version 251.</para>
-    <para><function>sd_device_get_sysname()</function> was added in version 251.</para>
-    <para><function>sd_device_get_sysnum()</function> was added in version 251.</para>
-    <para><function>sd_device_get_syspath()</function> was added in version 251.</para>
+    <para><function>sd_device_get_syspath()</function>,
+    <function>sd_device_get_devpath()</function>,
+    <function>sd_device_get_sysname()</function>,
+    <function>sd_device_get_sysnum()</function>,
+    <function>sd_device_get_subsystem()</function>,
+    <function>sd_device_get_devtype()</function>,
+    <function>sd_device_get_devname()</function>,
+    <function>sd_device_get_devnum()</function>,
+    <function>sd_device_get_ifindex()</function>,
+    <function>sd_device_get_driver()</function>, and
+    <function>sd_device_get_diskseq()</function> were added in version 251.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_device_ref.xml b/man/sd_device_ref.xml
index a927f51eba..e5fc18f724 100644
--- a/man/sd_device_ref.xml
+++ b/man/sd_device_ref.xml
@@ -84,8 +84,8 @@
   </refsect1>
 <refsect1>
     <title>History</title>
-    <para><function>sd_device_ref()</function> was added in version 251.</para>
-    <para><function>sd_device_unref()</function> was added in version 251.</para>
-    <para><function>sd_device_unrefp()</function> was added in version 251.</para>
+    <para><function>sd_device_ref()</function>,
+    <function>sd_device_unref()</function>, and
+    <function>sd_device_unrefp()</function> were added in version 251.</para>
   </refsect1>
 </refentry>
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 5b51248a4f..ca6aa610e0 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -325,15 +325,16 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_child()</function> was added in version 217.</para>
-    <para><function>sd_event_source_get_child_pid()</function> was added in version 217.</para>
-    <para><function>sd_event_add_child_pidfd()</function> was added in version 245.</para>
-    <para><function>sd_event_source_get_child_pidfd()</function> was added in version 245.</para>
-    <para><function>sd_event_source_get_child_pidfd_own()</function> was added in version 245.</para>
-    <para><function>sd_event_source_get_child_process_own()</function> was added in version 245.</para>
-    <para><function>sd_event_source_send_child_signal()</function> was added in version 245.</para>
-    <para><function>sd_event_source_set_child_pidfd_own()</function> was added in version 245.</para>
-    <para><function>sd_event_source_set_child_process_own()</function> was added in version 245.</para>
+    <para><function>sd_event_add_child()</function>,
+    <function>sd_event_child_handler_t()</function>, and
+    <function>sd_event_source_get_child_pid()</function> were added in version 217.</para>
+    <para><function>sd_event_add_child_pidfd()</function>,
+    <function>sd_event_source_get_child_pidfd()</function>,
+    <function>sd_event_source_get_child_pidfd_own()</function>,
+    <function>sd_event_source_set_child_pidfd_own()</function>,
+    <function>sd_event_source_get_child_process_own()</function>,
+    <function>sd_event_source_set_child_process_own()</function>, and
+    <function>sd_event_source_send_child_signal()</function> were added in version 245.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index 671f4d961b..de9125f194 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -179,9 +179,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_defer()</function> was added in version 217.</para>
-    <para><function>sd_event_add_exit()</function> was added in version 217.</para>
-    <para><function>sd_event_add_post()</function> was added in version 217.</para>
+    <para><function>sd_event_add_defer()</function>,
+    <function>sd_event_add_post()</function>,
+    <function>sd_event_add_exit()</function>, and
+    <function>sd_event_handler_t()</function> were added in version 217.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_add_inotify.xml b/man/sd_event_add_inotify.xml
index 7e5bf948e2..7781d8e323 100644
--- a/man/sd_event_add_inotify.xml
+++ b/man/sd_event_add_inotify.xml
@@ -215,8 +215,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_inotify()</function> was added in version 239.</para>
-    <para><function>sd_event_source_get_inotify_mask()</function> was added in version 239.</para>
+    <para><function>sd_event_inotify_handler_t()</function>,
+    <function>sd_event_add_inotify()</function>, and
+    <function>sd_event_source_get_inotify_mask()</function> were added in version 239.</para>
     <para><function>sd_event_add_inotify_fd()</function> was added in version 250.</para>
   </refsect1>
 
diff --git a/man/sd_event_add_io.xml b/man/sd_event_add_io.xml
index eb6d6c6ae9..da0fa58227 100644
--- a/man/sd_event_add_io.xml
+++ b/man/sd_event_add_io.xml
@@ -297,14 +297,15 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_io()</function> was added in version 229.</para>
-    <para><function>sd_event_source_get_io_events()</function> was added in version 229.</para>
-    <para><function>sd_event_source_get_io_fd()</function> was added in version 229.</para>
-    <para><function>sd_event_source_get_io_revents()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_io_events()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_io_fd()</function> was added in version 229.</para>
-    <para><function>sd_event_source_get_io_fd_own()</function> was added in version 239.</para>
-    <para><function>sd_event_source_set_io_fd_own()</function> was added in version 239.</para>
+    <para><function>sd_event_io_handler_t()</function>,
+    <function>sd_event_add_io()</function>,
+    <function>sd_event_source_get_io_events()</function>,
+    <function>sd_event_source_set_io_events()</function>,
+    <function>sd_event_source_get_io_revents()</function>,
+    <function>sd_event_source_get_io_fd()</function>, and
+    <function>sd_event_source_set_io_fd()</function> were added in version 229.</para>
+    <para><function>sd_event_source_get_io_fd_own()</function> and
+    <function>sd_event_source_set_io_fd_own()</function> were added in version 239.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_add_memory_pressure.xml b/man/sd_event_add_memory_pressure.xml
index 4ac123edb2..25c166eda3 100644
--- a/man/sd_event_add_memory_pressure.xml
+++ b/man/sd_event_add_memory_pressure.xml
@@ -273,10 +273,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_memory_pressure()</function> was added in version 254.</para>
-    <para><function>sd_event_source_set_memory_pressure_period()</function> was added in version 254.</para>
-    <para><function>sd_event_source_set_memory_pressure_type()</function> was added in version 254.</para>
-    <para><function>sd_event_trim_memory()</function> was added in version 254.</para>
+    <para><function>sd_event_add_memory_pressure()</function>,
+    <function>sd_event_source_set_memory_pressure_type()</function>,
+    <function>sd_event_source_set_memory_pressure_period()</function>, and
+    <function>sd_event_trim_memory()</function> were added in version 254.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index 7a7619f2f1..6fb0d1b10a 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -182,8 +182,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_signal()</function> was added in version 217.</para>
-    <para><function>sd_event_source_get_signal()</function> was added in version 217.</para>
+    <para><function>sd_event_add_signal()</function>,
+    <function>sd_event_signal_handler_t()</function>, and
+    <function>sd_event_source_get_signal()</function> were added in version 217.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index e11d742506..d3a73732c3 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -303,14 +303,15 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_add_time()</function> was added in version 213.</para>
-    <para><function>sd_event_source_get_time()</function> was added in version 213.</para>
-    <para><function>sd_event_source_get_time_accuracy()</function> was added in version 213.</para>
-    <para><function>sd_event_source_get_time_clock()</function> was added in version 213.</para>
-    <para><function>sd_event_source_set_time()</function> was added in version 213.</para>
-    <para><function>sd_event_source_set_time_accuracy()</function> was added in version 213.</para>
-    <para><function>sd_event_add_time_relative()</function> was added in version 247.</para>
-    <para><function>sd_event_source_set_time_relative()</function> was added in version 247.</para>
+    <para><function>sd_event_add_time()</function>,
+    <function>sd_event_source_get_time()</function>,
+    <function>sd_event_source_set_time()</function>,
+    <function>sd_event_source_get_time_accuracy()</function>,
+    <function>sd_event_source_set_time_accuracy()</function>, and
+    <function>sd_event_source_get_time_clock()</function> were added in version 213.</para>
+    <para><function>sd_event_time_handler_t()</function> was added in version 217.</para>
+    <para><function>sd_event_add_time_relative()</function> and
+    <function>sd_event_source_set_time_relative()</function> were added in version 247.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_exit.xml b/man/sd_event_exit.xml
index 50783743c3..bea8acd0ec 100644
--- a/man/sd_event_exit.xml
+++ b/man/sd_event_exit.xml
@@ -133,8 +133,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_exit()</function> was added in version 229.</para>
-    <para><function>sd_event_get_exit_code()</function> was added in version 229.</para>
+    <para><function>sd_event_exit()</function> and
+    <function>sd_event_get_exit_code()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 604e02593d..a01cc7830b 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -200,12 +200,12 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_default()</function> was added in version 213.</para>
-    <para><function>sd_event_new()</function> was added in version 213.</para>
-    <para><function>sd_event_ref()</function> was added in version 213.</para>
-    <para><function>sd_event_unref()</function> was added in version 213.</para>
-    <para><function>sd_event_get_tid()</function> was added in version 229.</para>
-    <para><function>sd_event_unrefp()</function> was added in version 229.</para>
+    <para><function>sd_event_new()</function>,
+    <function>sd_event_default()</function>,
+    <function>sd_event_ref()</function>, and
+    <function>sd_event_unref()</function> were added in version 213.</para>
+    <para><function>sd_event_unrefp()</function> and
+    <function>sd_event_get_tid()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index fd17536991..7df74ab468 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -143,8 +143,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_loop()</function> was added in version 220.</para>
-    <para><function>sd_event_run()</function> was added in version 220.</para>
+    <para><function>sd_event_run()</function> and
+    <function>sd_event_loop()</function> were added in version 220.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_set_watchdog.xml b/man/sd_event_set_watchdog.xml
index 99f9869dd6..a91ca642b3 100644
--- a/man/sd_event_set_watchdog.xml
+++ b/man/sd_event_set_watchdog.xml
@@ -125,8 +125,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_get_watchdog()</function> was added in version 229.</para>
-    <para><function>sd_event_set_watchdog()</function> was added in version 229.</para>
+    <para><function>sd_event_set_watchdog()</function> and
+    <function>sd_event_get_watchdog()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_description.xml b/man/sd_event_source_set_description.xml
index 5565ac3973..e4cd775570 100644
--- a/man/sd_event_source_set_description.xml
+++ b/man/sd_event_source_set_description.xml
@@ -124,8 +124,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_description()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_description()</function> was added in version 229.</para>
+    <para><function>sd_event_source_set_description()</function> and
+    <function>sd_event_source_get_description()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_destroy_callback.xml b/man/sd_event_source_set_destroy_callback.xml
index 1220b79b1c..d276385bf1 100644
--- a/man/sd_event_source_set_destroy_callback.xml
+++ b/man/sd_event_source_set_destroy_callback.xml
@@ -95,8 +95,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_destroy_callback()</function> was added in version 239.</para>
-    <para><function>sd_event_source_set_destroy_callback()</function> was added in version 239.</para>
+    <para><function>sd_event_destroy_t()</function>,
+    <function>sd_event_source_set_destroy_callback()</function>, and
+    <function>sd_event_source_get_destroy_callback()</function> were added in version 239.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_enabled.xml b/man/sd_event_source_set_enabled.xml
index ac595f491a..07c5322dd1 100644
--- a/man/sd_event_source_set_enabled.xml
+++ b/man/sd_event_source_set_enabled.xml
@@ -139,8 +139,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_enabled()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_enabled()</function> was added in version 229.</para>
+    <para><function>sd_event_source_set_enabled()</function> and
+    <function>sd_event_source_get_enabled()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_exit_on_failure.xml b/man/sd_event_source_set_exit_on_failure.xml
index 14be115981..fd7f21f1dd 100644
--- a/man/sd_event_source_set_exit_on_failure.xml
+++ b/man/sd_event_source_set_exit_on_failure.xml
@@ -97,8 +97,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_exit_on_failure()</function> was added in version 247.</para>
-    <para><function>sd_event_source_set_exit_on_failure()</function> was added in version 247.</para>
+    <para><function>sd_event_source_set_exit_on_failure()</function> and
+    <function>sd_event_source_get_exit_on_failure()</function> were added in version 247.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_floating.xml b/man/sd_event_source_set_floating.xml
index 0b9630ffc9..e2cc5d5b53 100644
--- a/man/sd_event_source_set_floating.xml
+++ b/man/sd_event_source_set_floating.xml
@@ -105,8 +105,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_floating()</function> was added in version 244.</para>
-    <para><function>sd_event_source_set_floating()</function> was added in version 244.</para>
+    <para><function>sd_event_source_set_floating()</function> and
+    <function>sd_event_source_get_floating()</function> were added in version 244.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_prepare.xml b/man/sd_event_source_set_prepare.xml
index 3b7b2a9432..8d78873a36 100644
--- a/man/sd_event_source_set_prepare.xml
+++ b/man/sd_event_source_set_prepare.xml
@@ -124,7 +124,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_set_prepare()</function> was added in version 229.</para>
+    <para><function>sd_event_source_set_prepare()</function> and
+    <function>sd_event_handler_t()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_priority.xml b/man/sd_event_source_set_priority.xml
index 023c6b1369..7b6f04639f 100644
--- a/man/sd_event_source_set_priority.xml
+++ b/man/sd_event_source_set_priority.xml
@@ -151,8 +151,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_priority()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_priority()</function> was added in version 229.</para>
+    <para><function>sd_event_source_set_priority()</function> and
+    <function>sd_event_source_get_priority()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_set_ratelimit.xml b/man/sd_event_source_set_ratelimit.xml
index ff2362cf21..cf45102bb9 100644
--- a/man/sd_event_source_set_ratelimit.xml
+++ b/man/sd_event_source_set_ratelimit.xml
@@ -164,9 +164,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_ratelimit()</function> was added in version 248.</para>
-    <para><function>sd_event_source_is_ratelimited()</function> was added in version 248.</para>
-    <para><function>sd_event_source_set_ratelimit()</function> was added in version 248.</para>
+    <para><function>sd_event_source_set_ratelimit()</function>,
+    <function>sd_event_source_get_ratelimit()</function>, and
+    <function>sd_event_source_is_ratelimited()</function> were added in version 248.</para>
     <para><function>sd_event_source_set_ratelimit_expire_callback()</function> was added in version 250.</para>
     <para><function>sd_event_source_leave_ratelimit()</function> was added in version 254.</para>
   </refsect1>
diff --git a/man/sd_event_source_set_userdata.xml b/man/sd_event_source_set_userdata.xml
index 9489104adf..b1bd8d40e9 100644
--- a/man/sd_event_source_set_userdata.xml
+++ b/man/sd_event_source_set_userdata.xml
@@ -77,8 +77,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_get_userdata()</function> was added in version 229.</para>
-    <para><function>sd_event_source_set_userdata()</function> was added in version 229.</para>
+    <para><function>sd_event_source_set_userdata()</function> and
+    <function>sd_event_source_get_userdata()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_source_unref.xml b/man/sd_event_source_unref.xml
index 64a3794434..22ce6f5fde 100644
--- a/man/sd_event_source_unref.xml
+++ b/man/sd_event_source_unref.xml
@@ -116,11 +116,11 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_source_ref()</function> was added in version 229.</para>
-    <para><function>sd_event_source_unref()</function> was added in version 229.</para>
-    <para><function>sd_event_source_unrefp()</function> was added in version 229.</para>
-    <para><function>sd_event_source_disable_unref()</function> was added in version 243.</para>
-    <para><function>sd_event_source_disable_unrefp()</function> was added in version 243.</para>
+    <para><function>sd_event_source_unref()</function>,
+    <function>sd_event_source_unrefp()</function>, and
+    <function>sd_event_source_ref()</function> were added in version 229.</para>
+    <para><function>sd_event_source_disable_unref()</function> and
+    <function>sd_event_source_disable_unrefp()</function> were added in version 243.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 523aa42521..0f635f6982 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -319,9 +319,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_event_dispatch()</function> was added in version 220.</para>
-    <para><function>sd_event_prepare()</function> was added in version 220.</para>
-    <para><function>sd_event_wait()</function> was added in version 220.</para>
+    <para><function>sd_event_prepare()</function>,
+    <function>sd_event_wait()</function>, and
+    <function>sd_event_dispatch()</function> were added in version 220.</para>
     <para><function>sd_event_get_state()</function> was added in version 229.</para>
     <para><function>sd_event_get_iteration()</function> was added in version 231.</para>
   </refsect1>
diff --git a/man/sd_hwdb_get.xml b/man/sd_hwdb_get.xml
index f7a604532b..4f2e701fd5 100644
--- a/man/sd_hwdb_get.xml
+++ b/man/sd_hwdb_get.xml
@@ -151,10 +151,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>SD_HWDB_FOREACH_PROPERTY()</function> was added in version 246.</para>
-    <para><function>sd_hwdb_enumerate()</function> was added in version 246.</para>
-    <para><function>sd_hwdb_get()</function> was added in version 246.</para>
-    <para><function>sd_hwdb_seek()</function> was added in version 246.</para>
+    <para><function>sd_hwdb_get()</function>,
+    <function>sd_hwdb_seek()</function>,
+    <function>sd_hwdb_enumerate()</function>, and
+    <function>SD_HWDB_FOREACH_PROPERTY()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_hwdb_new.xml b/man/sd_hwdb_new.xml
index 4d05d0e7ba..4d02deacc2 100644
--- a/man/sd_hwdb_new.xml
+++ b/man/sd_hwdb_new.xml
@@ -125,9 +125,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_hwdb_new()</function> was added in version 246.</para>
-    <para><function>sd_hwdb_ref()</function> was added in version 246.</para>
-    <para><function>sd_hwdb_unref()</function> was added in version 246.</para>
+    <para><function>sd_hwdb_new()</function>,
+    <function>sd_hwdb_ref()</function>, and
+    <function>sd_hwdb_unref()</function> were added in version 246.</para>
     <para><function>sd_hwdb_new_from_path()</function> was added in version 252.</para>
   </refsect1>
 
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 114500b363..43ee26d954 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -256,8 +256,8 @@ As man:sd-id128(3) macro:
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_id128_get_boot()</function> was added in version 187.</para>
-    <para><function>sd_id128_get_machine()</function> was added in version 187.</para>
+    <para><function>sd_id128_get_machine()</function> and
+    <function>sd_id128_get_boot()</function> were added in version 187.</para>
     <para><function>sd_id128_get_invocation()</function> was added in version 232.</para>
     <para><function>sd_id128_get_machine_app_specific()</function> was added in version 233.</para>
     <para><function>sd_id128_get_boot_app_specific()</function> was added in version 240.</para>
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index d767a31d37..da44a0dcdd 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -111,8 +111,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_id128_from_string()</function> was added in version 187.</para>
-    <para><function>sd_id128_to_string()</function> was added in version 187.</para>
+    <para><function>sd_id128_to_string()</function> and
+    <function>sd_id128_from_string()</function> were added in version 187.</para>
     <para><function>sd_id128_uuid_string()</function> was added in version 251.</para>
   </refsect1>
 
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index fb43449ac3..5329498771 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -163,9 +163,9 @@ int add_matches(sd_journal *j) {
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_add_disjunction()</function> was added in version 187.</para>
-    <para><function>sd_journal_add_match()</function> was added in version 187.</para>
-    <para><function>sd_journal_flush_matches()</function> was added in version 187.</para>
+    <para><function>sd_journal_add_match()</function>,
+    <function>sd_journal_add_disjunction()</function>, and
+    <function>sd_journal_flush_matches()</function> were added in version 187.</para>
     <para><function>sd_journal_add_conjunction()</function> was added in version 202.</para>
   </refsect1>
 
diff --git a/man/sd_journal_enumerate_fields.xml b/man/sd_journal_enumerate_fields.xml
index bc0bb8527d..b2185b3a7c 100644
--- a/man/sd_journal_enumerate_fields.xml
+++ b/man/sd_journal_enumerate_fields.xml
@@ -99,9 +99,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>SD_JOURNAL_FOREACH_FIELD()</function> was added in version 229.</para>
-    <para><function>sd_journal_enumerate_fields()</function> was added in version 229.</para>
-    <para><function>sd_journal_restart_fields()</function> was added in version 229.</para>
+    <para><function>sd_journal_enumerate_fields()</function>,
+    <function>sd_journal_restart_fields()</function>, and
+    <function>SD_JOURNAL_FOREACH_FIELD()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 7b65ab5075..6c82f057e4 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -98,8 +98,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_get_catalog()</function> was added in version 196.</para>
-    <para><function>sd_journal_get_catalog_for_message_id()</function> was added in version 196.</para>
+    <para><function>sd_journal_get_catalog()</function> and
+    <function>sd_journal_get_catalog_for_message_id()</function> were added in version 196.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 1bff4ad9f3..a39a656847 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -100,8 +100,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_get_cutoff_monotonic_usec()</function> was added in version 187.</para>
-    <para><function>sd_journal_get_cutoff_realtime_usec()</function> was added in version 187.</para>
+    <para><function>sd_journal_get_cutoff_realtime_usec()</function> and
+    <function>sd_journal_get_cutoff_monotonic_usec()</function> were added in version 187.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 91f022687a..ae0911faa9 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -281,12 +281,12 @@ int print_fields(sd_journal *j) {
 
   <refsect1>
     <title>History</title>
-    <para><function>SD_JOURNAL_FOREACH_DATA()</function> was added in version 187.</para>
-    <para><function>sd_journal_enumerate_data()</function> was added in version 187.</para>
-    <para><function>sd_journal_get_data()</function> was added in version 187.</para>
-    <para><function>sd_journal_restart_data()</function> was added in version 187.</para>
-    <para><function>sd_journal_get_data_threshold()</function> was added in version 196.</para>
-    <para><function>sd_journal_set_data_threshold()</function> was added in version 196.</para>
+    <para><function>sd_journal_get_data()</function>,
+    <function>sd_journal_enumerate_data()</function>,
+    <function>sd_journal_restart_data()</function>, and
+    <function>SD_JOURNAL_FOREACH_DATA()</function> were added in version 187.</para>
+    <para><function>sd_journal_set_data_threshold()</function> and
+    <function>sd_journal_get_data_threshold()</function> were added in version 196.</para>
     <para><function>sd_journal_enumerate_available_data()</function> was added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 073afc1545..6e7e496e12 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -245,12 +245,12 @@ else {
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_get_fd()</function> was added in version 187.</para>
-    <para><function>sd_journal_process()</function> was added in version 187.</para>
-    <para><function>sd_journal_wait()</function> was added in version 187.</para>
+    <para><function>sd_journal_get_fd()</function>,
+    <function>sd_journal_process()</function>, and
+    <function>sd_journal_wait()</function> were added in version 187.</para>
     <para><function>sd_journal_reliable_fd()</function> was added in version 196.</para>
-    <para><function>sd_journal_get_events()</function> was added in version 201.</para>
-    <para><function>sd_journal_get_timeout()</function> was added in version 201.</para>
+    <para><function>sd_journal_get_events()</function> and
+    <function>sd_journal_get_timeout()</function> were added in version 201.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index a3ad4251b8..0d2b08e690 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -96,8 +96,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_get_monotonic_usec()</function> was added in version 187.</para>
-    <para><function>sd_journal_get_realtime_usec()</function> was added in version 187.</para>
+    <para><function>sd_journal_get_realtime_usec()</function> and
+    <function>sd_journal_get_monotonic_usec()</function> were added in version 187.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml
index 101940a2ae..90110bebcf 100644
--- a/man/sd_journal_has_runtime_files.xml
+++ b/man/sd_journal_has_runtime_files.xml
@@ -71,8 +71,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_has_persistent_files()</function> was added in version 229.</para>
-    <para><function>sd_journal_has_runtime_files()</function> was added in version 229.</para>
+    <para><function>sd_journal_has_runtime_files()</function> and
+    <function>sd_journal_has_persistent_files()</function> were added in version 229.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index fa61cd1e56..ea5cbef1ee 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -151,12 +151,12 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>SD_JOURNAL_FOREACH()</function> was added in version 187.</para>
-    <para><function>SD_JOURNAL_FOREACH_BACKWARDS()</function> was added in version 187.</para>
-    <para><function>sd_journal_next()</function> was added in version 187.</para>
-    <para><function>sd_journal_next_skip()</function> was added in version 187.</para>
-    <para><function>sd_journal_previous()</function> was added in version 187.</para>
-    <para><function>sd_journal_previous_skip()</function> was added in version 187.</para>
+    <para><function>sd_journal_next()</function>,
+    <function>sd_journal_previous()</function>,
+    <function>sd_journal_next_skip()</function>,
+    <function>sd_journal_previous_skip()</function>,
+    <function>SD_JOURNAL_FOREACH()</function>, and
+    <function>SD_JOURNAL_FOREACH_BACKWARDS()</function> were added in version 187.</para>
     <para><function>sd_journal_step_one()</function> was added in version 254.</para>
   </refsect1>
 
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 81c667f3ff..3b8fb1f0d8 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -219,12 +219,12 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_close()</function> was added in version 187.</para>
-    <para><function>sd_journal_open()</function> was added in version 187.</para>
-    <para><function>sd_journal_open_directory()</function> was added in version 187.</para>
+    <para><function>sd_journal_open()</function>,
+    <function>sd_journal_open_directory()</function>, and
+    <function>sd_journal_close()</function> were added in version 187.</para>
     <para><function>sd_journal_open_files()</function> was added in version 205.</para>
-    <para><function>sd_journal_open_directory_fd()</function> was added in version 230.</para>
-    <para><function>sd_journal_open_files_fd()</function> was added in version 230.</para>
+    <para><function>sd_journal_open_directory_fd()</function> and
+    <function>sd_journal_open_files_fd()</function> were added in version 230.</para>
     <para><function>sd_journal_open_namespace()</function> was added in version 245.</para>
   </refsect1>
 
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 8fe3ea55f5..8c515a4803 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -259,16 +259,16 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_print()</function> was added in version 187.</para>
-    <para><function>sd_journal_printv()</function> was added in version 187.</para>
-    <para><function>sd_journal_send()</function> was added in version 187.</para>
-    <para><function>sd_journal_sendv()</function> was added in version 187.</para>
+    <para><function>sd_journal_print()</function>,
+    <function>sd_journal_printv()</function>,
+    <function>sd_journal_send()</function>, and
+    <function>sd_journal_sendv()</function> were added in version 187.</para>
     <para><function>sd_journal_perror()</function> was added in version 188.</para>
-    <para><function>sd_journal_perror_with_location()</function> was added in version 246.</para>
-    <para><function>sd_journal_print_with_location()</function> was added in version 246.</para>
-    <para><function>sd_journal_printv_with_location()</function> was added in version 246.</para>
-    <para><function>sd_journal_send_with_location()</function> was added in version 246.</para>
-    <para><function>sd_journal_sendv_with_location()</function> was added in version 246.</para>
+    <para><function>sd_journal_print_with_location()</function>,
+    <function>sd_journal_printv_with_location()</function>,
+    <function>sd_journal_send_with_location()</function>,
+    <function>sd_journal_sendv_with_location()</function>, and
+    <function>sd_journal_perror_with_location()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 9fe9be6385..005c8d550b 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -160,10 +160,10 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>SD_JOURNAL_FOREACH_UNIQUE()</function> was added in version 195.</para>
-    <para><function>sd_journal_enumerate_unique()</function> was added in version 195.</para>
-    <para><function>sd_journal_query_unique()</function> was added in version 195.</para>
-    <para><function>sd_journal_restart_unique()</function> was added in version 195.</para>
+    <para><function>sd_journal_query_unique()</function>,
+    <function>sd_journal_enumerate_unique()</function>,
+    <function>sd_journal_restart_unique()</function>, and
+    <function>SD_JOURNAL_FOREACH_UNIQUE()</function> were added in version 195.</para>
     <para><function>sd_journal_enumerate_available_unique()</function> was added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index 916472e8dd..15c72c0b80 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -116,11 +116,11 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_journal_seek_cursor()</function> was added in version 187.</para>
-    <para><function>sd_journal_seek_head()</function> was added in version 187.</para>
-    <para><function>sd_journal_seek_monotonic_usec()</function> was added in version 187.</para>
-    <para><function>sd_journal_seek_realtime_usec()</function> was added in version 187.</para>
-    <para><function>sd_journal_seek_tail()</function> was added in version 187.</para>
+    <para><function>sd_journal_seek_head()</function>,
+    <function>sd_journal_seek_tail()</function>,
+    <function>sd_journal_seek_monotonic_usec()</function>,
+    <function>sd_journal_seek_realtime_usec()</function>, and
+    <function>sd_journal_seek_cursor()</function> were added in version 187.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index acd5960829..5b59e09a92 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -236,8 +236,8 @@ else {
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_login_monitor_get_events()</function> was added in version 201.</para>
-    <para><function>sd_login_monitor_get_timeout()</function> was added in version 201.</para>
+    <para><function>sd_login_monitor_get_events()</function> and
+    <function>sd_login_monitor_get_timeout()</function> were added in version 201.</para>
     <para><function>sd_login_monitor_unrefp()</function> was added in version 229.</para>
   </refsect1>
 
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index 12a4beeb1c..e09b8a9142 100644
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.xml
@@ -104,8 +104,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_machine_get_class()</function> was added in version 217.</para>
-    <para><function>sd_machine_get_ifindices()</function> was added in version 217.</para>
+    <para><function>sd_machine_get_class()</function> and
+    <function>sd_machine_get_ifindices()</function> were added in version 217.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 0476c579e7..7c32a22bc9 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -565,12 +565,12 @@ sd_notify_barrier(0, 5 * 1000000);
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_pid_notify()</function> was added in version 219.</para>
-    <para><function>sd_pid_notify_with_fds()</function> was added in version 219.</para>
-    <para><function>sd_pid_notifyf()</function> was added in version 219.</para>
+    <para><function>sd_pid_notify()</function>,
+    <function>sd_pid_notifyf()</function>, and
+    <function>sd_pid_notify_with_fds()</function> were added in version 219.</para>
     <para><function>sd_notify_barrier()</function> was added in version 246.</para>
-    <para><function>sd_pid_notify_barrier()</function> was added in version 254.</para>
-    <para><function>sd_pid_notifyf_with_fds()</function> was added in version 254.</para>
+    <para><function>sd_pid_notifyf_with_fds()</function> and
+    <function>sd_pid_notify_barrier()</function> were added in version 254.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_path_lookup.xml b/man/sd_path_lookup.xml
index 36491f18c3..cb073035f3 100644
--- a/man/sd_path_lookup.xml
+++ b/man/sd_path_lookup.xml
@@ -220,8 +220,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_path_lookup()</function> was added in version 246.</para>
-    <para><function>sd_path_lookup_strv()</function> was added in version 246.</para>
+    <para><function>sd_path_lookup()</function> and
+    <function>sd_path_lookup_strv()</function> were added in version 246.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_pid_get_owner_uid.xml b/man/sd_pid_get_owner_uid.xml
index e5e9e17ecb..3597f24de6 100644
--- a/man/sd_pid_get_owner_uid.xml
+++ b/man/sd_pid_get_owner_uid.xml
@@ -368,30 +368,20 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_peer_get_cgroup()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_machine_name()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_owner_uid()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_session()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_slice()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_unit()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_user_slice()</function> was added in version 236.</para>
-    <para><function>sd_peer_get_user_unit()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_cgroup()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_machine_name()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_owner_uid()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_session()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_slice()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_unit()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_user_slice()</function> was added in version 236.</para>
-    <para><function>sd_pid_get_user_unit()</function> was added in version 236.</para>
-    <para><function>sd_pidfd_get_cgroup()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_machine_name()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_owner_uid()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_session()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_slice()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_unit()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_user_slice()</function> was added in version 253.</para>
-    <para><function>sd_pidfd_get_user_unit()</function> was added in version 253.</para>
+    <para><function>sd_pid_get_owner_uid()</function>,
+    <function>sd_pid_get_session()</function>,
+    <function>sd_pid_get_unit()</function>,
+    <function>sd_peer_get_owner_uid()</function>,
+    <function>sd_peer_get_session()</function>, and
+    <function>sd_peer_get_unit()</function> were added in version 236.</para>
+    <para><function>sd_pidfd_get_owner_uid()</function>,
+    <function>sd_pidfd_get_session()</function>,
+    <function>sd_pidfd_get_user_unit()</function>,
+    <function>sd_pidfd_get_unit()</function>,
+    <function>sd_pidfd_get_machine_name()</function>,
+    <function>sd_pidfd_get_slice()</function>,
+    <function>sd_pidfd_get_user_slice()</function>, and
+    <function>sd_pidfd_get_cgroup()</function> were added in version 253.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 666f589d1f..d5d7c042af 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -144,11 +144,8 @@
   <refsect1>
     <title>History</title>
 
-    <para>In the past, <function>sd_seat_can_multi_session()</function> was used to check whether the seat
-    supports multiple sessions. All seats support that now, so that function has been deprecated and always
-    returns true.</para>
-    <para><function>sd_seat_can_graphical()</function> was added in version 186.</para>
-    <para><function>sd_seat_can_tty()</function> was added in version 186.</para>
+    <para><function>sd_seat_can_tty()</function> and
+    <function>sd_seat_can_graphical()</function> were added in version 186.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index d95402a442..79cf8af35f 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -346,13 +346,13 @@
     <para><function>sd_session_get_state()</function> was added in version 186.</para>
     <para><function>sd_session_get_tty()</function> was added in version 198.</para>
     <para><function>sd_session_get_vt()</function> was added in version 207.</para>
-    <para><function>sd_session_get_remote_host()</function> was added in version 209.</para>
-    <para><function>sd_session_get_remote_user()</function> was added in version 209.</para>
-    <para><function>sd_session_is_remote()</function> was added in version 209.</para>
+    <para><function>sd_session_is_remote()</function>,
+    <function>sd_session_get_remote_host()</function>, and
+    <function>sd_session_get_remote_user()</function> were added in version 209.</para>
     <para><function>sd_session_get_desktop()</function> was added in version 217.</para>
-    <para><function>sd_session_get_leader()</function> was added in version 254.</para>
-    <para><function>sd_session_get_start_time()</function> was added in version 254.</para>
-    <para><function>sd_session_get_username()</function> was added in version 254.</para>
+    <para><function>sd_session_get_username()</function>,
+    <function>sd_session_get_start_time()</function>, and
+    <function>sd_session_get_leader()</function> were added in version 254.</para>
   </refsect1>
 
   <refsect1>