Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:update-docs into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Alfonso Sanchez-Beato]

* core/pppd-plugin: wait to recover port settings before notifying death
  See code branch MP:
  https://code.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager/+merge/387041
* docs: update to reflect current state

* core/pppd-plugin: wait to recover port settings before notifying death
  See code branch MP:
  https://code.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager/+merge/387041
* docs: update to reflect current state

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 3c8c77260a86470d37bec5f2cf9730e3719c4a45

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1337/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:3c8c77260a86470d37bec5f2cf9730e3719c4a45
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/515/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/548/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/548
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/548
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/548
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1337
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1079
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1128/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/515/rebuild

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve (continuous-integration)

diff --git a/docs/configure-a-shared-connection.md b/docs/configure-a-shared-connection.md
new file mode 100644
index 0000000..61cbe87
--- /dev/null
+++ b/docs/configure-a-shared-connection.md
@@ -0,0 +1,27 @@
+---
+title: "Configure shared connections"
+table_of_contents: True
+---
+
+# Configure shared connections
+
+NetworkManager makes very easy to share connectivity, using the device
+as a gateway to which other devices can connect. That requires running
+commands similar to
+
+```
+$ nmcli c add con-name <name> type ethernet ifname <iface> ipv4.method shared ipv6.method ignore
+$ nmcli c up <name>
+```
+
+where `<name>` is an arbitrary name we give to the connection and
+`<iface>` is the name of the interface where external devices will
+connect to. In this case we are using an ethernet interface
+(`type ethernet`) and we provide IPv4 addresses, but this extends to other
+interfaces and to IPv6.
+
+When the connection is up, NM starts a DHCP server listening on
+`<iface>` and changes the networking configuration so we can forward
+packages and masquerading is enabled for the interface. Of course, for
+this to work we need an interface different from `<iface>` that has
+to have external connectivity.
diff --git a/docs/configure-cellular-connections.md b/docs/configure-cellular-connections.md
index 215f2dc..b2ad22b 100644
--- a/docs/configure-cellular-connections.md
+++ b/docs/configure-cellular-connections.md
@@ -5,6 +5,11 @@ table_of_contents: False
 
 # Configure Cellular Connections
 
+For cellular connections, first install the modem-manager snap with:
+```
+$ snap install modem-manager
+```
+
 Check whether a modem was properly detected via:
 
 ```
@@ -15,7 +20,7 @@ Found 1 modems:
 
 In this case we have just one modem, with index 0 (the number at the end of the DBus object path).
 
-Show detailed information about the modem:
+Show detailed information about the modem using that index:
 
 ```
 $ sudo modem-manager.mmcli -m 0
@@ -86,15 +91,20 @@ $ nmcli c add type gsm ifname <interface> con-name <name> apn <operator_apn>
 $ nmcli r wwan on
 ```
 
-where &lt;interface&gt; is the string listed as “primary port” in the output from 'sudo mmcli -m &lt;N&gt;'
-(as previously described),
-&lt;name&gt; is an arbitrary name used to identify the connection, and &lt;operator_apn&gt; is
-the APN name for your cellular data plan.  Note that &lt;interface&gt; is usually a serial
-port with pattern /dev/tty*, not a networking interface. The reason for ModemManager
-to use that instead of the networking interface is that this last one can appear/disappear
-dynamically while the ports do not if the hardware configuration remains unchanged.
-For instance, the networking interface can be ppp0, ppp1, etc., and it might be
-different each time it is possible to have other ppp connections with, say, VPNs.
+where &lt;interface&gt; is the string listed as “primary port” in the
+output from `sudo mmcli -m <N>` (as previously described),
+&lt;name&gt; is an arbitrary name used to identify the connection, and
+&lt;operator_apn&gt; is the APN name for your cellular data plan.
+Note that &lt;interface&gt; is usually a serial port with pattern
+tty\* or a cdc-wdm\* device, not a networking interface. As these
+interface names might change depending on the devices present in the
+system, a better alternative is to use the sysfs path shown by mmcli
+(device: ...) or use `'*'`, which will use any modem device detected
+by MM:
+
+```
+sudo nmcli c add type gsm ifname '*' con-name <name> apn <operator_apn>
+```
 
 After executing these commands, NetworkManager will automatically try to bring up
 the cellular connection whenever ModemManager reports that the modem has
@@ -115,9 +125,9 @@ $ nmcli c modify <name> connection.autoconnect [yes|no]
 $ nmcli c down <name>
 ```
 
