Update upstream source from tag 'upstream/1.58_rc1'

Update to upstream version '1.58~rc1'
with Debian dir 451489c9234e2b6b7c2f41ca6670287ea3ac3efd

4 files changed, 58 insertions, 24 deletions

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 6c055e9d..2a14e160 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -83,6 +83,11 @@
     note that your distribution or other packages may drop configuration snippets for NetworkManager, such
     that they are part of the factory default.
     </para>
+    <para>
+    The options that are indicated as boolean can be set to one of these values:
+    <literal>yes</literal>, <literal>true</literal>, <literal>on</literal>, <literal>1</literal>,
+    <literal>no</literal>, <literal>false</literal>, <literal>off</literal>, <literal>0</literal>.
+    </para>
 
   </refsect1>
 
@@ -950,6 +955,10 @@ ipv6.ip6-privacy=0
           <listitem><para>Whether to configure IPv4 sysctl interface-specific forwarding. When enabled, the interface will act as a router to forward the IPv4 packet from one interface to another. If left unspecified, "auto" is used, so NetworkManager sets the IPv4 forwarding if any shared connection is active, or it will use the kernel default value otherwise. The "ipv4.forwarding" property is ignored when "ipv4.method" is set to "shared", because forwarding is always enabled in this case. The accepted values are: 0: disabled, 1: enabled, 2: auto, 3: ignored (leave the forwarding unchanged).</para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>ipv4.clat</varname></term>
+          <listitem><para>If left unspecified, defaults to "no".</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>ipv4.routed-dns</varname></term>
         </varlistentry>
         <varlistentry>
@@ -967,7 +976,7 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>ipv4.dhcp-ipv6-only-preferred</varname></term>
-          <listitem><para>If left unspecified, the "IPv6-only preferred" DHCPv4 option is disabled.</para></listitem>
+          <listitem><para>If left unspecified, it defaults to "auto".</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>ipv4.dhcp-hostname-flags</varname></term>
@@ -1249,12 +1258,13 @@ managed=1
           <term><varname>managed</varname></term>
           <listitem>
             <para>
-              Whether the device is managed or not. A device can be
-              marked as managed via udev rules (ENV{NM_UNMANAGED}),
-              or via setting plugins (keyfile.unmanaged-devices).
-              This is yet another way. Note that this configuration
-              can be overruled at runtime via D-Bus. Also, it has
-              higher priority then udev rules.
+              A boolean value specifying whether the device is
+              managed or not. A device can be marked as managed via
+              udev rules (ENV{NM_UNMANAGED}), or via setting plugins
+              (keyfile.unmanaged-devices).  This is yet another
+              way. Note that this configuration can be overruled at
+              runtime via D-Bus. Also, it has higher priority than
+              udev rules.
             </para>
           </listitem>
         </varlistentry>
@@ -1323,10 +1333,28 @@ managed=1
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry id="check-connectivity">
+          <term><varname>check-connectivity</varname></term>
+          <listitem>
+            <para>
+              A boolean value specifying whether NetworkManager will perform a connectivity check
+              for this device. Defaults to <literal>yes</literal>.
+            </para>
+            <para>
+              This setting does nothing if the connectivity check has been
+              disabled globally using the
+              <literal>connectivity.enabled</literal> setting.
+            </para>
+          </listitem>
+        </varlistentry>
         <varlistentry id="keep-configuration">
-         <term><varname>keep-configuration</varname></term>
+          <term><varname>keep-configuration</varname></term>
           <listitem>
             <para>
+              A boolean value indicating whether the existing device
+              configuration is kept at startup.
+            </para>
+            <para>
               On startup, NetworkManager tries to not interfere with
               interfaces that are already configured. It does so by
               generating a in-memory connection based on the interface
@@ -1422,16 +1450,16 @@ managed=1
           <term><varname>wifi.iwd.autoconnect</varname></term>
           <listitem>
             <para>
