New upstream version 1.24.0 upstream/1.24.0

1 files changed, 10 insertions, 1 deletions

diff --git a/man/nm-online.xml b/man/nm-online.xml
index 87072ec3..a0db6b3d 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -68,6 +68,14 @@
     and don't order them with respect to <literal>network-online.target</literal>
     at all.
     </para>
+
+    <para>By default, connections have the <literal>ipv4.may-fail</literal> and
+    <literal>ipv6.may-fail</literal> properties set to <literal>yes</literal>;
+    this means that NetworkManager waits for one of the two address families to
+    complete configuration before considering the connection activated. If you
+    need a specific address family configured before
+    <literal>network-online.target</literal> is reached, set the corresponding
+    <literal>may-fail</literal> property to <literal>no</literal>.</para>
   </refsect1>
 
   <refsect1 id='options'><title>Options</title>
@@ -137,7 +145,8 @@
 
         <listitem>
           <para>Time to wait for a connection, in seconds. If the option is not provided,
-          the default timeout is 30 seconds.</para>
+          the environment variable <literal>NM_ONLINE_TIMEOUT</literal> is honored.
+          The default timeout is 30 seconds.</para>
         </listitem>
       </varlistentry>