diff --git a/man1/getent.1 b/man1/getent.1
index 16f2668ad..1adec24c3 100644
--- a/man1/getent.1
+++ b/man1/getent.1
@@ -344,21 +344,23 @@ and display the result.
 .RE
 .SH OPTIONS
 .TP
-.BR \-s\ \fIservice\fP\ \-\-service\ \fIservice\fP
+.BR \-s\ \fIservice\fP, \-\-service\ \fIservice\fP
 .\" commit 9d0881aa76b399e6a025c5cf44bebe2ae0efa8af (glibc)
-Override all databases with the specified service. (Since glibc-2.2.5.)
+Override all databases with the specified service.
+(Since glibc 2.2.5.)
 .TP
-.BR \-s\ \fIdatabase\fP:\fIservice\fP\ \-\-service\ \fIdatabase\fP:\fIservice\fP
+.BR \-s\ \fIdatabase\fP:\fIservice\fP,\ \
+\-\-service\ \fIdatabase\fP:\fIservice\fP
 .\" commit b4f6f4be85d32b9c03361c38376e36f08100e3e8 (glibc)
-Override only specified databases with the specified service. The option may be used
-multiple times, but only the last service for each database will be used. (Since glibc-2.4.)
+Override only specified databases with the specified service.
+The option may be used multiple times,
+but only the last service for each database will be used.
+(Since glibc 2.4.)
 .TP
-.BR \-i\ \-\-no\-idn
+.BR \-i ", " \-\-no\-idn
 .\" commit a160f8d808cf8020b13bd0ef4a9eaf3c11f964ad (glibc)
 Disables IDN encoding in lookups for
-.BR ahosts
-/
-.BR getaddrinfo (3)
+.BR ahosts / getaddrinfo (3)
 (Since glibc-2.13.)
 .SH EXIT STATUS
 One of the following exit values can be returned by