-Finally, note that we can provide the PIN (so it is entered automatically) or more
-needed APN provisioning information when creating/modifying the WWAN connection.
-For instance:
+Finally, note that we can provide the PIN (so it is entered
+automatically) or additional APN provisioning information when
+creating/modifying the WWAN connection.  For instance:
 
 ```
 $ nmcli c add type gsm ifname <interface> con-name <name> apn <operator_apn> username <user> password <password> pin <PIN>
diff --git a/docs/configure-wifi-access-points.md b/docs/configure-wifi-access-points.md
new file mode 100644
index 0000000..a87c517
--- /dev/null
+++ b/docs/configure-wifi-access-points.md
@@ -0,0 +1,24 @@
+---
+title: "Configure WiFi Access Points"
+table_of_contents: True
+---
+
+# Configure WiFi Access Points
+
+It is possible to create WiFi Access Points with the network-manager snap.
+This can be done by running
+
+```
+$ nmcli d wifi hotspot ifname <wifi_iface> ssid <ssid> password <password>
+```
+
+where `<wifi_iface>` is the wifi network interface, `<ssid>` is the
+SSID for the AP that we are creating and that will be visible to
+devices connecting to it, and `<password>` is the access password
+(that needs to have between 8-63 characters or 64 hexadecimal
+characters). NM will create a connection called '`Hotspot <N>`' if
+the command is successful.
+
+The created AP offers by default a shared connection, so devices
+connected to it should be able to access the Internet if the device
+providing the AP has access too.
diff --git a/docs/configure-wifi-connections.md b/docs/configure-wifi-connections.md
index 4602dfd..aab3f9f 100644
--- a/docs/configure-wifi-connections.md
+++ b/docs/configure-wifi-connections.md
@@ -6,11 +6,11 @@ table_of_contents: True
 # Configure WiFi Connections
 
 This section explains how to establish a WiFi connection. It covers creating and
-modyfying connections as well as directly connecting.
+modifying connections as well as directly connecting.
 
 ## Establish a Wireless Connection
 
-This section will show how to establish a wifi connection to the wireles
+This section will show how to establish a wifi connection to the wireless
 network. Note that directly connecting will implicitly create a connection (that
 can be seen with "nmcli c"). The naming of such will follow "SSID N" pattern,
 where N is a number.
diff --git a/docs/edit-connections.md b/docs/edit-connections.md
index 0c9d087..15eadec 100644
--- a/docs/edit-connections.md
+++ b/docs/edit-connections.md
@@ -5,9 +5,9 @@ table_of_contents: True
 
 # Edit Connections
 
-This part will show you how to use a network-manager built-in editor to modify
-the connections as well as provide a reference for setting some of the
-settings.
+This section shows how to use the network-manager built-in editor to
+modify connections as well as provide a reference for changing some of
+the settings.
 
 ## Using nmcli Console
 
@@ -88,7 +88,7 @@ IPv4 and IPv6 settings.
 
 It is important to understand that every option can be modified using either the
 command-line or the editor. The advantage of the editor is that it shows which
-options are availabe for modification in contrast to the command-line which does
+options are available for modification in contrast to the command-line which does
 not.
 
 It is possible however to learn about the available settings from the
diff --git a/docs/enable-ethernet-support.md b/docs/enable-ethernet-support.md
deleted file mode 100644
index 1aebf45..0000000
--- a/docs/enable-ethernet-support.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: "Enable Ethernet Support"
-table_of_contents: False
----
-
-# Enable Ethernet Support
-
-The default netplan configuration files in Ubuntu Core leave management of
-Ethernet devices to networkd. Therefore, to avoid conflicts, the
-network-manager snap does not manage Ethernet devices by default. The user has
-to take care to enable it after installation if desired.
-
-## Configure System for Ethernet Support
-
-Before following the instructions below, backup the contents of /etc/netplan to
-be able to restore it at a later point.
-
-Also, note that this change might lead to a system without properly configured
-network connections, which would lead to problems accessing the device, so be
-careful when doing this.
-
-To enable ethernet support, you have to set the `ethernet.enable` property to
-`true`.  See how to do this [here](reference/configuration/ethernet_support.md).
-When this is done, configuration files for netplan are created so
-network-manager is the default netplan renderer. When set to `false` (the
-default), the NM snap explicitly disables the management of ethernet devices to
-avoid conflicts with networkd.
-
-Rebooting the system will be needed for the changes to take effect.
-
-After the reboot, NetworkManager should automatically set up attached Ethernet
-ports or use existing netplan configuration files to setup connections.
-
-Once logged into the system you may check the current connection status by
-
-```
-$ nmcli c show
-```
diff --git a/docs/faq.md b/docs/faq.md
index ede5b21..e84de9d 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -12,7 +12,8 @@ to provide solutions for them.
 
 ### Possible cause: Ethernet support is disabled for NetworkManager
 
-By default the network-manager snap disables Ethernet support to avoid conflicts
-with networkd/netplan which are used by default on Ubuntu Core 16. See
-*[Enable Ethernet Support](enable-ethernet-support.md)* for details on how to
+The core16 based network-manager snap (1.2.2 version) disables by default
+ethernet support to avoid conflicts
+with networkd/netplan. See
+*[NetworkManager and netplan](networkmanager-and-netplan.md)* for details on how to
 enable it.
diff --git a/docs/index.md b/docs/index.md
index 81dcc30..6909fc2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,31 +6,32 @@ table_of_contents: False
 # About NetworkManager
 
 NetworkManager is a system network service that manages your network
-devices and connections, attempts to keep network connectivity active
+devices and connections and attempts to keep network connectivity active
 when available. It manages Ethernet, WiFi, mobile broadband (WWAN) and
 PPPoE devices while also providing VPN integration with a variety of
-different VPN serivces.
+different VPN services.
 
-By default network management on [Ubuntu Core](https://www.ubuntu.com/core) is
-handled by systemd's
+By default network management on [Ubuntu
+Core](https://www.ubuntu.com/core) is handled by systemd's
 [networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html)
-and [netplan](https://launchpad.net/netplan). While NetworkManager has some
-support to handle netplan configuration files, Ethernet support is disabled by
-default and has to be turned on explicitly to avoid conflicts with existing
-network configuration.
+and [netplan](https://launchpad.net/netplan). However, when
+NetworkManager is installed, it will take control of all networking
+devices in the system by creating a netplan configuration file in which
+it sets itself as the default network renderer.
 
 ## What NetworkManager Offers
 
-The upstream NetworkManager project offers a wide range of features which are
-partially available in the snap version. However,
-as the snap should be always delivered in high quality we don't have yet all
-upstream features enabled.
+The upstream NetworkManager project offers a wide range of features and
+most, but not all of them, are available in the snap package at the
+moment.
 
 Currently we provide support for the following high level features:
 
  * WiFi connectivity
  * WWAN connectivity (together with ModemManager)
  * Ethernet connectivity
+ * WiFi access point creation
+ * Shared connections
 
  Currently we do not support the following features:
 
diff --git a/docs/installation.md b/docs/installation.md
index b031d79..c2d2a6a 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -5,7 +5,7 @@ table_of_contents: True
 
 # Install NetworkManager
 
-The NetworkManager snap is currently available from the Ubuntu Store. It can
+The NetworkManager snap is currently available from the Snap Store. It can
 be installed on any system that supports snaps but is only recommended on
 [Ubuntu Core](https://www.ubuntu.com/core) at the moment.
 
@@ -13,49 +13,79 @@ You can install the snap with the following command:
 
 ```
  $ snap install network-manager