-              If <literal>wifi.backend</literal> is <literal>iwd</literal>, setting this to
-              <literal>false</literal> forces IWD's autoconnect mechanism to be disabled for
-              this device and connections will only be initiated by NetworkManager whether
-              commanded by a client or automatically.  Leaving it <literal>true</literal> (default)
-              stops NetworkManager from automatically initiating connections and allows
-              IWD to use its network ranking and scanning logic to decide the best networks
-              to autoconnect to next.  Connections' <literal>autoconnect-priority</literal>,
-              <literal>autoconnect-retries</literal> settings will be ignored.  Other settings
-              like <literal>permissions</literal> or <literal>multi-connect</literal> may interfere
-              with IWD connection attempts.
+              A boolean value. If <literal>wifi.backend</literal> is <literal>iwd</literal>,
+              setting this to <literal>false</literal> forces IWD's autoconnect mechanism to be
+              disabled for this device and connections will only be initiated by NetworkManager
+              whether commanded by a client or automatically.  Leaving it <literal>true</literal>
+              (default) stops NetworkManager from automatically initiating connections and allows
+              IWD to use its network ranking and scanning logic to decide the best networks to
+              autoconnect to next.  Connections' <literal>autoconnect-priority</literal>,
+              <literal>autoconnect-retries</literal> settings will be ignored.  Other settings like
+              <literal>permissions</literal> or <literal>multi-connect</literal> may interfere with
+              IWD connection attempts.
             </para>
           </listitem>
         </varlistentry>
@@ -1490,7 +1518,7 @@ managed=1
       <variablelist>
         <varlistentry>
           <term><varname>enabled</varname></term>
-          <listitem><para>Whether connectivity check is enabled.
+          <listitem><para>A boolean indicating whether connectivity check is enabled.
           Note that to enable connectivity check, a valid uri must
           also be configured. The value defaults to true, but since
           the uri is unset by default, connectivity check may be disabled.
diff --git a/man/nm-cloud-setup.xml b/man/nm-cloud-setup.xml
index af98b592..efbfc766 100644
--- a/man/nm-cloud-setup.xml
+++ b/man/nm-cloud-setup.xml
@@ -143,7 +143,7 @@
       script is to automatically pick up changes to the network.</para>
 
       <para>The dispatcher script will do nothing, unless the systemd service is
-      enabled. To use the dispatcher script you should therefor run
+      enabled. To use the dispatcher script you should therefore run
       <command>systemctl enable nm-cloud-setup.service</command> once.</para>
     </refsect2>
 
@@ -197,7 +197,7 @@
     <para>Enable debug logging by setting <literal>NM_CLOUD_SETUP_LOG</literal> environment variable to <literal>TRACE</literal>.</para>
     <para>In the common case where nm-cloud-setup is running as systemd service, this can be done via <command>systemctl edit nm-cloud-setup.service</command>
     and add <literal>Environment=NM_CLOUD_SETUP_LOG=TRACE</literal> to the <literal>[Service]</literal> section. Afterwards, the log can
-    be found in syslog via <literal>journalctl</literal>. You may also want to enable debug logging in NetworkManager as descibed
+    be found in syslog via <literal>journalctl</literal>. You may also want to enable debug logging in NetworkManager as described
     in the DEBUGGING section in <link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
     manual. When sharing logs, it's best to share complete logs and not preemptively filter for NetworkManager or nm-cloud-setup logs.</para>
   </refsect1>
diff --git a/man/nmcli.xml b/man/nmcli.xml
index 94f4c64c..3df25a0c 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -1734,6 +1734,7 @@
             <group choice='req'>
               <arg choice='plain'>a</arg>
               <arg choice='plain'>bg</arg>
+              <arg choice='plain'>6GHz</arg>
             </group>
           </arg>
           <arg><option>channel</option> <replaceable>channel</replaceable></arg>
@@ -1867,9 +1868,9 @@
           connections with an option of restoring the network configuration to a
           known good state in case of an error.</para>
 
-          <para>If the a list of interface names is specified, the checkpoint is
-          taken, the checkpoint is takes only on the specified devices. Otherwise
-          a checkpoint is taken for all devices.</para>
+          <para>If a list of interface names is specified, the checkpoint is
+          taken only on the specified devices. Otherwise a checkpoint is taken for
+          all devices.</para>
 
           <para>Currently the timeout defaults to 15 seconds. This may change in
           a future version.</para>
diff --git a/man/nmtui.xml b/man/nmtui.xml
index eac94ab0..6eb5f6af 100644
--- a/man/nmtui.xml
+++ b/man/nmtui.xml
@@ -84,6 +84,11 @@
           <para>Show a connection editor that supports adding, modifying, viewing and
           deleting connections. It provides similar functionality as
           <command>nm-connection-editor</command>.</para>
+          <para>For Wi-Fi connections, the <option>Share QR...</option> button
+          displays a QR code that encodes the network credentials, so they can be
+          scanned to join the network from another device. When the password is
+          available, it is shown alongside the code; when it cannot be read
+          (for example, due to insufficient privileges), a warning is shown instead.</para>
         </listitem>
       </varlistentry>