New upstream version 1.38.4 upstream/1.38.4

1 files changed, 351 insertions, 202 deletions

diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.xml
index 89664bbc..31d0ad28 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.xml
@@ -91,7 +91,9 @@
   </refsect1>
 <refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager">
   <title role="desc.title">Description</title>
-  <para></para>
+  <para>
+</para><para>
+</para>
 </refsect1>
 <refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager">
   <title role="details.title">Method Details</title>
@@ -101,30 +103,34 @@
 <programlisting>
 Reload (IN  u flags);
 </programlisting>
-<para>        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
-        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
-        allows for more fine-grained control over what to reload (see <parameter>flags</parameter>). It also allows
-        non-root access via PolicyKit and contrary to signals it is synchronous.
-</para><para>        No flags (0x00) means to reload everything that is supported which is identical to
-        sending a SIGHUP.
-        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
-        does not include connections, which can be reloaded via Setting's ReloadConnections.
-        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
-        anew.
-        (0x04) means to restart the DNS plugin. This is for example useful when using
-        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
-        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
-        name resolution.
-        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
-        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
-        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
-        the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration
-        changes in NetworkManager.conf.
+<para>
+Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+allows for more fine-grained control over what to reload (see <parameter>flags</parameter>). It also allows
+non-root access via PolicyKit and contrary to signals it is synchronous.
+</para><para>
+No flags (0x00) means to reload everything that is supported which is identical to
+sending a SIGHUP.
+(0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+does not include connections, which can be reloaded via Setting's ReloadConnections.
+(0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+anew.
+(0x04) means to restart the DNS plugin. This is for example useful when using
+dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+name resolution.
+Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration
+changes in NetworkManager.conf.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>Optional flags to specify which parts shall be reloaded.</para></listitem>
+  <listitem><para>
+Optional flags to specify which parts shall be reloaded.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -134,12 +140,15 @@ Reload (IN  u flags);
 <programlisting>
 GetDevices (OUT ao devices);
 </programlisting>
-<para>        Get the list of realized network devices.
+<para>
+Get the list of realized network devices.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para>List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).</para></listitem>
+  <listitem><para>
+List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -149,12 +158,15 @@ GetDevices (OUT ao devices);
 <programlisting>
 GetAllDevices (OUT ao devices);
 </programlisting>
-<para>        Get the list of all network devices.
+<para>
+Get the list of all network devices.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para>List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).</para></listitem>
+  <listitem><para>
+List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -165,18 +177,23 @@ GetAllDevices (OUT ao devices);
 GetDeviceByIpIface (IN  s iface,
                     OUT o device);
 </programlisting>
-<para>        Return the object path of the network device referenced by its IP
-        interface name. Note that some devices (usually modems) only have an IP
-        interface name when they are connected.
+<para>
+Return the object path of the network device referenced by its IP
+interface name. Note that some devices (usually modems) only have an IP
+interface name when they are connected.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN s <parameter>iface</parameter></literal>:</term>
-  <listitem><para>Interface name of the device to find.</para></listitem>
+  <listitem><para>
+Interface name of the device to find.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>device</parameter></literal>:</term>
-  <listitem><para>Object path of the network device.</para></listitem>
+  <listitem><para>
+Object path of the network device.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -189,24 +206,33 @@ ActivateConnection (IN  o connection,
                     IN  o specific_object,
                     OUT o active_connection);
 </programlisting>
-<para>        Activate a connection using the supplied device.
+<para>
+Activate a connection using the supplied device.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN o <parameter>connection</parameter></literal>:</term>
-  <listitem><para>The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.</para></listitem>
+  <listitem><para>
+The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>device</parameter></literal>:</term>
-  <listitem><para>The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.</para></listitem>
+  <listitem><para>
+The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>specific_object</parameter></literal>:</term>
-  <listitem><para>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.</para></listitem>
+  <listitem><para>
+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The path of the active connection object representing this active connection.</para></listitem>
+  <listitem><para>
+The path of the active connection object representing this active connection.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -220,32 +246,44 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
                           OUT o         path,
                           OUT o         active_connection);
 </programlisting>