- network-manager 1.2.2-10 from 'canonical' installed
-```
+ network-manager (1.10/stable) 1.10.6-7 from Canonical✓ installed
 
-Although the network-manager snap is available from other channels (candidate, beta, edge),
-only the stable version should be used for production devices. Their meaning is internal
-to the development team of the network-manager snap.
+```
 
 All necessary plugs and slots will be automatically connected within the
 installation process. You can verify this with:
 
 ```
-$ snap interfaces network-manager
-Slot                     Plug
-:network-setup-observe   network-manager
-:ppp                     network-manager
-network-manager:service  network-manager:nmcli
--                        network-manager:modem-manager
+$ snap connections network-manager
+Interface              Plug                                   Slot                     Notes
+dbus                   network-manager:wpa                    -                        -
+firewall-control       network-manager:firewall-control       :firewall-control        -
+hardware-observe       network-manager:hardware-observe       :hardware-observe        -
+login-session-observe  network-manager:login-session-observe  :login-session-observe   -
+modem-manager          network-manager:modem-manager          modem-manager:service    -
+network                network-manager:network                :network                 -
+network-manager        network-manager:nmcli                  network-manager:service  -
+network-observe        network-manager:network-observe        :network-observe         -
+network-setup-control  network-manager:network-setup-control  :network-setup-control   -
+network-setup-observe  network-manager:network-setup-observe  :network-setup-observe   -
+ppp                    network-manager:ppp                    :ppp                     -
+
 ```
 
