Merge tag 'upstream/1.4.4'

Upstream version 1.4.4
author: Aron Xu <aron@debian.org> 2016-12-20 20:07:38 +0800
committer: Aron Xu <aron@debian.org> 2016-12-20 20:07:38 +0800
commit: 3bf5cabfc7d7a3c7fdb4e2bc3d771d2a07db8bc0 (patch)
tree: 1ac587c7e73af842b847599dc29b44430bf112ff /docs/api/html/NetworkManager.html
parent: 1836daa45f4f0d8d0b791ed020774b915e9dd92d (diff)
parent: 45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)
1 files changed, 28 insertions, 16 deletions
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index 10704589..3fa72590 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NetworkManager: NetworkManager Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="NetworkManager Reference Manual">
 <link rel="up" href="manpages.html" title="Manual Pages">
 <link rel="prev" href="nmcli-examples.html" title="nmcli-examples">
@@ -51,7 +51,8 @@
 <a name="id-1.2.10.6"></a><h2>Dispatcher scripts</h2>
 <p>
       NetworkManager will execute scripts in the
-      /etc/NetworkManager/dispatcher.d directory or subdirectories in
+      <code class="filename">/etc/NetworkManager/dispatcher.d</code>
+      directory or subdirectories in
       alphabetical order in response to network events.  Each script should
       be a regular executable file owned by root.  Furthermore, it must not be
       writable by group or other, and not setuid.
@@ -75,8 +76,8 @@
 <td><p><span class="term"><code class="varname">pre-up</code></span></p></td>
 <td><p>The interface is connected to the network but is not
         yet fully activated.  Scripts acting on this event must be placed or
-        symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory,
-        and NetworkManager will wait for script execution to complete before
+        symlinked into the <code class="filename">/etc/NetworkManager/dispatcher.d/pre-up.d</code>
+        directory, and NetworkManager will wait for script execution to complete before
         indicating to applications that the interface is fully activated.
         </p></td>
 </tr>
@@ -88,7 +89,7 @@
 <td><p><span class="term"><code class="varname">pre-down</code></span></p></td>
 <td><p>The interface will be deactivated but has not yet been
         disconnected from the network.  Scripts acting on this event must be
-        placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d
+        placed or symlinked into the <code class="filename">/etc/NetworkManager/dispatcher.d/pre-down.d</code>
         directory, and NetworkManager will wait for script execution to complete
         before disconnecting the interface from its network.  Note that this
         event is not emitted for forced disconnections, like when carrier is
@@ -106,8 +107,8 @@
 <td><p><span class="term"><code class="varname">vpn-pre-up</code></span></p></td>
 <td><p>The VPN is connected to the network but is not yet
         fully activated.  Scripts acting on this event must be placed or
-        symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory,
-        and NetworkManager will wait for script execution to complete before
+        symlinked into the <code class="filename">/etc/NetworkManager/dispatcher.d/pre-up.d</code>
+        directory, and NetworkManager will wait for script execution to complete before
         indicating to applications that the VPN is fully activated.
         </p></td>
 </tr>
@@ -121,7 +122,7 @@
 <td><p><span class="term"><code class="varname">vpn-pre-down</code></span></p></td>
 <td><p>The VPN will be deactivated but has not yet been
         disconnected from the network.  Scripts acting on this event must be
-        placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d
+        placed or symlinked into the <code class="filename">/etc/NetworkManager/dispatcher.d/pre-down.d</code>
         directory, and NetworkManager will wait for script execution to complete
         before disconnecting the VPN from its network.  Note that this
         event is not emitted for forced disconnections, like when the VPN
@@ -304,7 +305,8 @@
       NetworkManager process, and will be killed if they run for too long. If your script
       might take arbitrarily long to complete, you should spawn a child process and have the
       parent return immediately. Scripts that are symbolic links pointing inside the
-      /etc/NetworkManager/dispatcher.d/no-wait.d/ directory are run immediately, without
+      <code class="filename">/etc/NetworkManager/dispatcher.d/no-wait.d/</code>
+      directory are run immediately, without
       waiting for the termination of previous scripts, and in parallel. Also beware that
       once a script is queued, it will always be run, even if a later event renders it
       obsolete. (Eg, if an interface goes up, and then back down again quickly, it is
@@ -352,14 +354,16 @@
 <td><p><span class="term"><code class="option">--state-file</code></span></p></td>
 <td><p>Specify file for storing state of the
         NetworkManager persistently.  If not specified, the default
-        value of /var/lib/NetworkManager/NetworkManager.state is used.
+        value of <code class="filename">/var/lib/NetworkManager/NetworkManager.state</code>
+        is used.
         </p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="option">--config</code></span></p></td>
 <td><p> Specify configuration file to set up various
         settings for NetworkManager.  If not specified, the default
-        value of /etc/NetworkManager/NetworkManager.conf is used with
+        value of <code class="filename">/etc/NetworkManager/NetworkManager.conf</code>
+        is used with
         a fallback to the older 'nm-system-settings.conf' if located
         in the same directory.  See
         <a class="link" href="NetworkManager.conf.html" title="NetworkManager.conf"><span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span></a>
@@ -405,7 +409,7 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="id-1.2.10.8"></a><h2>UDEV PROPERTIES</h2>
+<a name="id-1.2.10.8"></a><h2>Udev Properties</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">udev</span>(7)</span>
       device manager is used for the network device discovery. The following
@@ -456,8 +460,8 @@
           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.
+          its configuration in <code class="filename">/etc/NetworkManager/dnsmasq.d</code>.
+          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
@@ -495,7 +499,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.2.10.10"></a><h2>DEBUGGING</h2>
+<a name="id-1.2.10.10"></a><h2>Debugging</h2>
 <p>
       The following environment variables are supported to help
       debugging.  When used in conjunction with the
@@ -512,8 +516,16 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.2.10.11"></a><h2>See Also</h2>
+<a name="id-1.2.10.11"></a><h2>Bugs</h2>
 <p>
+      Please report any bugs you find in NetworkManager at the
+      <a class="ulink" href="https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager" target="_top">NetworkManager bug tracker</a>.
+    </p>
+</div>
+<div class="refsect1">
+<a name="id-1.2.10.12"></a><h2>See Also</h2>
+<p>
+      <a class="ulink" href="https://wiki.gnome.org/Projects/NetworkManager" target="_top">NetworkManager home page</a>,
       <a class="link" href="NetworkManager.conf.html" title="NetworkManager.conf"><span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span></a>,
       <a class="link" href="nmcli.html" title="nmcli"><span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span></a>,
       <a class="link" href="nmcli-examples.html" title="nmcli-examples"><span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></a>,
author	Aron Xu <aron@debian.org>	2016-12-20 20:07:38 +0800
committer	Aron Xu <aron@debian.org>	2016-12-20 20:07:38 +0800
commit	3bf5cabfc7d7a3c7fdb4e2bc3d771d2a07db8bc0 (patch)
tree	1ac587c7e73af842b847599dc29b44430bf112ff /docs/api/html/NetworkManager.html
parent	1836daa45f4f0d8d0b791ed020774b915e9dd92d (diff)
parent	45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)