-<para>        Adds a new connection using the given details (if any) as a template
-        (automatically filling in missing settings with the capabilities of the
-        given device and specific object), then activate the new connection.
-        Cannot be used for VPN connections at this time.
-</para><para>        See also AddAndActivateConnection2.
+<para>
+Adds a new connection using the given details (if any) as a template
+(automatically filling in missing settings with the capabilities of the
+given device and specific object), then activate the new connection.
+Cannot be used for VPN connections at this time.
+</para><para>
+See also AddAndActivateConnection2.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.</para></listitem>
+  <listitem><para>
+Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>device</parameter></literal>:</term>
-  <listitem><para>The object path of device to be activated using the given connection.</para></listitem>
+  <listitem><para>
+The object path of device to be activated using the given connection.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>specific_object</parameter></literal>:</term>
-  <listitem><para>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.</para></listitem>
+  <listitem><para>
+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>path</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection that was just added.</para></listitem>
+  <listitem><para>
+Object path of the new connection that was just added.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The path of the active connection object representing this active connection.</para></listitem>
+  <listitem><para>
+The path of the active connection object representing this active connection.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -261,43 +299,60 @@ AddAndActivateConnection2 (IN  a{sa{sv}} connection,
                            OUT o         active_connection,
                            OUT a{sv}     result);
 </programlisting>