-**NOTE:** The _network-manager:modem-manager_ plug only gets connected when the
-_modem-manager_ snap is installed too. Otherwise it stays disconnected.
+**NOTE:** The _network-manager:modem-manager_ plug only gets connected
+when the _modem-manager_ snap is installed too. Otherwise it stays
+disconnected. Similarly, there is a _network-manager:wpa_ plug in case
+we would want to use a custom wpa supplicant snap instead of the one
+supplied by the core snap (this is not generally recommended).
 
-Once the installation has successfully finished the
-NetworkManager service is running in the background. You can check its current
-status with
+Once the installation has successfully finished the NetworkManager
+service is running in the background. You can check its current status
+with
 
 ```
- $ systemctl status snap.networkmanager
- ● snap.networkmanager.service - Service for snap application networkmanager
-   Loaded: loaded (/etc/systemd/system/snap.networkmanager.service; enabled; vendor preset: enabled)
-   Active: active (running) since Thu 2017-02-16 09:59:39 UTC; 16s ago
-   Main PID: 1389 (networkmanager)
-   [...]
+ $ systemctl status snap.network-manager.networkmanager.service 
+ ● snap.network-manager.networkmanager.service - Service for snap application network-manager.networkmanager
+    Loaded: loaded (/etc/systemd/system/snap.network-manager.networkmanager.service; enabled; vendor preset: enabled)
+    Active: active (running) since Thu 2020-07-09 10:19:01 UTC; 6min ago
+  Main PID: 2850 (NetworkManager)
+     Tasks: 3 (limit: 569)
+    CGroup: /system.slice/snap.network-manager.networkmanager.service
+            └─2850 /snap/network-manager/564/usr/sbin/NetworkManager --config-dir=/var/snap/network-manager/564/conf.d/ --config=/snap/network-manager/564/etc/NetworkManager/NetworkManager.conf --log-level=INFO --no-daemon
 ```
 
 Now you have NetworkManager successfully installed.
 
+## network-manager tracks and channels
+
+The network-manager snap has currently three tracks:
+
+ * **20**: Contains upstream 1.22.10 and has a core20 base. The track name refers
+   to the base snap and it is the convention being used at the moment.
+ * **1.10**: Contains upstream 1.10.6 and has a core18 base. Nowadays, this is the one
+   installed by default if the channel is not specified when running `snap install`.
+   The track name refers to the upstream version. More modern releases have changed
+   the convention so the track now refers to the base snap.
+ * **latest**: Contains upstream 1.2.2 and has a core16 base. Despite the unfortunate
+   name (there are historical reasons for that) it is the oldest version.
+
+All these tracks are available with the usual risks: stable,
+candidate, beta, and edge, but only the stable version should be used
+for production devices. The meaning of the other risk levels is
+internal to the development team of the network-manager snap.
+
 ## Next Steps
 
