about summary refs log tree commit diff
path: root/man/NetworkManager.8
diff options
context:
space:
mode:
Diffstat (limited to 'man/NetworkManager.8')
-rw-r--r--man/NetworkManager.814
1 files changed, 8 insertions, 6 deletions
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 48d2a8c5..f4ba4fef 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2016
+.\"      Date: 08/03/2016
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.2.2
+.\"    Source: NetworkManager 1.2.4
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.2" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.4" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -274,18 +274,20 @@ NetworkManager process handles the following signals:
 .PP
 \fISIGHUP\fR
 .RS 4
-The signal causes a reload of NetworkManager\*(Aqs configuration\&. Note that not all configuration parameters can be changed at runtime and therefore some changes may be applied only after the next restart of the daemon\&. The signal also forces a rewrite of DNS configuration\&.
+The signal causes a reload of NetworkManager\*(Aqs configuration\&. Note that not all configuration parameters can be changed at runtime and therefore some changes may be applied only after the next restart of the daemon\&. A SIGHUP also involves further reloading actions, like doing a DNS update and restarting the DNS plugin\&. The latter can be useful for example when using the dnsmasq plugin and changing its configuration in /etc/NetworkManager/dnsmasq\&.d\&. However, it also means this will shortly interrupt name resolution\&. In the future, there may be further actions added\&. A SIGHUP means to update NetworkManager configuration and reload everything that is supported\&. Note that this does not reload connections from disk\&. For that there is a D\-Bus API and nmcli\*(Aqs reload action
 .RE
 .PP
 \fISIGUSR1\fR
 .RS 4
-The signal forces a rewrite of DNS configuration\&.
+The signal forces a rewrite of DNS configuration\&. Contrary to SIGHUP, this does not restart the DNS plugin and will not interrupt name resolution\&. In the future, further actions may be added\&. A SIGUSR1 means to write out data like resolv\&.conf, or refresh a cache\&. It is a subset of what is done for SIGHUP without reloading configuration from disk\&.
 .RE
 .PP
 \fISIGUSR2\fR
 .RS 4
-The signal has no effect at the moment\&.
+The signal has no effect at the moment but is reserved for future use\&.
 .RE
+.PP
+An alternative to a signal to reload configuration is the Reload D\-Bus call\&. It allows for more fine\-grained selection of what to reload, it only returns after the reload is complete, and it is guarded by PolicyKit\&.
 .SH "DEBUGGING"
 .PP
 The following environment variables are supported to help debugging\&. When used in conjunction with the