Merging upstream version 4.23.0.

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

1 files changed, 12 insertions, 9 deletions

diff --git a/upstream/debian-unstable/man1/hostnamectl.1 b/upstream/debian-unstable/man1/hostnamectl.1
index bba45a7e..77d4116b 100644
--- a/upstream/debian-unstable/man1/hostnamectl.1
+++ b/upstream/debian-unstable/man1/hostnamectl.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "HOSTNAMECTL" "1" "" "systemd 255" "hostnamectl"
+.TH "HOSTNAMECTL" "1" "" "systemd 256~rc3" "hostnamectl"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -187,7 +187,7 @@ Print a short help text and exit\&.
 Print a short version string and exit\&.
 .RE
 .PP
-\fB\-\-json=\fR\fIMODE\fR
+\fB\-\-json=\fR\fB\fIMODE\fR\fR
 .RS 4
 Shows output formatted as JSON\&. Expects one of
 "short"
@@ -197,18 +197,21 @@ Shows output formatted as JSON\&. Expects one of
 "off"
 (to turn off JSON output, the default)\&.
 .RE
+.PP
+\fB\-j\fR
+.RS 4
+Equivalent to
+\fB\-\-json=pretty\fR
+if running on a terminal, and
+\fB\-\-json=short\fR
+otherwise\&.
+.RE
 .SH "EXIT STATUS"
 .PP
 On success, 0 is returned, a non\-zero failure code otherwise\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBhostname\fR(1),
-\fBhostname\fR(5),
-\fBmachine-info\fR(5),
-\fBsystemctl\fR(1),
-\fBsystemd-hostnamed.service\fR(8),
-\fBsystemd-firstboot\fR(1)
+\fBsystemd\fR(1), \fBhostname\fR(1), \fBhostname\fR(5), \fBmachine-info\fR(5), \fBsystemctl\fR(1), \fBsystemd-hostnamed.service\fR(8), \fBsystemd-firstboot\fR(1)
 .SH "NOTES"
 .IP " 1." 4
 Icon Naming Specification