- * [Enable Ethernet Support](enable-ethernet-support.md)
+ * [NetworkManager and netplan](networkmanager-and-netplan.md)
  * [Explore Network Status](explore-network-status.md)
  * [Configure WiFi Connections](configure-wifi-connections.md)
+ * [Configure WiFi Access Points](configure-wifi-access-points.md)
  * [Configure Cellular Connections](configure-cellular-connections.md)
+ * [Configure shared connections](configure-a-shared-connection.md)
  * [Edit Network Connections](edit-connections.md)
  * [Routing Tables](routing-tables.md)
  * [Logging Messages](logging-messages.md)
diff --git a/docs/logging-messages.md b/docs/logging-messages.md
index d242808..5dd4679 100644
--- a/docs/logging-messages.md
+++ b/docs/logging-messages.md
@@ -5,10 +5,10 @@ table_of_contents: False
 
 # Logging Messages
 
-This section will show how to modify the logging levels by NetworkManager.
+This section shows how to modify the logging levels by NetworkManager.
 
 NetworkManager supports on the fly changing of the logging levels and allows for
-a fine control over what is logged.
+a fine grained control over what is logged.
 
 First check what is the current logging setup, type:
 
@@ -34,10 +34,10 @@ $ nmcli general logging [level <level> [domain <domain>]]
 The &lt;level&gt; is the desired log level. You can choose from the following:
 
 * **ERR:** will log only critical errors
-* **WARN:** will log warnin messages
+* **WARN:** will log warning messages
 * **INFO:** will log various informational messages
 * **DEBUG:** enables verbose logging for debugging purposes
 
 &lt;domain&gt; is the category of messages that shall be logged with given
 severity. **WIFI** will include only WiFi related messages, **IP4** will include
-only IPv4 related messages and so on..
+only IPv4 related messages, and so on.
diff --git a/docs/metadata.yaml b/docs/metadata.yaml
index 82bf35f..12c634a 100644
--- a/docs/metadata.yaml
+++ b/docs/metadata.yaml
@@ -13,10 +13,14 @@ navigation:
         location: explore-network-status.md
       - title: Configure WiFi Connections
         location: configure-wifi-connections.md
+      - title: Configure WiFi Access Points
+        location: configure-wifi-access-points.md
       - title: Configure Cellular Connections
         location: configure-cellular-connections.md
-      - title: Enable Ethernet Support
-        location: enable-ethernet-support.md
+      - title: Configure shared connections
+        location: configure-a-shared-connection.md
+      - title: NetworkManager and netplan
+        location: networkmanager-and-netplan.md
       - title: Edit Connections
         location: edit-connections.md
       - title: Routing Tables
@@ -27,10 +31,12 @@ navigation:
     children:
       - title: Snap Configuration
         children:
-          - title: Ethernet Support
-            location: reference/configuration/ethernet_support.md
+          - title: Default renderer
+            location: reference/snap-configuration/default_renderer.md
           - title: Debug
             location: reference/snap-configuration/debug.md
+          - title: Connectivity check
+            location: reference/snap-configuration/connectivity-check.md
           - title: Wake on WLAN
             location: reference/snap-configuration/wowlan.md
           - title: WiFi Powersave