-<para>        Adds a new connection using the given details (if any) as a template
-        (automatically filling in missing settings with the capabilities of the
-        given device and specific object), then activate the new connection.
-        Cannot be used for VPN connections at this time.
-</para><para>        This method extends AddAndActivateConnection to allow passing further
-        parameters. At this time the following options are supported:
-</para><para>         * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
-         * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
+<para>
+Adds a new connection using the given details (if any) as a template
+(automatically filling in missing settings with the capabilities of the
+given device and specific object), then activate the new connection.
+Cannot be used for VPN connections at this time.
+</para><para>
+This method extends AddAndActivateConnection to allow passing further
+parameters. At this time the following options are supported:
+</para><para>
+* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
+* bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.</para></listitem>
+  <listitem><para>
+Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>device</parameter></literal>:</term>
-  <listitem><para>The object path of device to be activated using the given connection.</para></listitem>
+  <listitem><para>
+The object path of device to be activated using the given connection.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN o <parameter>specific_object</parameter></literal>:</term>
-  <listitem><para>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.</para></listitem>
+  <listitem><para>
+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN a{sv} <parameter>options</parameter></literal>:</term>
-  <listitem><para>Further options for the method call.</para></listitem>
+  <listitem><para>
+Further options for the method call.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>path</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection that was just added.</para></listitem>
+  <listitem><para>
+Object path of the new connection that was just added.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The path of the active connection object representing this active connection.</para></listitem>
+  <listitem><para>
+The path of the active connection object representing this active connection.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT a{sv} <parameter>result</parameter></literal>:</term>
-  <listitem><para>A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported.</para></listitem>
+  <listitem><para>
+A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -307,12 +362,15 @@ AddAndActivateConnection2 (IN  a{sa{sv}} connection,
 <programlisting>
 DeactivateConnection (IN  o active_connection);
 </programlisting>
-<para>        Deactivate an active connection.
+<para>
+Deactivate an active connection.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The currently active connection to deactivate.</para></listitem>
+  <listitem><para>
+The currently active connection to deactivate.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -322,15 +380,18 @@ DeactivateConnection (IN  o active_connection);
 <programlisting>
 Sleep (IN  b sleep);
 </programlisting>
-<para>        Control the NetworkManager daemon's sleep state. When asleep, all
-        interfaces that it manages are deactivated. When awake, devices are
-        available to be activated. This command should not be called directly by
-        users or clients; it is intended for system suspend/resume tracking.
+<para>
+Control the NetworkManager daemon's sleep state. When asleep, all
+interfaces that it manages are deactivated. When awake, devices are
+available to be activated. This command should not be called directly by
+users or clients; it is intended for system suspend/resume tracking.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN b <parameter>sleep</parameter></literal>:</term>
-  <listitem><para>Indicates whether the NetworkManager daemon should sleep or wake.</para></listitem>
+  <listitem><para>
+Indicates whether the NetworkManager daemon should sleep or wake.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -340,16 +401,19 @@ Sleep (IN  b sleep);
 <programlisting>
 Enable (IN  b enable);
 </programlisting>
-<para>        Control whether overall networking is enabled or disabled. When disabled,
-        all interfaces that NM manages are deactivated. When enabled, all managed
-        interfaces are re-enabled and available to be activated. This command
-        should be used by clients that provide to users the ability to
-        enable/disable all networking.
+<para>
+Control whether overall networking is enabled or disabled. When disabled,
+all interfaces that NM manages are deactivated. When enabled, all managed
+interfaces are re-enabled and available to be activated. This command
+should be used by clients that provide to users the ability to
+enable/disable all networking.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN b <parameter>enable</parameter></literal>:</term>
-  <listitem><para>If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.</para></listitem>
+  <listitem><para>
+If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -359,14 +423,17 @@ Enable (IN  b enable);
 <programlisting>
 GetPermissions (OUT a{ss} permissions);
 </programlisting>
-<para>        Returns the permissions a caller has for various authenticated operations
-        that NetworkManager provides, like Enable/Disable networking, changing
-        Wi-Fi, WWAN, and WiMAX state, etc.
+<para>
+Returns the permissions a caller has for various authenticated operations
+that NetworkManager provides, like Enable/Disable networking, changing
+Wi-Fi, WWAN, and WiMAX state, etc.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT a{ss} <parameter>permissions</parameter></literal>:</term>
-  <listitem><para>Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.</para></listitem>
+  <listitem><para>
+Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -377,16 +444,21 @@ GetPermissions (OUT a{ss} permissions);
 SetLogging (IN  s level,
             IN  s domains);
 </programlisting>
-<para>        Set logging verbosity and which operations are logged.
+<para>
+Set logging verbosity and which operations are logged.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN s <parameter>level</parameter></literal>:</term>
-  <listitem><para>One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.</para></listitem>
+  <listitem><para>
+One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN s <parameter>domains</parameter></literal>:</term>
-  <listitem><para>A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.</para></listitem>
+  <listitem><para>
+A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -397,16 +469,21 @@ SetLogging (IN  s level,
 GetLogging (OUT s level,
             OUT s domains);
 </programlisting>
-<para>        Get current logging verbosity level and operations domains.
+<para>
+Get current logging verbosity level and operations domains.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT s <parameter>level</parameter></literal>:</term>
-  <listitem><para>One of [ERR, WARN, INFO, DEBUG, TRACE].</para></listitem>
+  <listitem><para>
+One of [ERR, WARN, INFO, DEBUG, TRACE].
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT s <parameter>domains</parameter></literal>:</term>
-  <listitem><para>For available domains see SetLogging() call.</para></listitem>
+  <listitem><para>
+For available domains see SetLogging() call.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -416,12 +493,15 @@ GetLogging (OUT s level,
 <programlisting>
 CheckConnectivity (OUT u connectivity);
 </programlisting>
-<para>        Re-check the network connectivity state.
+<para>
+Re-check the network connectivity state.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT u <parameter>connectivity</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMConnectivityState">NMConnectivityState</link>) The current connectivity state.</para></listitem>
+  <listitem><para>
+(<link linkend="NMConnectivityState">NMConnectivityState</link>) The current connectivity state.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -431,13 +511,16 @@ CheckConnectivity (OUT u connectivity);
 <programlisting>
 state (OUT u state);
 </programlisting>
-<para>        The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under its management.
+<para>
+The overall networking state as determined by the NetworkManager daemon,
+based on the state of network devices under its management.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>OUT u <parameter>state</parameter></literal>:</term>
-  <listitem><para><link linkend="NMState">NMState</link></para></listitem>
+  <listitem><para>
+<link linkend="NMState">NMState</link>
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -450,26 +533,35 @@ CheckpointCreate (IN  ao devices,
                   IN  u  flags,
                   OUT o  checkpoint);
 </programlisting>
-<para>        Create a checkpoint of the current networking configuration
-        for given interfaces. If <parameter>rollback_timeout</parameter> is not zero, a
-        rollback is automatically performed after the given timeout.
+<para>
+Create a checkpoint of the current networking configuration
+for given interfaces. If <parameter>rollback_timeout</parameter> is not zero, a
+rollback is automatically performed after the given timeout.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para>A list of device paths for which a checkpoint should be created. An empty list means all devices.</para></listitem>
+  <listitem><para>
+A list of device paths for which a checkpoint should be created. An empty list means all devices.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN u <parameter>rollback_timeout</parameter></literal>:</term>
-  <listitem><para>The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.</para></listitem>
+  <listitem><para>
+The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMCheckpointCreateFlags">NMCheckpointCreateFlags</link>) Flags for the creation.</para></listitem>
+  <listitem><para>
+(<link linkend="NMCheckpointCreateFlags">NMCheckpointCreateFlags</link>) Flags for the creation.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>On success, the path of the new checkpoint.</para></listitem>
+  <listitem><para>
+On success, the path of the new checkpoint.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -479,12 +571,15 @@ CheckpointCreate (IN  ao devices,
 <programlisting>
 CheckpointDestroy (IN  o checkpoint);
 </programlisting>
-<para>        Destroy a previously created checkpoint.
+<para>
+Destroy a previously created checkpoint.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.</para></listitem>
+  <listitem><para>
+The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -495,16 +590,21 @@ CheckpointDestroy (IN  o checkpoint);
 CheckpointRollback (IN  o     checkpoint,
                     OUT a{su} result);
 </programlisting>
-<para>        Rollback a checkpoint before the timeout is reached.
+<para>
+Rollback a checkpoint before the timeout is reached.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>The checkpoint to be rolled back.</para></listitem>
+  <listitem><para>
+The checkpoint to be rolled back.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>OUT a{su} <parameter>result</parameter></literal>:</term>
-  <listitem><para>On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a <link linkend="NMRollbackResult">RollbackResult</link>.</para></listitem>
+  <listitem><para>
+On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a <link linkend="NMRollbackResult">RollbackResult</link>.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -515,23 +615,29 @@ CheckpointRollback (IN  o     checkpoint,
 CheckpointAdjustRollbackTimeout (IN  o checkpoint,
                                  IN  u add_timeout);
 </programlisting>
-<para>        Reset the timeout for rollback for the checkpoint.
-</para><para>        Note that the added seconds start counting from now,
-        not "Created" timestamp or the previous expiration
-        time. Note that the "Created" property of the checkpoint
-        will stay unchanged by this call. However, the "RollbackTimeout"
-        will be recalculated to give the approximate new expiration time.
-        The new "RollbackTimeout" property will be approximate up to
-        one second precision, which is the accuracy of the property.
+<para>
+Reset the timeout for rollback for the checkpoint.
+</para><para>
+Note that the added seconds start counting from now,
+not "Created" timestamp or the previous expiration
+time. Note that the "Created" property of the checkpoint
+will stay unchanged by this call. However, the "RollbackTimeout"
+will be recalculated to give the approximate new expiration time.
+The new "RollbackTimeout" property will be approximate up to
+one second precision, which is the accuracy of the property.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>IN o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>The checkpoint to be rolled back.</para></listitem>
+  <listitem><para>
+The checkpoint to be rolled back.
+</para></listitem>
 </varlistentry>
 <varlistentry>
   <term><literal>IN u <parameter>add_timeout</parameter></literal>:</term>
-  <listitem><para>Number of seconds from <emphasis>now</emphasis> in which the timeout will expire. Set to 0 to disable the timeout.</para></listitem>
+  <listitem><para>
+Number of seconds from <emphasis>now</emphasis> in which the timeout will expire. Set to 0 to disable the timeout.
+</para></listitem>
 </varlistentry>
 </variablelist>
 <para role="since">Since 1.12</para>
@@ -545,8 +651,9 @@ CheckpointAdjustRollbackTimeout (IN  o checkpoint,
 <programlisting>
 CheckPermissions ();
 </programlisting>
-<para>        Emitted when system authorization details change, indicating that clients
-        may wish to recheck permissions with GetPermissions.
+<para>
+Emitted when system authorization details change, indicating that clients
+may wish to recheck permissions with GetPermissions.
 </para>
 </refsect2>
 <refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.StateChanged">
@@ -555,12 +662,15 @@ CheckPermissions ();
 <programlisting>
 StateChanged (u state);
 </programlisting>
-<para>        NetworkManager's state changed.
+<para>
+NetworkManager's state changed.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>u <parameter>state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMState">NMState</link>) The new state of NetworkManager.</para></listitem>
+  <listitem><para>
+(<link linkend="NMState">NMState</link>) The new state of NetworkManager.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -570,12 +680,15 @@ StateChanged (u state);
 <programlisting>
 DeviceAdded (o device_path);
 </programlisting>
-<para>        A device was added to the system
+<para>
+A device was added to the system
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>o <parameter>device_path</parameter></literal>:</term>
-  <listitem><para>The object path of the newly added device.</para></listitem>
+  <listitem><para>
+The object path of the newly added device.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -585,12 +698,15 @@ DeviceAdded (o device_path);
 <programlisting>
 DeviceRemoved (o device_path);
 </programlisting>
-<para>        A device was removed from the system, and is no longer available.
+<para>
+A device was removed from the system, and is no longer available.
 </para>
 <variablelist role="params">
 <varlistentry>
   <term><literal>o <parameter>device_path</parameter></literal>:</term>
-  <listitem><para>The object path of the device that was just removed.</para></listitem>
+  <listitem><para>
+The object path of the device that was just removed.
+</para></listitem>
 </varlistentry>
 </variablelist>
 </refsect2>
@@ -603,9 +719,10 @@ DeviceRemoved (o device_path);
 <programlisting>
 Devices  readable   ao
 </programlisting>
-<para>        The list of realized network devices. Realized devices are those which
-        have backing resources (eg from the kernel or a management daemon like
-        ModemManager, teamd, etc).
+<para>
+The list of realized network devices. Realized devices are those which
+have backing resources (eg from the kernel or a management daemon like
+ModemManager, teamd, etc).
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.AllDevices">
@@ -614,9 +731,10 @@ Devices  readable   ao
 <programlisting>
 AllDevices  readable   ao
 </programlisting>
-<para>        The list of both realized and un-realized network devices. Un-realized
-        devices are software devices which do not yet have backing resources, but
-        for which backing resources can be created if the device is activated.
+<para>
+The list of both realized and un-realized network devices. Un-realized
+devices are software devices which do not yet have backing resources, but
+for which backing resources can be created if the device is activated.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Checkpoints">
@@ -625,7 +743,8 @@ AllDevices  readable   ao
 <programlisting>
 Checkpoints  readable   ao
 </programlisting>
-<para>        The list of active checkpoints.
+<para>
+The list of active checkpoints.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled">
@@ -634,8 +753,9 @@ Checkpoints  readable   ao
 <programlisting>
 NetworkingEnabled  readable   b
 </programlisting>
-<para>        Indicates if overall networking is currently enabled or not. See the
-        Enable() method.
+<para>
+Indicates if overall networking is currently enabled or not. See the
+Enable() method.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled">
@@ -644,7 +764,8 @@ NetworkingEnabled  readable   b
 <programlisting>
 WirelessEnabled  readwrite  b
 </programlisting>
-<para>        Indicates if wireless is currently enabled or not.
+<para>
+Indicates if wireless is currently enabled or not.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled">
@@ -653,8 +774,9 @@ WirelessEnabled  readwrite  b
 <programlisting>
 WirelessHardwareEnabled  readable   b
 </programlisting>
-<para>        Indicates if the wireless hardware is currently enabled, i.e. the state of
-        the RF kill switch.
+<para>
+Indicates if the wireless hardware is currently enabled, i.e. the state of
+the RF kill switch.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WwanEnabled">
@@ -663,7 +785,8 @@ WirelessHardwareEnabled  readable   b
 <programlisting>
 WwanEnabled  readwrite  b
 </programlisting>
-<para>        Indicates if mobile broadband devices are currently enabled or not.
+<para>
+Indicates if mobile broadband devices are currently enabled or not.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">
@@ -672,8 +795,9 @@ WwanEnabled  readwrite  b
 <programlisting>
 WwanHardwareEnabled  readable   b
 </programlisting>
-<para>        Indicates if the mobile broadband hardware is currently enabled, i.e. the
-        state of the RF kill switch.
+<para>
+Indicates if the mobile broadband hardware is currently enabled, i.e. the
+state of the RF kill switch.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled">
@@ -682,8 +806,9 @@ WwanHardwareEnabled  readable   b
 <programlisting>
 WimaxEnabled  readwrite  b
 </programlisting>
-<para>        DEPRECATED. Doesn't have any meaning and is around only for
-        compatibility reasons.
+<para>
+DEPRECATED. Doesn't have any meaning and is around only for
+compatibility reasons.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled">
@@ -692,8 +817,9 @@ WimaxEnabled  readwrite  b
 <programlisting>
 WimaxHardwareEnabled  readable   b
 </programlisting>
-<para>        DEPRECATED. Doesn't have any meaning and is around only for
-        compatibility reasons.
+<para>
+DEPRECATED. Doesn't have any meaning and is around only for
+compatibility reasons.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.RadioFlags">
@@ -702,9 +828,10 @@ WimaxHardwareEnabled  readable   b
 <programlisting>
 RadioFlags  readable   u
 </programlisting>
-<para>        Flags related to radio devices. See <link
-        linkend="NMRadioFlags">NMRadioFlags</link> for the list of flags
-        supported.
+<para>
+Flags related to radio devices. See <link
+linkend="NMRadioFlags">NMRadioFlags</link> for the list of flags
+supported.
 </para>
 <para role="since">Since 1.38</para>
 </refsect2>
@@ -714,7 +841,8 @@ RadioFlags  readable   u
 <programlisting>
 ActiveConnections  readable   ao
 </programlisting>
-<para>        List of active connection object paths.
+<para>
+List of active connection object paths.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection">
@@ -723,11 +851,12 @@ ActiveConnections  readable   ao
 <programlisting>
 PrimaryConnection  readable   o
 </programlisting>
-<para>        The object path of the "primary" active connection being used to access
-        the network. In particular, if there is no VPN active, or the VPN does not
-        have the default route, then this indicates the connection that has the
-        default route. If there is a VPN active with the default route, then this
-        indicates the connection that contains the route to the VPN endpoint.
+<para>
+The object path of the "primary" active connection being used to access
+the network. In particular, if there is no VPN active, or the VPN does not
+have the default route, then this indicates the connection that has the
+default route. If there is a VPN active with the default route, then this
+indicates the connection that contains the route to the VPN endpoint.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType">
@@ -736,9 +865,10 @@ PrimaryConnection  readable   o
 <programlisting>
 PrimaryConnectionType  readable   s
 </programlisting>
-<para>        The connection type of the "primary" active connection being used to
-        access the network. This is the same as the Type property on the object
-        indicated by PrimaryConnection.
+<para>
+The connection type of the "primary" active connection being used to
+access the network. This is the same as the Type property on the object
+indicated by PrimaryConnection.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Metered">
@@ -747,9 +877,11 @@ PrimaryConnectionType  readable   s
 <programlisting>
 Metered  readable   u
 </programlisting>
-<para>        Indicates whether the connectivity is metered. This is equivalent to the
-        metered property of the device associated with the primary connection.
-</para><para>        Returns: <link linkend="NMMetered">NMMetered</link>
+<para>
+Indicates whether the connectivity is metered. This is equivalent to the
+metered property of the device associated with the primary connection.
+</para><para>
+Returns: <link linkend="NMMetered">NMMetered</link>
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection">
@@ -758,9 +890,10 @@ Metered  readable   u
 <programlisting>
 ActivatingConnection  readable   o
 </programlisting>
-<para>        The object path of an active connection that is currently being activated
-        and which is expected to become the new PrimaryConnection when it finishes
-        activating.
+<para>
+The object path of an active connection that is currently being activated
+and which is expected to become the new PrimaryConnection when it finishes
+activating.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Startup">
@@ -769,9 +902,10 @@ ActivatingConnection  readable   o
 <programlisting>
 Startup  readable   b
 </programlisting>
-<para>        Indicates whether NM is still starting up; this becomes FALSE when NM has
-        finished attempting to activate every connection that it might be able to
-        activate at startup.
+<para>
+Indicates whether NM is still starting up; this becomes FALSE when NM has
+finished attempting to activate every connection that it might be able to
+activate at startup.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Version">
@@ -780,7 +914,8 @@ Startup  readable   b
 <programlisting>
 Version  readable   s
 </programlisting>
-<para>        NetworkManager version.
+<para>
+NetworkManager version.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Capabilities">
@@ -789,10 +924,11 @@ Version  readable   s
 <programlisting>
 Capabilities  readable   au
 </programlisting>
-<para>        The current set of capabilities. See <link
-        linkend="NMCapability">NMCapability</link> for currently
-        defined capability numbers. The array is guaranteed to
-        be sorted in ascending order without duplicates.
+<para>
+The current set of capabilities. See <link
+linkend="NMCapability">NMCapability</link> for currently
+defined capability numbers. The array is guaranteed to
+be sorted in ascending order without duplicates.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.State">
@@ -801,15 +937,19 @@ Capabilities  readable   au
 <programlisting>
 State  readable   u
 </programlisting>
-<para>        The overall state of the NetworkManager daemon.
-</para><para>        This takes state of all active connections and the connectivity state into account
-        to produce a single indicator of the network accessibility status.
-</para><para>        The graphical shells may use this property to provide network connection status
-        indication and applications may use this to check if Internet connection is
-        accessible. Shell that is able to cope with captive portals should use the
-        "Connectivity" property to decide whether to present a captive portal authentication
-        dialog.
-</para><para>        Returns: <link linkend="NMState">NMState</link>
+<para>
+The overall state of the NetworkManager daemon.
+</para><para>
+This takes state of all active connections and the connectivity state into account
+to produce a single indicator of the network accessibility status.
+</para><para>
+The graphical shells may use this property to provide network connection status
+indication and applications may use this to check if Internet connection is
+accessible. Shell that is able to cope with captive portals should use the
+"Connectivity" property to decide whether to present a captive portal authentication
+dialog.
+</para><para>
+Returns: <link linkend="NMState">NMState</link>
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Connectivity">
@@ -818,18 +958,22 @@ State  readable   u
 <programlisting>
 Connectivity  readable   u
 </programlisting>
-<para>        The result of the last connectivity check. The connectivity check is triggered
-        automatically when a default connection becomes available, periodically and by
-        calling a CheckConnectivity() method.
-</para><para>        This property is in general useful for the graphical shell to determine whether
-        the Internet access is being hijacked by an authentication gateway (a "captive
-        portal"). In such case it would typically present a web browser window to give
-        the user a chance to authenticate and call CheckConnectivity() when the user
-        submits a form or dismisses the window.
-</para><para>        To determine the whether the user is able to access the Internet without dealing
-        with captive portals (e.g. to provide a network connection indicator or disable
-        controls that require Internet access), the "State" property is more suitable.
-</para><para>        Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
+<para>
+The result of the last connectivity check. The connectivity check is triggered
+automatically when a default connection becomes available, periodically and by
+calling a CheckConnectivity() method.
+</para><para>
+This property is in general useful for the graphical shell to determine whether
+the Internet access is being hijacked by an authentication gateway (a "captive
+portal"). In such case it would typically present a web browser window to give
+the user a chance to authenticate and call CheckConnectivity() when the user
+submits a form or dismisses the window.
+</para><para>
+To determine the whether the user is able to access the Internet without dealing
+with captive portals (e.g. to provide a network connection indicator or disable
+controls that require Internet access), the "State" property is more suitable.
+</para><para>
+Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckAvailable">
@@ -838,12 +982,14 @@ Connectivity  readable   u
 <programlisting>
 ConnectivityCheckAvailable  readable   b
 </programlisting>
-<para>        Indicates whether connectivity checking service has been
-        configured.  This may return true even if the service is not
-        currently enabled.
-</para><para>        This is primarily intended for use in a privacy control panel,
-        as a way to determine whether to show an option to
-        enable/disable the feature.
+<para>
+Indicates whether connectivity checking service has been
+configured.  This may return true even if the service is not
+currently enabled.
+</para><para>
+This is primarily intended for use in a privacy control panel,
+as a way to determine whether to show an option to
+enable/disable the feature.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckEnabled">
@@ -852,9 +998,10 @@ ConnectivityCheckAvailable  readable   b
 <programlisting>
 ConnectivityCheckEnabled  readwrite  b
 </programlisting>
-<para>        Indicates whether connectivity checking is enabled.  This
-        property can also be written to disable connectivity
-        checking (as a privacy control panel might want to do).
+<para>
+Indicates whether connectivity checking is enabled.  This
+property can also be written to disable connectivity
+checking (as a privacy control panel might want to do).
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckUri">
@@ -863,7 +1010,8 @@ ConnectivityCheckEnabled  readwrite  b
 <programlisting>
 ConnectivityCheckUri  readable   s
 </programlisting>
-<para>        The URI that NetworkManager will hit to check if there is internet connectivity.
+<para>
+The URI that NetworkManager will hit to check if there is internet connectivity.
 </para>
 </refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration">
@@ -872,14 +1020,15 @@ ConnectivityCheckUri  readable   s
 <programlisting>
 GlobalDnsConfiguration  readwrite  a{sv}
 </programlisting>
-<para>        Dictionary of global DNS settings where the key is one of "searches",
-        "options" and "domains". The values for the "searches" and "options" keys
-        are string arrays describing the list of search domains and resolver
-        options, respectively. The value of the "domains" key is a second-level
-        dictionary, where each key is a domain name, and each key's value is a
-        third-level dictionary with the keys "servers" and "options". "servers" is
-        a string array of DNS servers, "options" is a string array of
-        domain-specific options.
+<para>
+Dictionary of global DNS settings where the key is one of "searches",
+"options" and "domains". The values for the "searches" and "options" keys
+are string arrays describing the list of search domains and resolver
+options, respectively. The value of the "domains" key is a second-level
+dictionary, where each key is a domain name, and each key's value is a
+third-level dictionary with the keys "servers" and "options". "servers" is
+a string array of DNS servers, "options" is a string array of
+domain-specific options.
 </para>
 </refsect2>
 </refsect1>