From 429393567647935d9123e21fd27a7529d50255eb Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 1 Jul 2018 20:58:23 +0200
Subject: New upstream version 1.12.0

---
 man/NetworkManager.conf.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'man/NetworkManager.conf.xml')

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index e2c6562b..17bc42f3 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -603,12 +603,10 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
         <varlistentry>
           <term><varname>backend</varname></term>
           <listitem><para>The logging backend. Supported values
-          are "<literal>debug</literal>", "<literal>syslog</literal>",
-          "<literal>journal</literal>".
-          "<literal>debug</literal>" uses syslog and logs to standard error.
-          If NetworkManager is started in debug mode (<literal>--debug</literal>)
-          this option is ignored and "<literal>debug</literal>" is always used.
-          Otherwise, the default is "<literal>&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;</literal>".
+          are "<literal>syslog</literal>" and "<literal>journal</literal>".
+          When NetworkManager is started with "<literal>--debug</literal>"
+          in addition all messages will be printed to stderr.
+          If unspecified, the default is "<literal>&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;</literal>".
           </para></listitem>
         </varlistentry>
         <varlistentry>
-- 
cgit 1.3.0-6-gf8a5