diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /man/NetworkManager.8 | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'man/NetworkManager.8')
| -rw-r--r-- | man/NetworkManager.8 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 95b2e7ca..5cf80c19 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 12/01/2018 +.\" Date: 10/24/2018 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.12.6 +.\" Source: NetworkManager 1.14.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.12\&.6" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.14\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -260,6 +260,13 @@ is used with a fallback to the older \*(Aqnm\-system\-settings\&.conf\*(Aq if lo for more information on configuration file\&. .RE .PP +\fB\-\-configure\-and\-quit\fR [initrd] +.RS 4 +Quit after all devices reach a stable state\&. The optional +initrd +parameter enables mode, where no processes are left running after NetworkManager stops, which is useful for running from an initial ramdisk on rearly boot\&. +.RE +.PP \fB\-\-plugins\fR .RS 4 List plugins used to manage system\-wide connection settings\&. This list has preference over plugins specified in the configuration file\&. See |