diff --git a/docs/networkmanager-and-netplan.md b/docs/networkmanager-and-netplan.md
new file mode 100644
index 0000000..9f34e88
--- /dev/null
+++ b/docs/networkmanager-and-netplan.md
@@ -0,0 +1,31 @@
+---
+title: "NetworkManager and netplan"
+table_of_contents: False
+---
+
+# NetworkManager and netplan
+
+The default netplan configuration files in Ubuntu Core leave
+management of networking devices to networkd. But, when
+network-manager is installed, it creates new netplan configuration
+files, setting itself as the default network renderer and taking
+control of all devices.
+
+It is possible to control this behavior with the `defaultrenderer`
+snap option. It is set by default to `true`, but if we set it to
+`false`, network-manager reverts the netplan configuration and
+networkd takes control of the devices again. Note however that
+networkd will take control only of devices explicitly configured by
+netplan configuration files, which is usually only ethernet or wifi
+devices. To do that:
+
+```
+snap set network-manager defaultrenderer=false
+```
+
+In the core16 snap (legacy), the behavior was different: networkd was
+left as default renderer and the default netplan configuration was
+unchanged when network-manager was installed. There was instead a
+setting called `ethernet.enable` that was `false` by default. When set
+to `true`, NetworkManager was set as the default network renderer
+similarly as described above.
diff --git a/docs/reference/available-commands.md b/docs/reference/available-commands.md
index 18b3cec..b774403 100644
--- a/docs/reference/available-commands.md
+++ b/docs/reference/available-commands.md
@@ -17,3 +17,15 @@ NetworkManager service.
 
 An explanatory description of the command and available options are available
 [here](https://developer.gnome.org/NetworkManager/1.2/nmcli.html)
+
+## network-manager.nmtui
+
+nmtui is the Network Manager Text User Interface. It is a curses-based application
+that allows easy configuration of connections and networking settings. Besides
+network-manager.nmtui, these other three commands are available:
+
+* network-manager.nmtui-edit
+* network-manager.nmtui-connect
+* network-manager.nmtui-hostname
+
+More details can be found in the [manual page](https://developer.gnome.org/NetworkManager/stable/nmtui.html).
diff --git a/docs/reference/configuration/ethernet_support.md b/docs/reference/configuration/ethernet_support.md
deleted file mode 100644
index fbc5929..0000000
--- a/docs/reference/configuration/ethernet_support.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: Ethernet Support
-table_of_contents: true
----
-
-# Ethernet Support
-
-*Available since:* 1.2.2-12
-
-The NetworkManager snap provides a configuration option to adjust
-if it should manage ethernet network connections.
-
-By default the NetworkManager snap **does not** manage ethernet network
-devices as it would conflict with the default network management in
-Ubuntu Core which is handled by [netplan](https://launchpad.net/netplan) and
-[networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html).
-
-## Enable Ethernet Support
-
-To enable management of ethernet network devices the snap provides the
-*ethernet.enable* configuration option.
-
-This configuration option accepts the following values
-
- * **false (default):** Ethernet support is disabled. All network
- devices matching the expression 'en*' or 'eth*' will be ignored.
- * **true:** All ethernet devices available on the system will be
- managed by NetworkManager. networkd will not manage any of these
- anymore.
-
-Changing the *ethernet* configuration option needs a reboot of the
-device it's running on.
-
-After the device has rebooted ethernet support is enabled NetworkManager will
-take over management of all available ethernet network devices on the device.
-
-NetworkManager will reuse existing configurations files from */etc/netplan*
-when ethernet support is enabled. Those will marked as immutable inside
-NetworkManager and any changes need to be written manually into the relevant
-files in */etc/netplan*.
-
-Example:
-
-```
- $ snap set network-manager ethernet.enable=true
- $ sudo reboot
-```
diff --git a/docs/reference/dbus-api.md b/docs/reference/dbus-api.md
index 7cece10..cc7b7f0 100644
--- a/docs/reference/dbus-api.md
+++ b/docs/reference/dbus-api.md
@@ -6,4 +6,4 @@ table_of_contents: False
 # DBUS API
 
 Documentation of the DBus API is provided by the NetworkManager upstream project
-[here](https://developer.gnome.org/NetworkManager/1.2/spec.html).
+[here](https://developer.gnome.org/NetworkManager/stable/spec.html).
diff --git a/docs/reference/snap-configuration/connectivity-check.md b/docs/reference/snap-configuration/connectivity-check.md
new file mode 100644
index 0000000..c68cbe4
--- /dev/null
+++ b/docs/reference/snap-configuration/connectivity-check.md
@@ -0,0 +1,28 @@
+---
+title: Connectivity check
+table_of_contents: true
+---
+
+# Connectivity check
+
+Connectivity checking is a NetworkManager functionality that allows
+periodically testing whether the system can actually access the
+internet or not. The network-manager snap allows configuring this
+feature by using the following snap settings:
+
+* **connectivity.interval**: it specifies the number of seconds between checks.
+  If set to 0, it disables connectivity check. Set to 300 by default.
+* **connectivity.response**: This is the expected HTTP body response from the server
+  specified by connectivity.uri.
+* **connectivity.uri**: The URI where NM is going to periodically access to check connectivity.
+
+More details on how these options work can be found in the connectivity section of
+the [NetworkManager.conf configuration file documentation](https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html).
+
+Some example commands on how to set a check every three minutes using the
+Ubuntu connectivity check server are
+
+```
+$ snap set network-manager connectivity.uri=http://connectivity-check.ubuntu.com/
+$ snap set network-manager connectivity.interval=180
+```
diff --git a/docs/reference/snap-configuration/debug.md b/docs/reference/snap-configuration/debug.md
index e16d17c..1e54976 100644
--- a/docs/reference/snap-configuration/debug.md
+++ b/docs/reference/snap-configuration/debug.md
@@ -9,7 +9,7 @@ Debug is a feature that controls the amount of logs produced by the network-mana
 snap. It is useful for collecting information required to either report a bug or
 investigate a network-manager failure (if happens).
 
-It is disabled by default and has to be explicitely turned on for usage.
+It is disabled by default and has to be explicitly turned on for usage.
 
 Note that the debug logs may contain sensitive information.
 
@@ -47,5 +47,5 @@ The debug information, when enabled, will be available in the journal and can
 be viewed with:
 
 ```
-$ journalctl --no-pager -u snap.network-manager.networkmanager.service
+$ journalctl --no-pager -l -u snap.network-manager.networkmanager.service
 ```
diff --git a/docs/reference/snap-configuration/default_renderer.md b/docs/reference/snap-configuration/default_renderer.md
new file mode 100644
index 0000000..a50ca48
--- /dev/null
+++ b/docs/reference/snap-configuration/default_renderer.md
@@ -0,0 +1,18 @@
+---
+title: Default renderer
+table_of_contents: true
+---
+
+# Default renderer
+
+The NetworkManager snap provides a configuration option,
+`defaultrenderer`, to adjust if it should be the default network
+renderer or not. By default, it is set to `true`. To change it:
+
+```
+snap set network-manager defaultrenderer=false
+```
+
+For the core16 snap, there is an option called `ethernet.enable` that
+does basically the same. See the [NetworkManager and netplan](../../networkmanager-and-netplan.md)
+section for more details.
diff --git a/docs/reference/snap-configuration/wifi-powersave.md b/docs/reference/snap-configuration/wifi-powersave.md
index 8b9e68f..1958697 100644
--- a/docs/reference/snap-configuration/wifi-powersave.md
+++ b/docs/reference/snap-configuration/wifi-powersave.md
@@ -7,7 +7,7 @@ table_of_contents: True
 
 WiFi Powersave is a feature that allows a device to suspend its radio activity
 after a fixed period of inactivity. The device remains idle for a fixed time,
-usualy about 100ms, and once it is reached it wakes up to check if the
+usually about 100ms, and once it is reached it wakes up to check if the
 infrastructure has any packets queued up for it.
 
 The NetworkManager snap allows to configure this option by either enabling or
diff --git a/docs/reference/snap-configuration/wowlan.md b/docs/reference/snap-configuration/wowlan.md
index 2ae0791..c4145af 100644
--- a/docs/reference/snap-configuration/wowlan.md
+++ b/docs/reference/snap-configuration/wowlan.md
@@ -8,7 +8,7 @@ table_of_contents: True
 *Available since:* 1.2.2-11
 
 Wake on WLAN (called WoWLAN in the following) is a feature which allows a device
-to be woken up from standby power states to faciliate device management. It is based
+to be woken up from standby power states to facilitate device management. It is based
 on the well well-established standard for Wake on LAN. The functionality is not entirely
 equivalent to Wake on LAN and there are some limitations.
 
@@ -53,7 +53,7 @@ This configuration option accepts the following values:
  The content of the magic packet can be extended with the
  wifi.wake-on-wlan-password option to require the client to send a
  specific byte sequence functioning as a password so that not anyone
- unpriviledged can wake up the system.
+ unprivileged can wake up the system.
  * **gtk-rekey-failure:** A failure of a GTK rekey operation will cause the device to wake up.
  * **4way-handshake:** Reiteration of the 4way handshake will cause the device to wake up.
  * **rfkill-release:** Release of a rfkill will cause the device to wake up.
@@ -69,7 +69,7 @@ Example:
 
 This configuration option accepts a textual value. If specified, the value will
 be used in addition to the wireless device MAC address to function as a password
-that disallows unpriviledged actors to wake up the device.
+that disallows unprivileged actors to wake up the device.
 
 Example:
 
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 8a96cee..93de8d7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,31 +5,56 @@ table_of_contents: False
 
 # Release Notes
 
-The version numbers mentioned on this page correspond to those released in the
-Ubuntu snap store.
-
-You can check with the following command which version you have currently
-installed:
+You can check with the following command which version you have
+currently installed:
 
 ```
 $ snap info network-manager
 name:      network-manager
-summary:   "Network management based on NeworkManager"
-publisher: canonical
+summary:   Network Manager
+publisher: Canonical✓
+store-url: https://snapcraft.io/network-manager
+contact:   https://help.ubuntu.com/community/NetworkManager
+license:   unset
 description: |
-  Network management of wired Ethernet, WiFi and mobile data connection based on
-  NetworkManager and ModemManager
+  NetworkManager is a system network service that manages your network
+  devices and connections, attempting to keep active network connectivity
+  when available. It manages ethernet, WiFi, mobile broadband (WWAN) and
+  PPPoE devices, provides VPN integration with a variety of different
+  VPN serivces.
+  Please find the source code for this track at:
+    https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/+ref/snap-1.10
 commands:
-  - nmcli
-tracking:    stable
-installed:   1.2.2-10 (73) 5MB -
-[...]
+  - network-manager.nmcli
+  - network-manager.nmtui
+  - network-manager.nmtui-connect
+  - network-manager.nmtui-edit
+  - network-manager.nmtui-hostname
+services:
+  network-manager.networkmanager: simple, enabled, active
+snap-id:      RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
+tracking:     1.10/stable
+refresh-date: today at 10:18 UTC
+channels:
+  1.10/stable:      1.10.6-7      2020-06-29 (564) 4MB -
+  1.10/candidate:   1.10.6-7      2020-06-29 (564) 4MB -
+  1.10/beta:        1.10.6-7      2020-06-25 (564) 4MB -
+  1.10/edge:        1.10.6-5-dev  2020-04-06 (542) 4MB -
+  latest/stable:    1.2.2-25      2020-06-22 (554) 4MB -
+  latest/candidate: 1.2.2-25      2020-06-19 (554) 4MB -
+  latest/beta:      1.2.2-26      2020-07-07 (573) 4MB -
+  latest/edge:      1.2.2-26-dev  2020-07-07 (569) 4MB -
+  20/stable:        –                                  
+  20/candidate:     –                                  
+  20/beta:          1.22.10-1     2020-06-25 (561) 5MB -
+  20/edge:          1.22.10-2-dev 2020-07-08 (580) 5MB -
+installed:          1.10.6-7                 (564) 4MB -
+
 ```
-</br>
-## 1.2.2-11
 
- * Wake-on-WLAN can be configured via snap/nmcli
- * Automatic reconfiguration of network devices when device comes back from a
-   low power state
- * Snap alias available for nmcli
- * WiFi powersave is configurable via snap configuration
+The detailed changelog for each revision can be consulted in the sources
+for each track:
+
+* For track 20, [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog?h=snap-20)
+* For track 1.10, [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog?h=snap-1.10)
+* For track latest (note again this is not actually the more modern NM), [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog)