From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Mon, 24 Sep 2018 09:29:55 +0100
Subject: Import Upstream version 1.12.2

---
 man/NetworkManager.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'man/NetworkManager.xml')

diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 60dbe7d7..7b0513bb 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -181,6 +181,13 @@
       The environment contains more information about the interface and the connection.
       The following variables are available for the use in the dispatcher scripts:
       <variablelist class="dispatcher-environment">
+        <varlistentry>
+          <term><varname>NM_DISPATCHER_ACTION</varname></term>
+          <listitem><para>
+            The dispatcher action like "up" or "dhcp4-change", identical to the first
+            command line argument. Since NetworkManager 1.12.0.
+          </para></listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>CONNECTION_UUID</varname></term>
           <listitem><para>
@@ -376,9 +383,9 @@
         <term><option>--plugins</option></term>
         <listitem><para>List plugins used to manage system-wide
         connection settings.  This list has preference over plugins
-        specified in the configuration file.  Currently supported
-        plugins are: keyfile, <option>ifcfg-rh</option>,
-        <option>ifcfg-suse</option>, <option>ifupdown</option>.
+        specified in the configuration file.  See <literal>main.plugins</literal>
+        setting in <link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
+        for supported options.
         </para></listitem>
       </varlistentry>
       <varlistentry>
-- 
cgit 1.3.0-6-gf8a5