Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 15 deletions

diff --git a/man1/getent.1 b/man1/getent.1
index 1168fc5..d1cd5a9 100644
--- a/man1/getent.1
+++ b/man1/getent.1
@@ -3,7 +3,7 @@
 .\"
 .\" SPDX-License-Identifier: GPL-2.0-or-later
 .\"
-.TH getent 1 2023-01-07 "Linux man-pages 6.05.01"
+.TH getent 1 2023-11-01 "Linux man-pages 6.7"
 .SH NAME
 getent \- get entries from Name Service Switch libraries
 .SH SYNOPSIS
@@ -25,12 +25,11 @@ Otherwise, if no
 .I key
 is provided, all entries will be displayed (unless the database does not
 support enumeration).
-.PP
+.P
 The
 .I database
 may be any of those supported by the GNU C Library, listed below:
-.RS 3
-.TP 10
+.TP
 .B ahosts
 When no
 .I key
@@ -41,7 +40,7 @@ and
 .BR endhostent (3)
 to enumerate the hosts database.
 This is identical to using
-.BR hosts .
+.BR hosts (5).
 When one or more
 .I key
 arguments are provided, pass each
@@ -324,41 +323,48 @@ arguments are provided, pass each
 in succession to
 .BR getspnam (3)
 and display the result.
-.RE
 .SH OPTIONS
 .TP
-.BR \-s\ \fIservice\fP ", " \-\-service\ \fIservice\fP
+.BI \-\-service\~ service
+.TQ
+.BI \-s\~ service
 .\" commit 9d0881aa76b399e6a025c5cf44bebe2ae0efa8af (glibc)
 Override all databases with the specified service.
 (Since glibc 2.2.5.)
 .TP
-.BR \-s\ \fIdatabase\fP:\fIservice\fP ", "\
-\-\-service\ \fIdatabase\fP:\fIservice\fP
+.BI \-\-service\~ database : service
+.TQ
+.BI \-s\~ database : service
 .\" 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.)
 .TP
-.BR \-i ", " \-\-no\-idn
+.B \-\-no\-idn
+.TQ
+.B \-i
 .\" commit a160f8d808cf8020b13bd0ef4a9eaf3c11f964ad (glibc)
 Disables IDN encoding in lookups for
 .BR ahosts / getaddrinfo (3)
 (Since glibc-2.13.)
 .TP
-.BR \-? ", " \-\-help
+.B \-\-help
+.TQ
+.B \-?
 Print a usage summary and exit.
 .TP
-.B "\-\-usage"
+.B \-\-usage
 Print a short usage summary and exit.
 .TP
-.BR \-V ", " \-\-version
+.B \-\-version
+.TQ
+.B \-V
 Print the version number, license, and disclaimer of warranty for
 .BR getent .
 .SH EXIT STATUS
 One of the following exit values can be returned by
 .BR getent :
-.RS 3
 .TP
 .B 0
 Command completed successfully.
@@ -377,6 +383,5 @@ could not be found in the
 .B 3
 Enumeration not supported on this
 .IR database .
-.RE
 .SH SEE ALSO
 .BR nsswitch.conf (5)