From f408e27bccfacf347605a8d98649975a68f38a17 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 5 May 2015 17:48:57 +0200
Subject: Imported Upstream version 1.0.2

---
 man/NetworkManager.conf.xml.in | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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

diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index d9d51b84..7c6b9551 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -209,7 +209,7 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	<term><varname>configure-and-quit</varname></term>
 	<listitem>
 	  <para>
-	    When set to <literal>true</literal>, NetworkManager quits after
+	    When set to '<literal>true</literal>', NetworkManager quits after
 	    performing initial network configuration but spawns small helpers
 	    to preserve DHCP leases and IPv6 addresses.  This is useful in
 	    environments where network setup is more or less static or it is
@@ -219,10 +219,12 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	    interfaces cannot be preserved due to their use of external
 	    services, and these devices will be deconfigured when NetworkManager
 	    quits even though other interface's configuration may be preserved.
-	    The default value is <literal>false</literal>, meaning that
-	    NetworkManager will continue running after initial network
-	    configuration and continue responding to system and hardware events,
-	    D-Bus requests, and user commands.
+	    Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option
+	    must be set to '<literal>internal</literal>'. The default value of
+	    the '<literal>configure-and-quit</literal>' option is
+	    '<literal>false</literal>', meaning that NetworkManager will continue
+	    running after initial network configuration and continue responding
+	    to system and hardware events, D-Bus requests, and user commands.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -256,7 +258,13 @@ Copyright 2010 - 2014 Red Hat, Inc.
         values are supported:</para>
         <para>
           <literal>RLIMIT_CORE</literal>: set ulimit -c unlimited
-          to write out core dumps.
+          to write out core dumps. Beware, that a core dump can contain
+          sensitive information such as passwords or configuration settings.
+        </para>
+        <para>
+          <literal>fatal-warnings</literal>: set g_log_set_always_fatal()
+          to core dump on warning messages from glib. This is equivalent
+          to the --g-fatal-warnings command line option.
         </para>
         </listitem>
       </varlistentry>
-- 
cgit 1.3.0-6-gf8a5