journalctl: fix erroneuous mention of "local" hostnames

--no-hostname applies equally to remote and local logs.

This change is a separate commit to make it easy to backport.

(cherry picked from commit 8b6c1d392e1471876b57648b2102fe36f39c5cba)
(cherry picked from commit c32062c5334bc23f9eeb42233509d05545fc1db4)

diff --git a/man/journalctl.xml b/man/journalctl.xml
index e4eb496459059a5aa58a217e09ec53850e2ea29e..80cc4e550646c4d25d8c624a05a79bdef625894d 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -737,8 +737,8 @@
       <varlistentry>
         <term><option>--no-hostname</option></term>
 
-        <listitem><para>Do not show the hostname field of log messages originating from the local host. This
-        switch has an effect only on the <option>short</option> family of output modes (see above).</para>
+        <listitem><para>Do not show the hostname field of log messages. This switch has an effect only on the
+        <option>short</option> family of output modes (see above).</para>
 
         <para>Note: this option does not remove occurrences of the hostname from log entries themselves, so
         it does not prevent the hostname from being visible in the logs.</para>

diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index 1cfa049b0ff54aaeed8e338b60a713af02855e73..5d911814f2fc189fad296e3d07fa373bd6edcfee 100644 (file)
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -99,7 +99,7 @@ _arguments -s \
     '(- *)'{-h,--help}'[Show this help]' \
     '(- *)--version[Show package version]' \
     '--no-pager[Do not pipe output into a pager]' \
-    --no-hostname"[Don't show the hostname of local log messages]" \
+    --no-hostname"[Don't show the hostname of log messages]" \
     '(-l --full)'{-l,--full}'[Show long fields in full]' \
     '(-a --all)'{-a,--all}'[Show all fields, including long and unprintable]' \
     '(-f --follow)'{-f,--follow}'[Follow journal]' \