[lxc-devel] [lxd/master] Update all doc for instances

stgraber on Github lxc-bot at linuxcontainers.org
Tue Jan 14 20:36:49 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200114/a9577f3c/attachment-0001.bin>
-------------- next part --------------
From 202e9b30b385bf3e84acaaf7e5ceff0d289ddd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 14:59:10 -0500
Subject: [PATCH 1/7] lxd/containers: Use 'instance' key in templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/container_lxc.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index 8e2f0dff80..9dc9ca92ab 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -5268,6 +5268,7 @@ func (c *containerLXC) templateApplyNow(trigger string) error {
 		tplRender.ExecuteWriter(pongo2.Context{"trigger": trigger,
 			"path":       tplPath,
 			"container":  containerMeta,
+			"instance":   containerMeta,
 			"config":     c.expandedConfig,
 			"devices":    c.expandedDevices,
 			"properties": tpl.Properties,

From 7b8236beab6ec1c5b02eb27caabaf790ac263064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:11:07 -0500
Subject: [PATCH 2/7] lxc: Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/console.go | 2 +-
 lxc/copy.go    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxc/console.go b/lxc/console.go
index 5a64642ab1..c8131a1cb6 100644
--- a/lxc/console.go
+++ b/lxc/console.go
@@ -32,7 +32,7 @@ func (c *cmdConsole) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Attach to instance consoles
 
-This command allows you to interact with the boot console of a instance
+This command allows you to interact with the boot console of an instance
 as well as retrieve past log entries from it.`))
 
 	cmd.RunE = c.Run
diff --git a/lxc/copy.go b/lxc/copy.go
index 1624884e2a..6f350c7f86 100644
--- a/lxc/copy.go
+++ b/lxc/copy.go
@@ -72,7 +72,7 @@ func (c *cmdCopy) copyInstance(conf *config.Config, sourceResource string, destR
 		return err
 	}
 
-	// Make sure we have a instance or snapshot name
+	// Make sure we have an instance or snapshot name
 	if sourceName == "" {
 		return fmt.Errorf(i18n.G("You must specify a source instance name"))
 	}

From b6c1a245876e848b0888671c7774596991755e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:12:13 -0500
Subject: [PATCH 3/7] lxc: Bump examples to 18.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/init.go   | 4 ++--
 lxc/launch.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxc/init.go b/lxc/init.go
index ad336ebe05..a789fccd80 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -38,9 +38,9 @@ func (c *cmdInit) Command() *cobra.Command {
 	cmd.Use = i18n.G("init [[<remote>:]<image>] [<remote>:][<name>] [< config")
 	cmd.Short = i18n.G("Create instances from images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create instances from images`))
-	cmd.Example = cli.FormatSection("", i18n.G(`lxc init ubuntu:16.04 u1
+	cmd.Example = cli.FormatSection("", i18n.G(`lxc init ubuntu:18.04 u1
 
-lxc init ubuntu:16.04 u1 < config.yaml
+lxc init ubuntu:18.04 u1 < config.yaml
     Create the instance with configuration from config.yaml`))
 	cmd.Hidden = true
 
diff --git a/lxc/launch.go b/lxc/launch.go
index 03ca8f2b9f..adab111d43 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -23,9 +23,9 @@ func (c *cmdLaunch) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create and start instances from images`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc launch ubuntu:16.04 u1
+		`lxc launch ubuntu:18.04 u1
 
-lxc launch ubuntu:16.04 u1 < config.yaml
+lxc launch ubuntu:18.04 u1 < config.yaml
     Create and start the instance with configuration from config.yaml`))
 	cmd.Hidden = false
 

From 75bffa28634014c3f0c5768f1d667d83b0d031fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:12:33 -0500
Subject: [PATCH 4/7] i18n: Update translation templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 po/bg.po      | 52 +++++++++++++++++++++++++--------------------------
 po/de.po      | 52 +++++++++++++++++++++++++--------------------------
 po/el.po      | 52 +++++++++++++++++++++++++--------------------------
 po/es.po      | 52 +++++++++++++++++++++++++--------------------------
 po/fa.po      | 52 +++++++++++++++++++++++++--------------------------
 po/fi.po      | 52 +++++++++++++++++++++++++--------------------------
 po/fr.po      | 52 +++++++++++++++++++++++++--------------------------
 po/hi.po      | 52 +++++++++++++++++++++++++--------------------------
 po/id.po      | 52 +++++++++++++++++++++++++--------------------------
 po/it.po      | 52 +++++++++++++++++++++++++--------------------------
 po/ja.po      | 52 +++++++++++++++++++++++++--------------------------
 po/ko.po      | 52 +++++++++++++++++++++++++--------------------------
 po/lxd.pot    | 50 ++++++++++++++++++++++++-------------------------
 po/nb_NO.po   | 52 +++++++++++++++++++++++++--------------------------
 po/nl.po      | 52 +++++++++++++++++++++++++--------------------------
 po/pa.po      | 52 +++++++++++++++++++++++++--------------------------
 po/pl.po      | 52 +++++++++++++++++++++++++--------------------------
 po/pt_BR.po   | 52 +++++++++++++++++++++++++--------------------------
 po/ru.po      | 52 +++++++++++++++++++++++++--------------------------
 po/sl.po      | 52 +++++++++++++++++++++++++--------------------------
 po/sr.po      | 52 +++++++++++++++++++++++++--------------------------
 po/sv.po      | 52 +++++++++++++++++++++++++--------------------------
 po/te.po      | 52 +++++++++++++++++++++++++--------------------------
 po/tr.po      | 52 +++++++++++++++++++++++++--------------------------
 po/uk.po      | 52 +++++++++++++++++++++++++--------------------------
 po/zh_Hans.po | 52 +++++++++++++++++++++++++--------------------------
 26 files changed, 675 insertions(+), 675 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index eff480086f..18be4d8763 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 1edc4b5f19..054020abfa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-21 20:27+0000\n"
 "Last-Translator: Joshua Dietz <jospam at dietz-ulm.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -359,7 +359,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITEKTUR"
 
@@ -486,7 +486,7 @@ msgstr "Herunterfahren des Containers erzwingen."
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -1007,8 +1007,8 @@ msgstr "Kein Zertifikat für diese Verbindung"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1146,7 +1146,7 @@ msgstr " Prozessorauslastung:"
 msgid "Disks:"
 msgstr " Prozessorauslastung:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1222,11 +1222,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1376,7 +1376,7 @@ msgstr "Fingerabdruck: %s\n"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1393,7 +1393,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -2099,12 +2099,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Gerät %s wurde von %s entfernt\n"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s wurde auf %s angewandt\n"
@@ -2709,7 +2709,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2736,7 +2736,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -3032,7 +3032,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3542,7 +3542,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3948,7 +3948,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4216,17 +4216,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4507,7 +4507,7 @@ msgstr ""
 "\n"
 "lxd %s <Name>\n"
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4532,7 +4532,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4672,7 +4672,7 @@ msgstr ""
 "Entfernt einen Container (oder Sicherungspunkt) und alle dazugehörigen\n"
 "Daten (Konfiguration, Sicherungspunkte, ...).\n"
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4849,7 +4849,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 3d3250ce04..598689a822 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2017-02-14 08:00+0000\n"
 "Last-Translator: Simos Xenitellis <simos.65 at gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -232,7 +232,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -829,8 +829,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -960,7 +960,7 @@ msgstr "  Χρήση CPU:"
 msgid "Disks:"
 msgstr "  Χρήση CPU:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1032,11 +1032,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1174,7 +1174,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1847,12 +1847,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2435,7 +2435,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2459,7 +2459,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3221,7 +3221,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3530,7 +3530,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3760,17 +3760,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4005,7 +4005,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4025,7 +4025,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4107,7 +4107,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4244,7 +4244,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 306c9f1ec9..35f140065e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -307,7 +307,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARQUITECTURA"
 
@@ -426,7 +426,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr "Nombre del Miembro del Cluster"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -918,8 +918,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1048,7 +1048,7 @@ msgstr "Uso del disco:"
 msgid "Disks:"
 msgstr "Uso del disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1120,11 +1120,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1265,7 +1265,7 @@ msgstr "Huella dactilar: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1281,7 +1281,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1944,12 +1944,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2560,7 +2560,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2841,7 +2841,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3326,7 +3326,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3645,7 +3645,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3880,17 +3880,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4130,7 +4130,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4151,7 +4151,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4240,7 +4240,7 @@ msgstr "No se puede proveer el nombre del container a la lista"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "No se puede proveer el nombre del container a la lista"
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4384,7 +4384,7 @@ msgstr "Columnas"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 7fe79f866c..0d365ea078 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9a92ef1ce0..cb6aef31fe 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index a68ccd0c8c..56d6e04e9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-01-04 18:07+0000\n"
 "Last-Translator: Deleted User <noreply+12102 at weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -349,7 +349,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTURE"
 
@@ -474,7 +474,7 @@ msgstr "Forcer l'arrêt du conteneur (seulement pour stop)"
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -679,7 +679,7 @@ msgstr "Afficher la version du client"
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -1011,8 +1011,8 @@ msgstr "Copie de l'image : %s"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1144,7 +1144,7 @@ msgstr "  Disque utilisé :"
 msgid "Disks:"
 msgstr "  Disque utilisé :"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 #, fuzzy
 msgid "Don't require user confirmation for using --force"
 msgstr "Requérir une confirmation de l'utilisateur"
@@ -1222,11 +1222,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1381,7 +1381,7 @@ msgstr "Empreinte : %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "Forcer l'allocation d'un pseudo-terminal"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1399,7 +1399,7 @@ msgstr "Forcer la suppression des conteneurs arrêtés"
 msgid "Force using the local unix socket"
 msgstr "Forcer l'utilisation de la socket unix locale"
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -2148,12 +2148,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, fuzzy, c-format
 msgid "Member %s removed"
 msgstr "Profil %s supprimé de %s"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, fuzzy, c-format
 msgid "Member %s renamed to %s"
 msgstr "Profil %s ajouté à %s"
@@ -2773,7 +2773,7 @@ msgstr "Serveur distant : %s"
 msgid "Remove %s (yes/no): "
 msgstr "Supprimer %s (oui/non) : "
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2800,7 +2800,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -3099,7 +3099,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "L'arrêt du conteneur a échoué !"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3625,7 +3625,7 @@ msgstr "Publié : %s"
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 #, fuzzy
 msgid "User aborted delete operation"
 msgstr "L'utilisateur a annulé l'opération de suppression."
@@ -4051,7 +4051,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4336,17 +4336,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4642,7 +4642,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4670,7 +4670,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4828,7 +4828,7 @@ msgstr ""
 "Détruit les conteneurs ou les instantanés ainsi que toute donnée associée "
 "(configuration, instantanés, …)."
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -5020,7 +5020,7 @@ msgstr "Colonnes"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "oui"
diff --git a/po/hi.po b/po/hi.po
index dfdbee7481..0f59dc2b3e 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index e4af64cb0b..0eb0f7d155 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index fc9bd166ea..bc90fe6a1a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Luigi Operoso <brokenpip3 at gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/linux-containers/"
@@ -284,7 +284,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIAS"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITETTURA"
 
@@ -402,7 +402,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -601,7 +601,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -891,8 +891,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1021,7 +1021,7 @@ msgstr "Utilizzo disco:"
 msgid "Disks:"
 msgstr "Utilizzo disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1094,11 +1094,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1255,7 +1255,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1922,12 +1922,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2512,7 +2512,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2537,7 +2537,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2819,7 +2819,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3306,7 +3306,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3627,7 +3627,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3862,17 +3862,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4112,7 +4112,7 @@ msgstr "Creazione del container in corso"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4133,7 +4133,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4222,7 +4222,7 @@ msgstr "Creazione del container in corso"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "Creazione del container in corso"
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4366,7 +4366,7 @@ msgstr "Colonne"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "si"
diff --git a/po/ja.po b/po/ja.po
index b57c7ed663..cb47bf8996 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-20 11:43+0000\n"
 "Last-Translator: Hiroaki Nakamura <hnakamur at gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/linux-"
@@ -236,7 +236,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr "コンテナのコンソールに接続します"
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 "コンテナのコンソールに接続します\n"
@@ -574,7 +574,7 @@ msgstr "クライアントバージョン: %s\n"
 msgid "Cluster member name"
 msgstr "クラスタメンバ名"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr "クラスタリングが有効になりました"
 
@@ -887,8 +887,8 @@ msgstr "ストレージボリュームを削除します"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1021,7 +1021,7 @@ msgstr "ディスク:"
 msgid "Disks:"
 msgstr "ディスク:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr "--force を使う際にユーザーの確認を必要としない"
 
@@ -1100,13 +1100,13 @@ msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 "'%s' 中のカラムエントリが空です (カラムの指定に空文字列が指定されています)"
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 #, fuzzy
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 "クラスタリングで動作していないLXDインスタンス上でクラスタリングを有効にします"
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 #, fuzzy
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
@@ -1274,7 +1274,7 @@ msgstr "証明書のフィンガープリント: %s"
 msgid "Force pseudo-terminal allocation"
 msgstr "強制的に擬似端末を割り当てます"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr "degraded 状態であっても強制的にメンバを削除します"
 
@@ -1292,7 +1292,7 @@ msgstr "稼働中のコンテナを強制的に削除します"
 msgid "Force using the local unix socket"
 msgstr "強制的にローカルのUNIXソケットを使います"
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, fuzzy, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -2096,12 +2096,12 @@ msgstr "信頼済みのクライアントを管理します"
 msgid "Maximum number of VFs: %d"
 msgstr "VF の最大数: %d"
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr "メンバ %s が削除されました"
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr "メンバ名 %s を %s に変更しました"
@@ -2700,7 +2700,7 @@ msgstr "リムーバブルディスク: %v"
 msgid "Remove %s (yes/no): "
 msgstr "%s を消去しますか (yes/no): "
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr "クラスタからメンバを削除します"
 
@@ -2726,7 +2726,7 @@ msgstr "リモートサーバを削除します"
 msgid "Remove trusted clients"
 msgstr "信頼済みクライアントを削除します"
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr "クラスタメンバの名前を変更します"
 
@@ -3059,7 +3059,7 @@ msgstr "詳細な情報を出力します"
 msgid "Show content of instance file templates"
 msgstr "コンテナのファイルテンプレートの内容を表示します"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr "クラスタメンバの詳細を表示します"
 
@@ -3588,7 +3588,7 @@ msgstr "使用済: %v"
 msgid "User ID to run the command as (default 0)"
 msgstr "コマンドを実行する際のユーザ ID (UID) (デフォルト 0)"
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr "ユーザが削除操作を中断しました"
 
@@ -3925,7 +3925,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr "edit [<remote>:][<container>[/<snapshot>]]"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4211,9 +4211,9 @@ msgstr ""
 #: lxc/init.go:41
 #, fuzzy
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 "lxc init ubuntu:16.04 u1\n"
@@ -4224,9 +4224,9 @@ msgstr ""
 #: lxc/launch.go:25
 #, fuzzy
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 "lxc launch ubuntu:16.04 u1\n"
@@ -4549,7 +4549,7 @@ msgstr "restore [<remote>:]<container> <snapshot>"
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr "set [<remote>:]<profile> <key><value>..."
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4570,7 +4570,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr "rename [<remote>:]<container>[/<snapshot>] <container>[/<snapshot>]"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4661,7 +4661,7 @@ msgstr "show [<remote>:][<container>[/<snapshot>]]"
 msgid "show [<remote>:]<instance|profile>"
 msgstr "show [<remote>:][<container>[/<snapshot>]]"
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4804,7 +4804,7 @@ msgstr "volume"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 720050fbc8..f0dfde99af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/lxd.pot b/po/lxd.pot
index 027ec31264..4d8d2aabaf 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2020-01-13 15:14-0500\n"
+        "POT-Creation-Date: 2020-01-14 15:12-0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -220,7 +220,7 @@ msgstr  ""
 msgid   "ALIASES"
 msgstr  ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid   "ARCHITECTURE"
 msgstr  ""
 
@@ -334,7 +334,7 @@ msgstr  ""
 #: lxc/console.go:32
 msgid   "Attach to instance consoles\n"
         "\n"
-        "This command allows you to interact with the boot console of a instance\n"
+        "This command allows you to interact with the boot console of an instance\n"
         "as well as retrieve past log entries from it."
 msgstr  ""
 
@@ -520,7 +520,7 @@ msgstr  ""
 msgid   "Cluster member name"
 msgstr  ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid   "Clustering enabled"
 msgstr  ""
 
@@ -793,7 +793,7 @@ msgstr  ""
 msgid   "Delete storage volumes"
 msgstr  ""
 
-#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146 lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
+#: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91 lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144 lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147 lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31 lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580 lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76 lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327 lxc/config_device.go:416 lxc/config_device.go:507 lxc/config_device.go:513 lxc/config_device.go:613 lxc/config_device.go:681 lxc/config_metadata.go:28 lxc/config_metadata.go:53 lxc/config_metadata.go:175 lxc/config_template.go:29 lxc/config_template.go:66 lxc/config_template.go:109 lxc/config_template.go:151 lxc/config_template.go:237 lxc/config_template.go:296 lxc/config_trust.go:29 lxc/config_trust.go:58 lxc/config_trust.go:116 lxc/config_trust.go:194 lxc/console.go:32 lxc/copy.go:41 lxc/delete.go:30 lxc/exec.go:41 lxc/export.go:33 lxc/file.go:72 lxc/file.go:105 lxc/file.go:154 lxc/file.go:217 lxc/file.go:407 lxc/image.go:38 lxc/image.go:128 lxc/image.go:270 lxc/image.go:321 lxc/image.go:446 lxc/image.go:605 lxc/image.go:833 lxc/image.go:968 lxc/image.go:1266 lxc/image.go:1345 lxc/image_alias.go:25 lxc/image_alias.go:58 lxc/image_alias.go:105 lxc/image_alias.go:150 lxc/image_alias.go:252 lxc/import.go:28 lxc/info.go:33 lxc/init.go:40 lxc/launch.go:23 lxc/list.go:44 lxc/main.go:50 lxc/manpage.go:19 lxc/monitor.go:30 lxc/move.go:37 lxc/network.go:32 lxc/network.go:108 lxc/network.go:181 lxc/network.go:254 lxc/network.go:326 lxc/network.go:376 lxc/network.go:461 lxc/network.go:546 lxc/network.go:669 lxc/network.go:727 lxc/network.go:807 lxc/network.go:892 lxc/network.go:961 lxc/network.go:1011 lxc/network.go:1081 lxc/network.go:1143 lxc/operation.go:24 lxc/operation.go:53 lxc/operation.go:102 lxc/operation.go:181 lxc/profile.go:29 lxc/profile.go:101 lxc/profile.go:164 lxc/profile.go:244 lxc/profile.go:300 lxc/profile.go:354 lxc/profile.go:404 lxc/profile.go:528 lxc/profile.go:577 lxc/profile.go:636 lxc/profile.go:712 lxc/profile.go:762 lxc/profile.go:821 lxc/profile.go:875 lxc/project.go:29 lxc/project.go:86 lxc/project.go:151 lxc/project.go:214 lxc/project.go:334 lxc/project.go:384 lxc/project.go:469 lxc/project.go:524 lxc/project.go:584 lxc/project.go:613 lxc/project.go:666 lxc/publish.go:35 lxc/query.go:31 lxc/remote.go:34 lxc/remote.go:85 lxc/remote.go:419 lxc/remote.go:455 lxc/remote.go:535 lxc/remote.go:597 lxc/remote.go:647 lxc/remote.go:685 lxc/rename.go:21 lxc/restore.go:24 lxc/snapshot.go:24 lxc/storage.go:33 lxc/storage.go:89 lxc/storage.go:163 lxc/storage.go:213 lxc/storage.go:333 lxc/storage.go:388 lxc/storage.go:508 lxc/storage.go:582 lxc/storage.go:651 lxc/storage.go:735 lxc/storage_volume.go:32 lxc/storage_volume.go:139 lxc/storage_volume.go:218 lxc/storage_volume.go:301 lxc/storage_volume.go:462 lxc/storage_volume.go:539 lxc/storage_volume.go:615 lxc/storage_volume.go:697 lxc/storage_volume.go:778 lxc/storage_volume.go:978 lxc/storage_volume.go:1069 lxc/storage_volume.go:1142 lxc/storage_volume.go:1173 lxc/storage_volume.go:1286 lxc/storage_volume.go:1362 lxc/storage_volume.go:1461 lxc/storage_volume.go:1492 lxc/storage_volume.go:1563 lxc/version.go:22
 msgid   "Description"
 msgstr  ""
 
@@ -875,7 +875,7 @@ msgstr  ""
 msgid   "Disks:"
 msgstr  ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid   "Don't require user confirmation for using --force"
 msgstr  ""
 
@@ -945,11 +945,11 @@ msgstr  ""
 msgid   "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr  ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid   "Enable clustering on a single non-clustered LXD server"
 msgstr  ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid   "Enable clustering on a single non-clustered LXD server\n"
         "\n"
         "  This command turns a non-clustered LXD server into the first member of a new\n"
@@ -1079,7 +1079,7 @@ msgstr  ""
 msgid   "Force pseudo-terminal allocation"
 msgstr  ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid   "Force removing a member, even if degraded"
 msgstr  ""
 
@@ -1095,7 +1095,7 @@ msgstr  ""
 msgid   "Force using the local unix socket"
 msgstr  ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid   "Forcefully removing a server from the cluster should only be done as a last\n"
         "resort.\n"
@@ -1727,12 +1727,12 @@ msgstr  ""
 msgid   "Maximum number of VFs: %d"
 msgstr  ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid   "Member %s removed"
 msgstr  ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid   "Member %s renamed to %s"
 msgstr  ""
@@ -2285,7 +2285,7 @@ msgstr  ""
 msgid   "Remove %s (yes/no): "
 msgstr  ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid   "Remove a member from the cluster"
 msgstr  ""
 
@@ -2309,7 +2309,7 @@ msgstr  ""
 msgid   "Remove trusted clients"
 msgstr  ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid   "Rename a cluster member"
 msgstr  ""
 
@@ -2569,7 +2569,7 @@ msgstr  ""
 msgid   "Show content of instance file templates"
 msgstr  ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid   "Show details of a cluster member"
 msgstr  ""
 
@@ -3040,7 +3040,7 @@ msgstr  ""
 msgid   "User ID to run the command as (default 0)"
 msgstr  ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid   "User aborted delete operation"
 msgstr  ""
 
@@ -3337,7 +3337,7 @@ msgstr  ""
 msgid   "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr  ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid   "enable [<remote>:] <name>"
 msgstr  ""
 
@@ -3548,16 +3548,16 @@ msgid   "lxc info [<remote>:]<instance> [--show-log]\n"
 msgstr  ""
 
 #: lxc/init.go:41
-msgid   "lxc init ubuntu:16.04 u1\n"
+msgid   "lxc init ubuntu:18.04 u1\n"
         "\n"
-        "lxc init ubuntu:16.04 u1 < config.yaml\n"
+        "lxc init ubuntu:18.04 u1 < config.yaml\n"
         "    Create the instance with configuration from config.yaml"
 msgstr  ""
 
 #: lxc/launch.go:25
-msgid   "lxc launch ubuntu:16.04 u1\n"
+msgid   "lxc launch ubuntu:18.04 u1\n"
         "\n"
-        "lxc launch ubuntu:16.04 u1 < config.yaml\n"
+        "lxc launch ubuntu:18.04 u1 < config.yaml\n"
         "    Create and start the instance with configuration from config.yaml"
 msgstr  ""
 
@@ -3764,7 +3764,7 @@ msgstr  ""
 msgid   "remove [<remote>:]<instance|profile> <name>..."
 msgstr  ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid   "remove [<remote>:]<member>"
 msgstr  ""
 
@@ -3784,7 +3784,7 @@ msgstr  ""
 msgid   "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr  ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid   "rename [<remote>:]<member> <new-name>"
 msgstr  ""
 
@@ -3864,7 +3864,7 @@ msgstr  ""
 msgid   "show [<remote>:]<instance|profile>"
 msgstr  ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid   "show [<remote>:]<member>"
 msgstr  ""
 
@@ -4001,7 +4001,7 @@ msgstr  ""
 msgid   "y"
 msgstr  ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879 lxc/image.go:1062
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879 lxc/image.go:1062
 msgid   "yes"
 msgstr  ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index b3ae86db00..a80cfc1dfc 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 96e0be0d49..86b2f60811 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/linux-containers/"
@@ -297,7 +297,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARCHITECTUUR"
 
@@ -415,7 +415,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -893,8 +893,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1093,11 +1093,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1235,7 +1235,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1251,7 +1251,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1908,12 +1908,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2493,7 +2493,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2517,7 +2517,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2796,7 +2796,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3279,7 +3279,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3588,7 +3588,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3818,17 +3818,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4063,7 +4063,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4083,7 +4083,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4165,7 +4165,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4302,7 +4302,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 39fe1fa9db..7881a2cb29 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 89dc3e121e..33d89e2eb0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2018-09-08 19:22+0000\n"
 "Last-Translator: m4sk1n <me at m4sk.in>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/linux-containers/"
@@ -297,7 +297,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -415,7 +415,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -893,8 +893,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1093,11 +1093,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1235,7 +1235,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1251,7 +1251,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1908,12 +1908,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2493,7 +2493,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2517,7 +2517,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2796,7 +2796,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3279,7 +3279,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3588,7 +3588,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3818,17 +3818,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4063,7 +4063,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4083,7 +4083,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4165,7 +4165,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4302,7 +4302,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d19cf7529f..4e79bc2e47 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2019-09-06 07:09+0000\n"
 "Last-Translator: Stéphane Graber <stgraber at stgraber.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -354,7 +354,7 @@ msgstr "ALIAS"
 msgid "ALIASES"
 msgstr "ALIASES"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "ARQUITETURA"
 
@@ -479,7 +479,7 @@ msgstr "Anexar interfaces de rede aos perfis"
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -678,7 +678,7 @@ msgstr "Versão do cliente: %s\n"
 msgid "Cluster member name"
 msgstr "Nome de membro do cluster"
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr "Clustering ativado"
 
@@ -983,8 +983,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1115,7 +1115,7 @@ msgstr "Uso de disco:"
 msgid "Disks:"
 msgstr "Uso de disco:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1192,11 +1192,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1334,7 +1334,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr "Forçar alocação de pseudo-terminal"
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1350,7 +1350,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -2017,12 +2017,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2608,7 +2608,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2633,7 +2633,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2916,7 +2916,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Editar templates de arquivo do container"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3409,7 +3409,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3718,7 +3718,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3948,17 +3948,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4193,7 +4193,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4213,7 +4213,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4295,7 +4295,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4432,7 +4432,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "sim"
diff --git a/po/ru.po b/po/ru.po
index 194275eda8..3d8214c685 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2018-06-22 15:57+0000\n"
 "Last-Translator: Александр Киль <shorrey at gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/linux-containers/"
@@ -341,7 +341,7 @@ msgstr "ПСЕВДОНИМ"
 msgid "ALIASES"
 msgstr "ПСЕВДОНИМ"
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr "АРХИТЕКТУРА"
 
@@ -461,7 +461,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -661,7 +661,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -957,8 +957,8 @@ msgstr "Копирование образа: %s"
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -1089,7 +1089,7 @@ msgstr " Использование диска:"
 msgid "Disks:"
 msgstr " Использование диска:"
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1163,11 +1163,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1308,7 +1308,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1996,12 +1996,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2591,7 +2591,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2616,7 +2616,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2901,7 +2901,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr "Невозможно добавить имя контейнера в список"
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3390,7 +3390,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3776,7 +3776,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -4042,17 +4042,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -4323,7 +4323,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4347,7 +4347,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4481,7 +4481,7 @@ msgstr ""
 "\n"
 "lxc %s [<remote>:]<container> [[<remote>:]<container>...]%s"
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4655,7 +4655,7 @@ msgstr "Столбцы"
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr "да"
diff --git a/po/sl.po b/po/sl.po
index 5643e215cf..f031e942bb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 59de2bbcb0..6d3a69a801 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index df89b8a3a4..c42c8aacaa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index ecd5eb94be..b8f4b04f17 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8b003f5256..4072f69443 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index ef1919b413..8e0e746bc5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -825,8 +825,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -953,7 +953,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1025,11 +1025,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1840,12 +1840,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2425,7 +2425,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2449,7 +2449,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3520,7 +3520,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3750,17 +3750,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3995,7 +3995,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4015,7 +4015,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4234,7 +4234,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index b6c3aa5ad6..8ac03ffe6f 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2020-01-13 15:14-0500\n"
+"POT-Creation-Date: 2020-01-14 15:12-0500\n"
 "PO-Revision-Date: 2018-09-11 19:15+0000\n"
 "Last-Translator: 0x0916 <w at laoqinren.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -232,7 +232,7 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: lxc/image.go:1008 lxc/list.go:423
+#: lxc/cluster.go:131 lxc/image.go:1008 lxc/list.go:423
 msgid "ARCHITECTURE"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid ""
 "Attach to instance consoles\n"
 "\n"
-"This command allows you to interact with the boot console of a instance\n"
+"This command allows you to interact with the boot console of an instance\n"
 "as well as retrieve past log entries from it."
 msgstr ""
 
@@ -547,7 +547,7 @@ msgstr ""
 msgid "Cluster member name"
 msgstr ""
 
-#: lxc/cluster.go:402
+#: lxc/cluster.go:403
 msgid "Clustering enabled"
 msgstr ""
 
@@ -828,8 +828,8 @@ msgstr ""
 
 #: lxc/action.go:31 lxc/action.go:50 lxc/action.go:70 lxc/action.go:91
 #: lxc/alias.go:22 lxc/alias.go:54 lxc/alias.go:100 lxc/alias.go:144
-#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:146
-#: lxc/cluster.go:196 lxc/cluster.go:246 lxc/cluster.go:331 lxc/config.go:31
+#: lxc/alias.go:195 lxc/cluster.go:29 lxc/cluster.go:68 lxc/cluster.go:147
+#: lxc/cluster.go:197 lxc/cluster.go:247 lxc/cluster.go:332 lxc/config.go:31
 #: lxc/config.go:90 lxc/config.go:373 lxc/config.go:454 lxc/config.go:580
 #: lxc/config.go:699 lxc/config_device.go:24 lxc/config_device.go:76
 #: lxc/config_device.go:188 lxc/config_device.go:261 lxc/config_device.go:327
@@ -956,7 +956,7 @@ msgstr ""
 msgid "Disks:"
 msgstr ""
 
-#: lxc/cluster.go:251
+#: lxc/cluster.go:252
 msgid "Don't require user confirmation for using --force"
 msgstr ""
 
@@ -1028,11 +1028,11 @@ msgstr ""
 msgid "Empty column entry (redundant, leading or trailing command) in '%s'"
 msgstr ""
 
-#: lxc/cluster.go:330
+#: lxc/cluster.go:331
 msgid "Enable clustering on a single non-clustered LXD server"
 msgstr ""
 
-#: lxc/cluster.go:331
+#: lxc/cluster.go:332
 msgid ""
 "Enable clustering on a single non-clustered LXD server\n"
 "\n"
@@ -1170,7 +1170,7 @@ msgstr ""
 msgid "Force pseudo-terminal allocation"
 msgstr ""
 
-#: lxc/cluster.go:250
+#: lxc/cluster.go:251
 msgid "Force removing a member, even if degraded"
 msgstr ""
 
@@ -1186,7 +1186,7 @@ msgstr ""
 msgid "Force using the local unix socket"
 msgstr ""
 
-#: lxc/cluster.go:258
+#: lxc/cluster.go:259
 #, c-format
 msgid ""
 "Forcefully removing a server from the cluster should only be done as a last\n"
@@ -1843,12 +1843,12 @@ msgstr ""
 msgid "Maximum number of VFs: %d"
 msgstr ""
 
-#: lxc/cluster.go:313
+#: lxc/cluster.go:314
 #, c-format
 msgid "Member %s removed"
 msgstr ""
 
-#: lxc/cluster.go:226
+#: lxc/cluster.go:227
 #, c-format
 msgid "Member %s renamed to %s"
 msgstr ""
@@ -2428,7 +2428,7 @@ msgstr ""
 msgid "Remove %s (yes/no): "
 msgstr ""
 
-#: lxc/cluster.go:245 lxc/cluster.go:246
+#: lxc/cluster.go:246 lxc/cluster.go:247
 msgid "Remove a member from the cluster"
 msgstr ""
 
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "Remove trusted clients"
 msgstr ""
 
-#: lxc/cluster.go:195 lxc/cluster.go:196
+#: lxc/cluster.go:196 lxc/cluster.go:197
 msgid "Rename a cluster member"
 msgstr ""
 
@@ -2731,7 +2731,7 @@ msgstr ""
 msgid "Show content of instance file templates"
 msgstr ""
 
-#: lxc/cluster.go:145 lxc/cluster.go:146
+#: lxc/cluster.go:146 lxc/cluster.go:147
 msgid "Show details of a cluster member"
 msgstr ""
 
@@ -3214,7 +3214,7 @@ msgstr ""
 msgid "User ID to run the command as (default 0)"
 msgstr ""
 
-#: lxc/cluster.go:277 lxc/delete.go:47
+#: lxc/cluster.go:278 lxc/delete.go:47
 msgid "User aborted delete operation"
 msgstr ""
 
@@ -3523,7 +3523,7 @@ msgstr ""
 msgid "edit [<remote>:][<instance>[/<snapshot>]]"
 msgstr ""
 
-#: lxc/cluster.go:329
+#: lxc/cluster.go:330
 msgid "enable [<remote>:] <name>"
 msgstr ""
 
@@ -3753,17 +3753,17 @@ msgstr ""
 
 #: lxc/init.go:41
 msgid ""
-"lxc init ubuntu:16.04 u1\n"
+"lxc init ubuntu:18.04 u1\n"
 "\n"
-"lxc init ubuntu:16.04 u1 < config.yaml\n"
+"lxc init ubuntu:18.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: lxc/launch.go:25
 msgid ""
-"lxc launch ubuntu:16.04 u1\n"
+"lxc launch ubuntu:18.04 u1\n"
 "\n"
-"lxc launch ubuntu:16.04 u1 < config.yaml\n"
+"lxc launch ubuntu:18.04 u1 < config.yaml\n"
 "    Create and start the instance with configuration from config.yaml"
 msgstr ""
 
@@ -3998,7 +3998,7 @@ msgstr ""
 msgid "remove [<remote>:]<instance|profile> <name>..."
 msgstr ""
 
-#: lxc/cluster.go:243
+#: lxc/cluster.go:244
 msgid "remove [<remote>:]<member>"
 msgstr ""
 
@@ -4018,7 +4018,7 @@ msgstr ""
 msgid "rename [<remote>:]<instance>[/<snapshot>] <instance>[/<snapshot>]"
 msgstr ""
 
-#: lxc/cluster.go:193
+#: lxc/cluster.go:194
 msgid "rename [<remote>:]<member> <new-name>"
 msgstr ""
 
@@ -4100,7 +4100,7 @@ msgstr ""
 msgid "show [<remote>:]<instance|profile>"
 msgstr ""
 
-#: lxc/cluster.go:144
+#: lxc/cluster.go:145
 msgid "show [<remote>:]<member>"
 msgstr ""
 
@@ -4237,7 +4237,7 @@ msgstr ""
 msgid "y"
 msgstr ""
 
-#: lxc/cluster.go:276 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
+#: lxc/cluster.go:277 lxc/delete.go:46 lxc/image.go:874 lxc/image.go:879
 #: lxc/image.go:1062
 msgid "yes"
 msgstr ""

From 505048b34f19820f007ca6ac96e1d7780fb1f704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:12:46 -0500
Subject: [PATCH 5/7] doc: s/container/instance/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/backup.md           |  24 ++--
 doc/cloud-init.md       |  14 +-
 doc/clustering.md       |  27 ++--
 doc/configuration.md    |   2 +-
 doc/daemon-behavior.md  |  20 +--
 doc/database.md         |  12 +-
 doc/debugging.md        |   3 +-
 doc/dev-lxd.md          |  24 ++--
 doc/faq.md              |   2 +-
 doc/image-handling.md   |  44 +++---
 doc/index.md            |   9 +-
 doc/migration.md        |  14 +-
 doc/networks.md         |   2 +-
 doc/production-setup.md |  26 ++--
 doc/projects.md         |   2 +-
 doc/rest-api.md         | 304 ++++++++++++++++++++--------------------
 doc/security.md         |   8 +-
 doc/storage.md          |  64 ++++-----
 18 files changed, 302 insertions(+), 299 deletions(-)

diff --git a/doc/backup.md b/doc/backup.md
index 0fb8b82311..105d16a0c8 100644
--- a/doc/backup.md
+++ b/doc/backup.md
@@ -3,14 +3,14 @@
 When planning to backup a LXD server, consider all the different objects
 that are stored/managed by LXD:
 
- - Containers (database records and filesystems)
+ - Instances (database records and filesystems)
  - Images (database records, image files and filesystems)
  - Networks (database records and state files)
  - Profiles (database records)
  - Storage volumes (database records and filesystems)
 
-Only backing up the database or only backing up the container filesystem
-will not get you a fully functional backup.
+Only backing up the database or only backing up the instances will not
+get you a fully functional backup.
 
 In some disaster recovery scenarios, that may be reasonable but if your
 goal is to get back online quickly, consider all the different pieces of
@@ -30,15 +30,15 @@ directory, restoring the backup and any external dependency it requires.
 Then start LXD again and check that everything works fine.
 
 ## Secondary backup LXD server
-LXD supports copying and moving containers and storage volumes between two hosts.
+LXD supports copying and moving instances and storage volumes between two hosts.
 
-So with a spare server, you can copy your containers and storage volumes
+So with a spare server, you can copy your instances and storage volumes
 to that secondary server every so often, allowing it to act as either an
 offline spare or just as a storage server that you can copy your
-containers back from if needed.
+instances back from if needed.
 
-## Container backups
-The `lxc export` command can be used to export containers to a backup tarball.
+## Instance backups
+The `lxc export` command can be used to export instances to a backup tarball.
 Those tarballs will include all snapshots by default and an "optimized"
 tarball can be obtained if you know that you'll be restoring on a LXD
 server using the same storage pool backend.
@@ -47,14 +47,14 @@ Those tarballs can be saved any way you want on any filesystem you want
 and can be imported back into LXD using the `lxc import` command.
 
 ## Disaster recovery
-Additionally, LXD maintains a `backup.yaml` file in each container's storage
+Additionally, LXD maintains a `backup.yaml` file in each instance's storage
 volume. This file contains all necessary information to recover a given
-container, such as container configuration, attached devices and storage.
+instance, such as instance configuration, attached devices and storage.
 
 This file can be processed by the `lxd import` command, not to
 be confused with `lxc import`.
 
-To use the disaster recovery mechanism, you must mount the container's
+To use the disaster recovery mechanism, you must mount the instance's
 storage to its expected location, usually under
 `storage-pools/NAME-OF-POOL/containers/NAME-OF-CONTAINER`.
 
@@ -64,5 +64,5 @@ any snapshot you want to restore (needed for `dir` and `btrfs`).
 Once everything is mounted where it should be, you can now run `lxd import NAME-OF-CONTAINER`.
 
 If any matching database entry for resources declared in `backup.yaml` is found
-during import, the command will refuse to restore the container.  This can be
+during import, the command will refuse to restore the instance.  This can be
 overridden by passing `--force`.
diff --git a/doc/cloud-init.md b/doc/cloud-init.md
index 92b734eb64..ccec7d12c8 100644
--- a/doc/cloud-init.md
+++ b/doc/cloud-init.md
@@ -1,9 +1,9 @@
 # Custom network configuration with cloud-init
 
-[cloud-init](https://launchpad.net/cloud-init) may be used for custom network configuration of containers.
+[cloud-init](https://launchpad.net/cloud-init) may be used for custom network configuration of instances.
 
 Before trying to use it, however, first determine which image source you are
-about to use as not all container images have cloud-init package installed.
+about to use as not all images have cloud-init package installed.
 At the time of writing, images provided at images.linuxcontainers.org do not
 have the cloud-init package installed, therefore, any of the configuration
 options mentioned in this guide will not work. On the contrary, images
@@ -17,7 +17,7 @@ and also have a templates directory in their archive populated with
 
 and others not related to cloud-init.
 
-Templates provided with container images at cloud-images.ubuntu.com have
+Templates provided with images at cloud-images.ubuntu.com have
 the following in their `metadata.yaml`:
 
 ```yaml
@@ -28,14 +28,14 @@ the following in their `metadata.yaml`:
   template: cloud-init-network.tpl
 ```
 
-Therefore, either when you create or copy a container it gets a newly rendered
+Therefore, either when you create or copy an instance it gets a newly rendered
 network configuration from a pre-defined template.
 
 cloud-init uses the network-config file to render the relevant network
 configuration on the system using either ifupdown or netplan depending
 on the Ubuntu release.
 
-The default behavior is to use a DHCP client on a container's eth0 interface.
+The default behavior is to use a DHCP client on an instance's eth0 interface.
 
 In order to change this you need to define your own network configuration
 using user.network-config key in the config dictionary which will override
@@ -62,7 +62,7 @@ config:
         address: 10.10.10.254
 ```
 
-A container's rootfs will contain the following files as a result:
+An instance's rootfs will contain the following files as a result:
 
  * `/var/lib/cloud/seed/nocloud-net/network-config`
  * `/etc/network/interfaces.d/50-cloud-init.cfg` (if using ifupdown)
@@ -102,7 +102,7 @@ config:
 ```
 
 The template syntax is the one used in the pongo2 template engine. A custom
-`config_get` function is defined to retrieve values from a container
+`config_get` function is defined to retrieve values from an instance
 configuration.
 
 Options available with such a template structure:
diff --git a/doc/clustering.md b/doc/clustering.md
index 905da70a24..8ae120e9d9 100644
--- a/doc/clustering.md
+++ b/doc/clustering.md
@@ -1,6 +1,6 @@
 # Clustering
 
-LXD can be run in clustering mode, where any number of LXD instances
+LXD can be run in clustering mode, where any number of LXD servers
 share the same distributed database and can be managed uniformly using
 the lxc client or the REST API.
 
@@ -10,7 +10,7 @@ Note that this feature was introduced as part of the API extension
 ## Forming a cluster
 
 First you need to choose a bootstrap LXD node. It can be an existing
-LXD instance or a brand new one. Then you need to initialize the
+LXD server or a brand new one. Then you need to initialize the
 bootstrap node and join further nodes to the cluster. This can be done
 interactively or with a preseed file.
 
@@ -39,7 +39,7 @@ network bridge. At this point your first cluster node should be up and
 available on your network.
 
 You can now join further nodes to the cluster. Note however that these
-nodes should be brand new LXD instances, or alternatively you should
+nodes should be brand new LXD servers, or alternatively you should
 clear their contents before joining, since any existing data on them
 will be lost.
 
@@ -166,7 +166,7 @@ if there are still nodes in the cluster that have not been upgraded
 and that are running an older version. When a node is in the
 Blocked state it will not serve any LXD API requests (in particular,
 lxc commands on that node will not work, although any running
-container will continue to run).
+instance will continue to run).
 
 You can see if some nodes are blocked by running `lxc cluster list` on
 a node which is not blocked.
@@ -207,8 +207,8 @@ online.
 
 Note that no information has been deleted from the database, in particular all
 information about the cluster members that you have lost is still there,
-including the metadata about their containers. This can help you with further
-recovery steps in case you need to re-create the lost containers.
+including the metadata about their instances. This can help you with further
+recovery steps in case you need to re-create the lost instances.
 
 In order to permanently delete the cluster members that you have lost, you can
 run the command:
@@ -220,9 +220,9 @@ lxc cluster remove <name> --force
 Note that this time you have to use the regular ```lxc``` command line tool, not
 ```lxd```.
 
-## Containers
+## Instances
 
-You can launch a container on any node in the cluster from any node in
+You can launch an instance on any node in the cluster from any node in
 the cluster. For example, from node1:
 
 ```bash
@@ -231,12 +231,11 @@ lxc launch --target node2 ubuntu:16.04 xenial
 
 will launch an Ubuntu 16.04 container on node2.
 
-When you launch a container without defining a target, the container will be 
-launched on the server which has the lowest number of containers.
-If all the servers have the same amount of containers, it will choose one 
-at random.
+When you launch an instance without defining a target, the instance will be 
+launched on the server which has the lowest number of instances.
+If all the servers have the same amount of instances, it will choose one at random.
 
-You can list all containers in the cluster with:
+You can list all instances in the cluster with:
 
 ```bash
 lxc list
@@ -244,7 +243,7 @@ lxc list
 
 The NODE column will indicate on which node they are running.
 
-After a container is launched, you can operate it from any node. For
+After an instance is launched, you can operate it from any node. For
 example, from node1:
 
 ```bash
diff --git a/doc/configuration.md b/doc/configuration.md
index dabf5db6ee..33482269b7 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -2,7 +2,7 @@
 Current LXD stores configurations for a few components:
 
 - [Server](server.md)
-- [Containers](containers.md) 
+- [Instances](instances.md) 
 - [Network](networks.md)
 - [Profiles](profiles.md)
 - [Storage](storage.md)
diff --git a/doc/daemon-behavior.md b/doc/daemon-behavior.md
index 326de520b7..a5cb13fd7e 100644
--- a/doc/daemon-behavior.md
+++ b/doc/daemon-behavior.md
@@ -10,27 +10,27 @@ On every start, LXD checks that its directory structure exists. If it
 doesn't, it'll create the required directories, generate a keypair and
 initialize the database.
 
-Once the daemon is ready for work, LXD will scan the containers table
-for any container for which the stored power state differs from the
-current one. If a container's power state was recorded as running and the
-container isn't running, LXD will start it.
+Once the daemon is ready for work, LXD will scan the instances table
+for any instance for which the stored power state differs from the
+current one. If an instance's power state was recorded as running and the
+instance isn't running, LXD will start it.
 
 ## Signal handling
 ### SIGINT, SIGQUIT, SIGTERM
 For those signals, LXD assumes that it's being temporarily stopped and
-will be restarted at a later time to continue handling the containers.
+will be restarted at a later time to continue handling the instances.
 
-The containers will keep running and LXD will close all connections and
+The instances will keep running and LXD will close all connections and
 exit cleanly.
 
 ### SIGPWR
 Indicates to LXD that the host is going down.
 
-LXD will attempt a clean shutdown of all the containers. After 30s, it
-will kill any remaining container.
+LXD will attempt a clean shutdown of all the instances. After 30s, it
+will kill any remaining instance.
 
-The container `power_state` in the containers table is kept as it was so
-that LXD after the host is done rebooting can restore the containers as
+The instance `power_state` in the instances table is kept as it was so
+that LXD after the host is done rebooting can restore the instances as
 they were.
 
 ### SIGUSR1
diff --git a/doc/database.md b/doc/database.md
index 1630e0bee9..27422e9bb0 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -3,19 +3,19 @@
 ## Introduction
 So first of all, why a database?
 
-Rather than keeping the configuration and state within each container's
+Rather than keeping the configuration and state within each instance's
 directory as is traditionally done by LXC, LXD has an internal database
 which stores all of that information. This allows very quick queries
-against all containers configuration.
+against all instances configuration.
 
 
-An example is the rather obvious question "what containers are using br0?".
+An example is the rather obvious question "what instances are using br0?".
 To answer that question without a database, LXD would have to iterate
-through every single container, load and parse its configuration and
+through every single instance, load and parse its configuration and
 then look at what network devices are defined in there.
 
-While that may be quick with a few containers, imagine how many
-filesystem access would be required for 2000 containers. Instead with a
+While that may be quick with a few instance, imagine how many
+filesystem access would be required for 2000 instances. Instead with a
 database, it's only a matter of accessing the already cached database
 with a pretty simple query.
 
diff --git a/doc/debugging.md b/doc/debugging.md
index 0225e8c498..2c5d4bf296 100644
--- a/doc/debugging.md
+++ b/doc/debugging.md
@@ -1,6 +1,5 @@
 # Debugging
-
-For information on debugging container issues, see [Frequently Asked Questions](faq.md)
+For information on debugging instance issues, see [Frequently Asked Questions](faq.md)
 
 ## Debugging `lxc` and `lxd`
 
diff --git a/doc/dev-lxd.md b/doc/dev-lxd.md
index 00f9cb2fcf..8cf2f453ac 100644
--- a/doc/dev-lxd.md
+++ b/doc/dev-lxd.md
@@ -1,12 +1,12 @@
-# Communication between container and host
+# Communication between instance and host
 ## Introduction
-Communication between the hosted workload (container) and its host while
+Communication between the hosted workload (instance) and its host while
 not strictly needed is a pretty useful feature.
 
 In LXD, this feature is implemented through a `/dev/lxd/sock` node which is
-created and setup for all LXD containers.
+created and setup for all LXD instances.
 
-This file is a Unix socket which processes inside the container can
+This file is a Unix socket which processes inside the instance can
 connect to. It's multi-threaded so multiple clients can be connected at the
 same time.
 
@@ -14,18 +14,18 @@ same time.
 LXD on the host binds `/var/lib/lxd/devlxd/sock` and starts listening for new
 connections on it.
 
-This socket is then bind-mounted into every single container started by
+This socket is then exposed into every single instance started by
 LXD at `/dev/lxd/sock`.
 
-The bind-mount is required so we can exceed 4096 containers, otherwise,
-LXD would have to bind a different socket for every container, quickly
+The single socket is required so we can exceed 4096 instances, otherwise,
+LXD would have to bind a different socket for every instance, quickly
 reaching the FD limit.
 
 ## Authentication
 Queries on `/dev/lxd/sock` will only return information related to the
-requesting container. To figure out where a request comes from, LXD will
+requesting instance. To figure out where a request comes from, LXD will
 extract the initial socket ucred and compare that to the list of
-containers it manages.
+instances it manages.
 
 ## Protocol
 The protocol on `/dev/lxd/sock` is plain-text HTTP with JSON messaging, so very
@@ -74,12 +74,12 @@ Return value:
  * Description: List of configuration keys
  * Return: list of configuration keys URL
 
-Note that the configuration key names match those in the container
+Note that the configuration key names match those in the instance
 config, however not all configuration namespaces will be exported to
 `/dev/lxd/sock`.
-Currently only the `user.*` keys are accessible to the container.
+Currently only the `user.*` keys are accessible to the instance.
 
-At this time, there also aren't any container-writable namespace.
+At this time, there also aren't any instance-writable namespace.
 
 Return value:
 
diff --git a/doc/faq.md b/doc/faq.md
index 32059f56f0..6e2997c9d4 100644
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -129,7 +129,7 @@ safe to do.
 ### Beware of 'port security'
 
 Many switches do *not* allow MAC address changes, and will either drop traffic
-with an incorrect MAC, or, disable the port totally. If you can ping a LXD container
+with an incorrect MAC, or, disable the port totally. If you can ping a LXD instance
 from the host, but are not able to ping it from a _different_ host, this could be
 the cause.  The way to diagnose this is to run a tcpdump on the uplink (in this case,
 eth1), and you will see either 'ARP Who has xx.xx.xx.xx tell yy.yy.yy.yy', with you
diff --git a/doc/image-handling.md b/doc/image-handling.md
index 9469bd7a88..737c4440c8 100644
--- a/doc/image-handling.md
+++ b/doc/image-handling.md
@@ -6,20 +6,20 @@ where the user or external tools can import images.
 
 Containers are then started from those images.
 
-It's possible to spawn remote containers using local images or local
-containers using remote images. In such cases, the image may be cached
+It's possible to spawn remote instances using local images or local
+instances using remote images. In such cases, the image may be cached
 on the target LXD.
 
 ## Caching
-When spawning a container from a remote image, the remote image is
+When spawning an instance from a remote image, the remote image is
 downloaded into the local image store with the cached bit set. The image
 will be kept locally as a private image until either it's been unused
-(no new container spawned) for the number of days set in
+(no new instance spawned) for the number of days set in
 `images.remote_cache_expiry` or until the image's expiry is reached
 whichever comes first.
 
 LXD keeps track of image usage by updating the `last_used_at` image
-property every time a new container is spawned from the image.
+property every time a new instance is spawned from the image.
 
 ## Auto-update
 LXD can keep images up to date. By default, any image which comes from a
@@ -40,31 +40,31 @@ manually copying an image from a remote server.
 
 
 If a new upstream image update is published and the local LXD has the
-previous image in its cache when the user requests a new container to be
+previous image in its cache when the user requests a new instance to be
 created from it, LXD will use the previous version of the image rather
-than delay the container creation.
+than delay the instance creation.
 
 This behavior only happens if the current image is scheduled to be
 auto-updated and can be disabled by setting `images.auto_update_interval` to 0.
 
 ## Profiles
 A list of profiles can be associated with an image using the `lxc image edit`
-command. After associating profiles with an image, a container launched
+command. After associating profiles with an image, an instance launched
 using the image will have the profiles applied in order. If `nil` is passed
 as the list of profiles, only the `default` profile will be associated with 
 the image. If an empty list is passed, then no profile will be associated
 with the image, not even the `default` profile. An image's associated
-profiles can be overridden when launching a container by using the 
+profiles can be overridden when launching an instance by using the 
 `--profile` and the `--no-profiles` flags to `lxc launch`.
 
 ## Image format
 LXD currently supports two LXD-specific image formats.
 
 The first is a unified tarball, where a single tarball
-contains both the container rootfs and the needed metadata.
+contains both the instance root and the needed metadata.
 
-The second is a split model, using two tarballs instead, one containing
-the rootfs, the other containing the metadata.
+The second is a split model, using two files instead, one containing
+the root, the other containing the metadata.
 
 The former is what's produced by LXD itself and what people should be
 using for LXD-specific images.
@@ -99,9 +99,10 @@ The tarball(s) can be compressed using bz2, gz, xz, lzma, tar (uncompressed) or
 it can also be a squashfs image.
 
 ### Content
-The rootfs directory (or tarball) contains a full file system tree of what will become the container's `/`.
+For containers, the rootfs directory (or tarball) contains a full file system tree of what will become the `/`.
+For VMs, this is instead a `root.img` file which becomes the main disk device.
 
-The templates directory contains pongo2-formatted templates of files inside the container.
+The templates directory contains pongo2-formatted templates of files inside the instance.
 
 `metadata.yaml` contains information relevant to running the image under
 LXD, at the moment, this contains:
@@ -139,24 +140,25 @@ pretty common.
 
 For templates, the `when` key can be one or more of:
 
- - `create` (run at the time a new container is created from the image)
- - `copy` (run when a container is created from an existing one)
- - `start` (run every time the container is started)
+ - `create` (run at the time a new instance is created from the image)
+ - `copy` (run when an instance is created from an existing one)
+ - `start` (run every time the instance is started)
 
 The templates will always receive the following context:
 
  - `trigger`: name of the event which triggered the template (string)
  - `path`: path of the file being templated (string)
- - `container`: key/value map of container properties (name, architecture, privileged and ephemeral) (map[string]string)
- - `config`: key/value map of the container's configuration (map[string]string)
- - `devices`: key/value map of the devices assigned to this container (map[string]map[string]string)
+ - `container`: key/value map of instance properties (name, architecture, privileged and ephemeral) (map[string]string) (deprecated in favor of `instance`)
+ - `instance`: key/value map of instance properties (name, architecture, privileged and ephemeral) (map[string]string)
+ - `config`: key/value map of the instance's configuration (map[string]string)
+ - `devices`: key/value map of the devices assigned to this instance (map[string]map[string]string)
  - `properties`: key/value map of the template properties specified in metadata.yaml (map[string]string)
 
 The `create_only` key can be set to have LXD only only create missing files but not overwrite an existing file.
 
 As a general rule, you should never template a file which is owned by a
 package or is otherwise expected to be overwritten by normal operation
-of the container.
+of the instance.
 
 For convenience the following functions are exported to pongo templates:
 
diff --git a/doc/index.md b/doc/index.md
index d5d3b1225d..3ae2553695 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -1,7 +1,7 @@
 [![LXD](https://linuxcontainers.org/static/img/containers.png)](https://linuxcontainers.org/lxd)
 # LXD
-LXD is a next generation system container manager.  
-It offers a user experience similar to virtual machines but using Linux containers instead.
+LXD is a next generation system container and virtual machine manager.  
+It offers a unified user experience around full Linux systems running inside containers or virtual machines.
 
 It's image based with pre-made images available for a [wide number of Linux distributions](https://images.linuxcontainers.org)  
 and is built around a very powerful, yet pretty simple, REST API.
@@ -139,8 +139,7 @@ export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs
 Now, the `lxd` and `lxc` binaries will be available to you and can be used to set up LXD. The binaries will automatically find and use the dependencies built in `$GOPATH/deps` thanks to the `LD_LIBRARY_PATH` environment variable.
 
 ### Machine Setup
-You'll need sub{u,g}ids for root, so that LXD can create the unprivileged
-containers:
+You'll need sub{u,g}ids for root, so that LXD can create the unprivileged containers:
 
 ```bash
 echo "root:1000000:65536" | sudo tee -a /etc/subuid /etc/subgid
@@ -154,7 +153,7 @@ sudo -E LD_LIBRARY_PATH=$LD_LIBRARY_PATH $GOPATH/bin/lxd --group sudo
 ```
 
 ## Security
-LXD, similar to other container managers provides a UNIX socket for local communication.
+LXD, similar to other container and VM managers provides a UNIX socket for local communication.
 
 **WARNING**: Anyone with access to that socket can fully control LXD, which includes
 the ability to attach host devices and filesystems, this should
diff --git a/doc/migration.md b/doc/migration.md
index ba405f53f9..5767be3c59 100644
--- a/doc/migration.md
+++ b/doc/migration.md
@@ -1,11 +1,10 @@
 # Live Migration in LXD
 
 ## Overview
-
 Migration has two pieces, a "source", that is, the host that already has the
-container, and a "sink", the host that's getting the container. Currently,
+instance, and a "sink", the host that's getting the instance. Currently,
 in the `pull` mode, the source sets up an operation, and the sink connects
-to the source and pulls the container.
+to the source and pulls the instance.
 
 There are three websockets (channels) used in migration:
 
@@ -13,9 +12,9 @@ There are three websockets (channels) used in migration:
   2. the criu images stream
   3. the filesystem stream
 
-When a migration is initiated, information about the container, its
+When a migration is initiated, information about the instance, its
 configuration, etc. are sent over the control channel (a full
-description of this process is below), the criu images and container
+description of this process is below), the criu images and instance
 filesystem are synced over their respective channels, and the result of
 the restore operation is sent from the sink to the source over the
 control channel.
@@ -28,11 +27,10 @@ filesystem socket can speak btrfs-send/receive. Additionally, although we do a
 will happen over the criu socket at some later time.
 
 ## Control Socket
-
 Once all three websockets are connected between the two endpoints, the
 source sends a MigrationHeader (protobuf description found in
-`/lxd/migration/migrate.proto`). This header contains the container
-configuration which will be added to the new container.
+`/lxd/migration/migrate.proto`). This header contains the instance
+configuration which will be added to the new instance.
 
 There are also two fields indicating the filesystem and criu protocol to speak.
 For example, if a server is hosted on a btrfs filesystem, it can indicate that it
diff --git a/doc/networks.md b/doc/networks.md
index 51143a42d5..085147a206 100644
--- a/doc/networks.md
+++ b/doc/networks.md
@@ -29,7 +29,7 @@ under the `bridge` namespace can be used to configure it.
 
 Additionally, LXD can utilize a pre-existing Linux
 bridge. In this case, the bridge does not need to be created via
-`lxd network` and can simply be referenced in a container or
+`lxd network` and can simply be referenced in an instance or
 profile device configuration as follows:
 
 ```
diff --git a/doc/production-setup.md b/doc/production-setup.md
index 324fadab8e..d7f26a47e9 100644
--- a/doc/production-setup.md
+++ b/doc/production-setup.md
@@ -52,19 +52,23 @@ Then, reboot the server.
 [2]: https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt
 
 ### Network Bandwidth Tweaking 
-If you have at least 1GbE NIC on your lxd host with a lot of local activity (container - container connections, or host - container connections), or you have 1GbE or better internet connection on your lxd host it worth play with txqueuelen. These settings work even better with 10GbE NIC.
+If you have at least 1GbE NIC on your lxd host with a lot of local
+activity (container - container connections, or host - container
+connections), or you have 1GbE or better internet connection on your lxd
+host it worth play with txqueuelen. These settings work even better with
+10GbE NIC.
 
 #### Server Changes
-
 ##### txqueuelen 
+You need to change `txqueuelen` of your real NIC to 10000 (not sure
+about the best possible value for you), and change and change lxdbr0
+interface `txqueuelen` to 10000.  
 
-You need to change `txqueuelen` of your real NIC to 10000 (not sure about the best possible value for you), and change and change lxdbr0 interface `txqueuelen` to 10000.  
 In Debian-based distros you can change `txqueuelen` permanently in `/etc/network/interfaces`  
 You can add for ex.: `up ip link set eth0 txqueuelen 10000` to your interface configuration to set txqueuelen value on boot.  
 You could set it txqueuelen temporary (for test purpose) with `ifconfig <interface> txqueuelen 10000`
 
 ##### /etc/sysctl.conf
-
 You also need to increase `net.core.netdev_max_backlog` value.  
 You can add `net.core.netdev_max_backlog = 182757` to `/etc/sysctl.conf` to set it permanently (after reboot)
 You set `netdev_max_backlog` temporary (for test purpose) with `echo 182757 > /proc/sys/net/core/netdev_max_backlog`
@@ -72,14 +76,16 @@ Note: You can find this value too high, most people prefer set `netdev_max_backl
 For example I use this values `net.ipv4.tcp_mem = 182757 243679 365514`
 
 #### Containers changes
-
 You also need to change txqueuelen value for all you ethernet interfaces in containers.  
 In Debian-based distros you can change txqueuelen permanently in `/etc/network/interfaces`  
 You can add for ex.: `up ip link set eth0 txqueuelen 10000` to your interface configuration to set txqueuelen value on boot.
 
 #### Notes regarding this change
-
-10000 txqueuelen value commonly used with 10GbE NICs. Basically small txqueuelen values used with slow devices with a high latency, and higher with devices with low latency. I personally have like 3-5% improvement with these settings for local (host with container, container vs container) and internet connections. Good thing about txqueuelen value tweak, the more containers you use, the more you can be can benefit from this tweak. And you can always temporary set this values and check this tweak in your environment without lxd host reboot.
-
-
-
+10000 txqueuelen value commonly used with 10GbE NICs. Basically small
+txqueuelen values used with slow devices with a high latency, and higher
+with devices with low latency. I personally have like 3-5% improvement
+with these settings for local (host with container, container vs
+container) and internet connections. Good thing about txqueuelen value
+tweak, the more containers you use, the more you can be can benefit from
+this tweak. And you can always temporary set this values and check this
+tweak in your environment without lxd host reboot.
diff --git a/doc/projects.md b/doc/projects.md
index f855d3c31b..626729194d 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -1,6 +1,6 @@
 # Project configuration
 LXD supports projects as a way to split your LXD server.
-Each project holds its own set of containers and may also have its own images and profiles.
+Each project holds its own set of instances and may also have its own images and profiles.
 
 What a project contains is defined through the `features` configuration keys.
 When a feature is disabled, the project inherits from the `default` project.
diff --git a/doc/rest-api.md b/doc/rest-api.md
index b9ac07a126..fd31d117ca 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -54,7 +54,7 @@ The body is a dict with the following structure:
     "type": "async",
     "status": "OK",
     "status_code": 100,
-    "operation": "/1.0/containers/<id>",                    // URL to the background operation
+    "operation": "/1.0/instances/<id>",                     // URL to the background operation
     "metadata": {}                                          // Operation metadata (see below)
 }
 ```
@@ -71,7 +71,7 @@ The operation metadata structure looks like:
     "status_code": 103,                                     // Integer version of the operation's status (use this rather than status)
     "resources": {                                          // Dictionary of resource types (container, snapshots, images) and affected resources
       "containers": [
-        "/1.0/containers/test"
+        "/1.0/instances/test"
       ]
     },
     "metadata": {                                           // Metadata specific to the operation in question (in this case, exec)
@@ -192,21 +192,21 @@ won't work and PUT needs to be used instead.
    * [`/1.0`](#10)
  * [`/1.0/certificates`](#10certificates)
    * [`/1.0/certificates/<fingerprint>`](#10certificatesfingerprint)
- * [`/1.0/containers`](#10containers)
-   * [`/1.0/containers/<name>`](#10containersname)
-     * [`/1.0/containers/<name>/console`](#10containersnameconsole)
-     * [`/1.0/containers/<name>/exec`](#10containersnameexec)
-     * [`/1.0/containers/<name>/files`](#10containersnamefiles)
-     * [`/1.0/containers/<name>/snapshots`](#10containersnamesnapshots)
-     * [`/1.0/containers/<name>/snapshots/<name>`](#10containersnamesnapshotsname)
-     * [`/1.0/containers/<name>/state`](#10containersnamestate)
-     * [`/1.0/containers/<name>/logs`](#10containersnamelogs)
-     * [`/1.0/containers/<name>/logs/<logfile>`](#10containersnamelogslogfile)
-     * [`/1.0/containers/<name>/metadata`](#10containersnamemetadata)
-     * [`/1.0/containers/<name>/metadata/templates`](#10containersnamemetadatatemplates)
-     * [`/1.0/containers/<name>/backups`](#10containersnamebackups)
-     * [`/1.0/containers/<name>/backups/<name>`](#10containersnamebackupsname)
-     * [`/1.0/containers/<name>/backups/<name>/export`](#10containersnamebackupsnameexport)
+ * [`/1.0/instances`](#10instances)
+   * [`/1.0/instances/<name>`](#10instancesname)
+     * [`/1.0/instances/<name>/console`](#10instancesnameconsole)
+     * [`/1.0/instances/<name>/exec`](#10instancesnameexec)
+     * [`/1.0/instances/<name>/files`](#10instancesnamefiles)
+     * [`/1.0/instances/<name>/snapshots`](#10instancesnamesnapshots)
+     * [`/1.0/instances/<name>/snapshots/<name>`](#10instancesnamesnapshotsname)
+     * [`/1.0/instances/<name>/state`](#10instancesnamestate)
+     * [`/1.0/instances/<name>/logs`](#10instancesnamelogs)
+     * [`/1.0/instances/<name>/logs/<logfile>`](#10instancesnamelogslogfile)
+     * [`/1.0/instances/<name>/metadata`](#10instancesnamemetadata)
+     * [`/1.0/instances/<name>/metadata/templates`](#10instancesnamemetadatatemplates)
+     * [`/1.0/instances/<name>/backups`](#10instancesnamebackups)
+     * [`/1.0/instances/<name>/backups/<name>`](#10instancesnamebackupsname)
+     * [`/1.0/instances/<name>/backups/<name>/export`](#10instancesnamebackupsnameexport)
  * [`/1.0/events`](#10events)
  * [`/1.0/images`](#10images)
    * [`/1.0/images/<fingerprint>`](#10imagesfingerprint)
@@ -442,38 +442,38 @@ Input (none at present):
 
 HTTP code for this should be 202 (Accepted).
 
-### `/1.0/containers`
+### `/1.0/instances`
 #### GET
- * Description: List of containers
+ * Description: List of instances
  * Authentication: trusted
  * Operation: sync
- * Return: list of URLs for containers this server publishes
+ * Return: list of URLs for instances this server hosts
 
 Return value:
 
 ```json
 [
-    "/1.0/containers/blah",
-    "/1.0/containers/blah1"
+    "/1.0/instances/blah",
+    "/1.0/instances/blah1"
 ]
 ```
 
 #### POST (optional `?target=<member>`)
- * Description: Create a new container
+ * Description: Create a new instance
  * Authentication: trusted
  * Operation: async
  * Return: background operation or standard error
 
-Input (container based on a local image with the "ubuntu/devel" alias):
+Input (instance based on a local image with the "ubuntu/devel" alias):
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -485,16 +485,16 @@ Input (container based on a local image with the "ubuntu/devel" alias):
 }
 ```
 
-Input (container based on a local image identified by its fingerprint):
+Input (instance based on a local image identified by its fingerprint):
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -505,16 +505,16 @@ Input (container based on a local image identified by its fingerprint):
 }
 ```
 
-Input (container based on most recent match based on image properties):
+Input (instance based on most recent match based on image properties):
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -529,16 +529,16 @@ Input (container based on most recent match based on image properties):
 }
 ```
 
-Input (container without a pre-populated rootfs, useful when attaching to an existing one):
+Input (instance without a pre-populated rootfs, useful when attaching to an existing one):
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -552,12 +552,12 @@ Input (using a public remote image):
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -576,12 +576,12 @@ Input (using a private remote image after having obtained a secret for that imag
 
 ```js
 {
-    "name": "my-new-container",                                         // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                          // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                            // List of profiles
-    "ephemeral": true,                                                  // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                  // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                      // Config override.
-    "devices": {                                                        // optional list of devices the container should have
+    "devices": {                                                        // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -596,16 +596,16 @@ Input (using a private remote image after having obtained a secret for that imag
 }
 ```
 
-Input (using a remote container, sent over the migration websocket):
+Input (using a remote instance, sent over the migration websocket):
 
 ```js
 {
-    "name": "my-new-container",                                                     // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                                      // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                                        // List of profiles
-    "ephemeral": true,                                                              // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                              // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                                  // Config override.
-    "devices": {                                                                    // optional list of devices the container should have
+    "devices": {                                                                    // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -615,8 +615,8 @@ Input (using a remote container, sent over the migration websocket):
                "mode": "pull",                                                      // "pull" and "push" is supported for now
                "operation": "https://10.0.2.3:8443/1.0/operations/<UUID>",          // Full URL to the remote operation (pull mode only)
                "certificate": "PEM certificate",                                    // Optional PEM certificate. If not mentioned, system CA is used.
-               "base-image": "<fingerprint>",                                       // Optional, the base image the container was created from
-               "container_only": true,                                              // Whether to migrate only the container without snapshots. Can be "true" or "false".
+               "base-image": "<fingerprint>",                                       // Optional, the base image the instance was created from
+               "instance_only": true,                                               // Whether to migrate only the instance without snapshots. Can be "true" or "false".
                "secrets": {"control": "my-secret-string",                           // Secrets to use when talking to the migration source
                            "criu":    "my-other-secret",
                            "fs":      "my third secret"}
@@ -624,36 +624,36 @@ Input (using a remote container, sent over the migration websocket):
 }
 ```
 
-Input (using a local container):
+Input (using a local instance):
 
 ```js
 {
-    "name": "my-new-container",                                                     // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                                      // 64 chars max, ASCII, no slash, no colon and no comma
     "profiles": ["default"],                                                        // List of profiles
-    "ephemeral": true,                                                              // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                              // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                                  // Config override.
-    "devices": {                                                                    // optional list of devices the container should have
+    "devices": {                                                                    // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
         },
     },
     "source": {"type": "copy",                                                      // Can be: "image", "migration", "copy" or "none"
-               "container_only": true,                                              // Whether to copy only the container without snapshots. Can be "true" or "false".
-               "source": "my-old-container"}                                        // Name of the source container
+               "instance_only": true,                                               // Whether to copy only the instance without snapshots. Can be "true" or "false".
+               "source": "my-old-instance"}                                         // Name of the source instance
 }
 ```
 
-Input (using a remote container, in push mode sent over the migration websocket via client proxying):
+Input (using a remote instance, in push mode sent over the migration websocket via client proxying):
 
 ```js
 {
-    "name": "my-new-container",                                                     // 64 chars max, ASCII, no slash, no colon and no comma
+    "name": "my-new-instance",                                                      // 64 chars max, ASCII, no slash, no colon and no comma
     "architecture": "x86_64",
     "profiles": ["default"],                                                        // List of profiles
-    "ephemeral": true,                                                              // Whether to destroy the container on shutdown
+    "ephemeral": true,                                                              // Whether to destroy the instance on shutdown
     "config": {"limits.cpu": "2"},                                                  // Config override.
-    "devices": {                                                                    // optional list of devices the container should have
+    "devices": {                                                                    // Optional list of devices the instance should have
         "kvm": {
             "path": "/dev/kvm",
             "type": "unix-char"
@@ -661,9 +661,9 @@ Input (using a remote container, in push mode sent over the migration websocket
     },
     "source": {"type": "migration",                                                 // Can be: "image", "migration", "copy" or "none"
                "mode": "push",                                                      // "pull" and "push" are supported
-               "base-image": "<fingerprint>",                                       // Optional, the base image the container was created from
+               "base-image": "<fingerprint>",                                       // Optional, the base image the instance was created from
                "live": true,                                                        // Whether migration is performed live
-               "container_only": true}                                              // Whether to migrate only the container without snapshots. Can be "true" or "false".
+               "instance_only": true}                                               // Whether to migrate only the instance without snapshots. Can be "true" or "false".
 }
 ```
 
@@ -671,12 +671,12 @@ Input (using a backup):
 
 Raw compressed tarball as provided by a backup download.
 
-### `/1.0/containers/<name>`
+### `/1.0/instances/<name>`
 #### GET
- * Description: Container information
+ * Description: Instance information
  * Authentication: trusted
  * Operation: sync
- * Return: dict of the container configuration and current state.
+ * Return: dict of the instance configuration and current state.
 
 Output:
 
@@ -696,12 +696,12 @@ Output:
         }
     },
     "ephemeral": false,
-    "expanded_config": {    // the result of expanding profiles and adding the container's local config
+    "expanded_config": {    // the result of expanding profiles and adding the instance's local config
         "limits.cpu": "3",
         "volatile.base_image": "97d97a3d1d053840ca19c86cdd0596cf1be060c5157d31407f2a4f9f350c78cc",
         "volatile.eth0.hwaddr": "00:16:3e:1c:94:38"
     },
-    "expanded_devices": {   // the result of expanding profiles and adding the container's local devices
+    "expanded_devices": {   // the result of expanding profiles and adding the instance's local devices
         "eth0": {
             "name": "eth0",
             "nictype": "bridged",
@@ -714,23 +714,23 @@ Output:
         }
     },
     "last_used_at": "2016-02-16T01:05:05Z",
-    "name": "my-container",
+    "name": "my-instance",
     "profiles": [
         "default"
     ],
-    "stateful": false,      // If true, indicates that the container has some stored state that can be restored on startup
+    "stateful": false,      // If true, indicates that the instance has some stored state that can be restored on startup
     "status": "Running",
     "status_code": 103
 }
 ```
 
 #### PUT (ETag supported)
- * Description: replaces container configuration or restore snapshot
+ * Description: replaces instance configuration or restore snapshot
  * Authentication: trusted
  * Operation: async
  * Return: background operation or standard error
 
-Input (update container configuration):
+Input (update instance configuration):
 
 ```json
 {
@@ -766,7 +766,7 @@ Input (restore snapshot):
 ```
 
 #### PATCH (ETag supported)
- * Description: update container configuration
+ * Description: update instance configuration
  * Introduced: with API extension `patch`
  * Authentication: trusted
  * Operation: sync
@@ -789,7 +789,7 @@ Input:
 ```
 
 #### POST (optional `?target=<member>`)
- * Description: used to rename/migrate the container
+ * Description: used to rename/migrate the instance
  * Authentication: trusted
  * Operation: async
  * Return: background operation or standard error
@@ -832,7 +832,7 @@ Output in metadata section (for migration):
 These are the secrets that should be passed to the create call.
 
 #### DELETE
- * Description: remove the container
+ * Description: remove the instance
  * Authentication: trusted
  * Operation: async
  * Return: background operation or standard error
@@ -846,15 +846,15 @@ Input (none at present):
 
 HTTP code for this should be 202 (Accepted).
 
-### `/1.0/containers/<name>/console`
+### `/1.0/instances/<name>/console`
 #### GET
- * Description: returns the contents of the container's console  log
+ * Description: returns the contents of the instance's console  log
  * Authentication: trusted
  * Operation: N/A
  * Return: the contents of the console log
 
 #### POST
- * Description: attach to a container's console devices
+ * Description: attach to an instance's console devices
  * Authentication: trusted
  * Operation: async
  * Return: standard error
@@ -884,12 +884,12 @@ Control (window size change):
 ```
 
 #### DELETE
- * Description: empty the container's console log
+ * Description: empty the instance's console log
  * Authentication: trusted
  * Operation: Sync
  * Return: empty response or standard error
 
-### `/1.0/containers/<name>/exec`
+### `/1.0/instances/<name>/exec`
 #### POST
  * Description: run a remote command
  * Authentication: trusted
@@ -985,8 +985,8 @@ Return (with interactive=false and record-output=true):
 ```json
 {
     "output": {
-        "1": "/1.0/containers/example/logs/exec_b0f737b4-2c8a-4edf-a7c1-4cc7e4e9e155.stdout",
-        "2": "/1.0/containers/example/logs/exec_b0f737b4-2c8a-4edf-a7c1-4cc7e4e9e155.stderr"
+        "1": "/1.0/instances/example/logs/exec_b0f737b4-2c8a-4edf-a7c1-4cc7e4e9e155.stdout",
+        "2": "/1.0/instances/example/logs/exec_b0f737b4-2c8a-4edf-a7c1-4cc7e4e9e155.stderr"
     },
     "return": 0
 }
@@ -1001,9 +1001,9 @@ operation's metadata:
 }
 ```
 
-### `/1.0/containers/<name>/files`
-#### GET (`?path=/path/inside/the/container`)
- * Description: download a file or directory listing from the container
+### `/1.0/instances/<name>/files`
+#### GET (`?path=/path/inside/the/instance`)
+ * Description: download a file or directory listing from the instance
  * Authentication: trusted
  * Operation: sync
  * Return: if the type of the file is a directory, the return is a sync
@@ -1020,8 +1020,8 @@ The following headers will be set (on top of standard size and mimetype headers)
 This is designed to be easily usable from the command line or even a web
 browser.
 
-#### POST (`?path=/path/inside/the/container`)
- * Description: upload a file to the container
+#### POST (`?path=/path/inside/the/instance`)
+ * Description: upload a file to the instance
  * Authentication: trusted
  * Operation: sync
  * Return: standard return value or standard error
@@ -1040,8 +1040,8 @@ The following headers may be set by the client:
 This is designed to be easily usable from the command line or even a web
 browser.
 
-#### DELETE (`?path=/path/inside/the/container`)
- * Description: delete a file in the container
+#### DELETE (`?path=/path/inside/the/instance`)
+ * Description: delete a file in the instance
  * Introduced: with API extension `file_delete`
  * Authentication: trusted
  * Operation: sync
@@ -1054,18 +1054,18 @@ Input (none at present):
 }
 ```
 
-### `/1.0/containers/<name>/snapshots`
+### `/1.0/instances/<name>/snapshots`
 #### GET
  * Description: List of snapshots
  * Authentication: trusted
  * Operation: sync
- * Return: list of URLs for snapshots for this container
+ * Return: list of URLs for snapshots for this instance
 
 Return value:
 
 ```json
 [
-    "/1.0/containers/blah/snapshots/snap0"
+    "/1.0/instances/blah/snapshots/snap0"
 ]
 ```
 
@@ -1084,7 +1084,7 @@ Input:
 }
 ```
 
-### `/1.0/containers/<name>/snapshots/<name>`
+### `/1.0/instances/<name>/snapshots/<name>`
 #### GET
  * Description: Snapshot information
  * Authentication: trusted
@@ -1206,7 +1206,7 @@ Input:
 
 HTTP code for this should be 202 (Accepted).
 
-### `/1.0/containers/<name>/state`
+### `/1.0/instances/<name>/state`
 #### GET
  * Description: current state
  * Authentication: trusted
@@ -1360,7 +1360,7 @@ Output:
 ```
 
 #### PUT
- * Description: change the container state
+ * Description: change the instance state
  * Authentication: trusted
  * Operation: async
  * Return: background operation or standard error
@@ -1371,15 +1371,15 @@ Input:
 {
     "action": "stop",       // State change action (stop, start, restart, freeze or unfreeze)
     "timeout": 30,          // A timeout after which the state change is considered as failed
-    "force": true,          // Force the state change (currently only valid for stop and restart where it means killing the container)
+    "force": true,          // Force the state change (currently only valid for stop and restart where it means killing the instance)
     "stateful": true        // Whether to store or restore runtime state before stopping or startiong (only valid for stop and start, defaults to false)
 }
 ```
 
-### `/1.0/containers/<name>/logs`
+### `/1.0/instances/<name>/logs`
 #### GET
- * Description: Returns a list of the log files available for this container.
-   Note that this works on containers that have been deleted (or were never
+ * Description: Returns a list of the log files available for this instance.
+   Note that this works on instances that have been deleted (or were never
    created) to enable people to get logs for failed creations.
  * Authentication: trusted
  * Operation: Sync
@@ -1389,13 +1389,13 @@ Return:
 
 ```json
 [
-    "/1.0/containers/blah/logs/forkstart.log",
-    "/1.0/containers/blah/logs/lxc.conf",
-    "/1.0/containers/blah/logs/lxc.log"
+    "/1.0/instances/blah/logs/forkstart.log",
+    "/1.0/instances/blah/logs/lxc.conf",
+    "/1.0/instances/blah/logs/lxc.log"
 ]
 ```
 
-### `/1.0/containers/<name>/logs/<logfile>`
+### `/1.0/instances/<name>/logs/<logfile>`
 #### GET
  * Description: returns the contents of a particular log file.
  * Authentication: trusted
@@ -1408,13 +1408,13 @@ Return:
  * Operation: Sync
  * Return: empty response or standard error
 
-### `/1.0/containers/<name>/metadata`
+### `/1.0/instances/<name>/metadata`
 #### GET
- * Description: Container metadata
+ * Description: Instance metadata
  * Introduced: with API extension `container_edit_metadata`
  * Authentication: trusted
  * Operation: Sync
- * Return: dict representing container metadata
+ * Return: dict representing instance metadata
 
 Return:
 
@@ -1443,7 +1443,7 @@ Return:
 ```
 
 #### PUT (ETag supported)
- * Description: Replaces container metadata
+ * Description: Replaces instance metadata
  * Introduced: with API extension `container_edit_metadata`
  * Authentication: trusted
  * Operation: sync
@@ -1475,13 +1475,13 @@ Input:
 }
 ```
 
-### `/1.0/containers/<name>/metadata/templates`
+### `/1.0/instances/<name>/metadata/templates`
 #### GET
- * Description: List container templates
+ * Description: List instance templates
  * Introduced: with API extension `container_edit_metadata`
  * Authentication: trusted
  * Operation: Sync
- * Return: a list with container template names
+ * Return: a list with instance template names
 
 Return:
 
@@ -1493,7 +1493,7 @@ Return:
 ```
 
 #### GET (`?path=<template>`)
- * Description: Content of a container template
+ * Description: Content of an instance template
  * Introduced: with API extension `container_edit_metadata`
  * Authentication: trusted
  * Operation: Sync
@@ -1522,26 +1522,26 @@ Input:
  * Standard http file upload.
 
 #### DELETE (`?path=<template>`)
- * Description: Delete a container template
+ * Description: Delete an instance template
  * Introduced: with API extension `container_edit_metadata`
  * Authentication: trusted
  * Operation: Sync
  * Return: standard return value or standard error
 
-### `/1.0/containers/<name>/backups`
+### `/1.0/instances/<name>/backups`
 #### GET
- * Description: List of backups for the container
+ * Description: List of backups for the instance
  * Introduced: with API extension `container_backup`
  * Authentication: trusted
  * Operation: sync
- * Return: a list of backups for the container
+ * Return: a list of backups for the instance
 
 Return value:
 
 ```json
 [
-    "/1.0/containers/c1/backups/c1/backup0",
-    "/1.0/containers/c1/backups/c1/backup1",
+    "/1.0/instances/c1/backups/c1/backup0",
+    "/1.0/instances/c1/backups/c1/backup1",
 ]
 ```
 
@@ -1558,12 +1558,12 @@ Input:
 {
     "name": "backupName",      // unique identifier for the backup
     "expiry": 3600,            // when to delete the backup automatically
-    "container_only": true,    // if True, snapshots aren't included
-    "optimized_storage": true  // if True, btrfs send or zfs send is used for container and snapshots
+    "instance_only": true,     // if True, snapshots aren't included
+    "optimized_storage": true  // if True, btrfs send or zfs send is used for instance and snapshots
 }
 ```
 
-### `/1.0/containers/<name>/backups/<name>`
+### `/1.0/instances/<name>/backups/<name>`
 #### GET
  * Description: Backup information
  * Introduced: with API extension `container_backup`
@@ -1578,7 +1578,7 @@ Output:
     "name": "backupName",
     "creation_date": "2018-04-23T12:16:09+02:00",
     "expiry_date": "2018-04-23T12:16:09+02:00",
-    "container_only": false,
+    "instance_only": false,
     "optimized_storage": false
 }
 ```
@@ -1605,7 +1605,7 @@ Input:
 }
 ```
 
-### `/1.0/containers/<name>/backups/<name>/export`
+### `/1.0/instances/<name>/backups/<name>/export`
 #### GET
  * Description: fetch the backup tarball
  * Introduced: with API extension `container_backup`
@@ -1640,7 +1640,7 @@ The notification types are:
 
  * operation (notification about creation, updates and termination of all background operations)
  * logging (every log entry from the server)
- * lifecycle (container lifecycle events)
+ * lifecycle (instance lifecycle events)
 
 This never returns. Each notification is sent as a separate JSON dict:
 
@@ -1660,7 +1660,7 @@ This never returns. Each notification is sent as a separate JSON dict:
         "context": {
             "ip": "@",
             "method": "GET",
-            "url": "/1.0/containers/xen/snapshots",
+            "url": "/1.0/instances/xen/snapshots",
         },
         "level": "info",
         "message": "handling"
@@ -1696,7 +1696,7 @@ Input (one of):
 
  * Standard http file upload
  * Source image dictionary (transfers a remote image)
- * Source container dictionary (makes an image out of a local container)
+ * Source instance dictionary (makes an image out of a local instance)
  * Remote image URL dictionary (downloads a remote image)
 
 In the http file upload case, The following headers may be set by the client:
@@ -1733,7 +1733,7 @@ In the source image case, the following dict must be used:
 }
 ```
 
-In the source container case, the following dict must be used:
+In the source instance case, the following dict must be used:
 
 ```js
 {
@@ -1748,7 +1748,7 @@ In the source container case, the following dict must be used:
          "description": "A description"}
     ],
     "source": {
-        "type": "container",        // One of "container" or "snapshot"
+        "type": "instance",        // One of "instance" or "snapshot"
         "name": "abc"
     }
 }
@@ -1884,7 +1884,7 @@ HTTP code for this should be 202 (Accepted).
  * Return: Raw file or standard error
 
 The secret string is required when an untrusted LXD is spawning a new
-container from a private image stored on a different LXD.
+instance from a private image stored on a different LXD.
 
 Rather than require a trust relationship between the two LXDs, the
 client will `POST` to `/1.0/images/<fingerprint>/export` to get a secret
@@ -2091,7 +2091,7 @@ Return:
     "managed": false,
     "type": "bridge",
     "used_by": [
-        "/1.0/containers/blah"
+        "/1.0/instances/blah"
     ]
 }
 ```
@@ -2295,7 +2295,7 @@ Input (similar but times out after 30s): ?timeout=30
  * Description: This connection is upgraded into a websocket connection
    speaking the protocol defined by the operation type. For example, in the
    case of an exec operation, the websocket is the bidirectional pipe for
-   stdin/stdout/stderr to flow to and from the process inside the container.
+   stdin/stdout/stderr to flow to and from the process inside the instance.
    In the case of migration, it will be the primary interface over which the
    migration information is communicated. The secret here is the one that was
    provided when the operation was created. Guests are allowed to connect
@@ -2366,7 +2366,7 @@ Output:
         }
     },
     "used_by": [
-        "/1.0/containers/blah"
+        "/1.0/instances/blah"
     ]
 }
 ```
@@ -2514,7 +2514,7 @@ Output:
     },
     "description": "Some description string",
     "used_by": [
-        "/1.0/containers/blah"
+        "/1.0/instances/blah"
     ]
 }
 ```
@@ -2660,26 +2660,26 @@ Return:
         "name": "default",
         "driver": "zfs",
         "used_by": [
-            "/1.0/containers/alp1",
-            "/1.0/containers/alp10",
-            "/1.0/containers/alp11",
-            "/1.0/containers/alp12",
-            "/1.0/containers/alp13",
-            "/1.0/containers/alp14",
-            "/1.0/containers/alp15",
-            "/1.0/containers/alp16",
-            "/1.0/containers/alp17",
-            "/1.0/containers/alp18",
-            "/1.0/containers/alp19",
-            "/1.0/containers/alp2",
-            "/1.0/containers/alp20",
-            "/1.0/containers/alp3",
-            "/1.0/containers/alp4",
-            "/1.0/containers/alp5",
-            "/1.0/containers/alp6",
-            "/1.0/containers/alp7",
-            "/1.0/containers/alp8",
-            "/1.0/containers/alp9",
+            "/1.0/instances/alp1",
+            "/1.0/instances/alp10",
+            "/1.0/instances/alp11",
+            "/1.0/instances/alp12",
+            "/1.0/instances/alp13",
+            "/1.0/instances/alp14",
+            "/1.0/instances/alp15",
+            "/1.0/instances/alp16",
+            "/1.0/instances/alp17",
+            "/1.0/instances/alp18",
+            "/1.0/instances/alp19",
+            "/1.0/instances/alp2",
+            "/1.0/instances/alp20",
+            "/1.0/instances/alp3",
+            "/1.0/instances/alp4",
+            "/1.0/instances/alp5",
+            "/1.0/instances/alp6",
+            "/1.0/instances/alp7",
+            "/1.0/instances/alp8",
+            "/1.0/instances/alp9",
             "/1.0/images/62e850a334bb9d99cac00b2e618e0291e5e7bb7db56c4246ecaf8e46fa0631a6"
         ],
         "config": {
diff --git a/doc/security.md b/doc/security.md
index a58e83a7d0..5a47a4edea 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -8,8 +8,8 @@ the network on a TLS socket.
 
 **WARNING**: Local access to LXD through the UNIX socket always grants
 full access to LXD. This includes the ability to attach any filesystem
-paths or devices to any container as well as tweaking all security
-features on containers. You should only give such access to someone who
+paths or devices to any instance as well as tweaking all security
+features on instances. You should only give such access to someone who
 you'd trust with root access to your system.
 
 The remote API uses either TLS client certificates or Candid based
@@ -48,9 +48,9 @@ The meaning of the roles when applied to a project is as follow:
 
  - auditor: Read-only access to the project
  - user: Ability to do normal lifecycle actions (start, stop, ...),
-   execute commands in the containers, attach to console, manage snapshots, ...
+   execute commands in the instances, attach to console, manage snapshots, ...
  - operator: All of the above + the ability to create, re-configure and
-   delete containers and images
+   delete instances and images
  - admin: All of the above + the ability to reconfigure the project itself
 
 **WARNING**: Of those roles, only `auditor` and `user` are currently
diff --git a/doc/storage.md b/doc/storage.md
index 5a6782ad8a..7aac0ab187 100644
--- a/doc/storage.md
+++ b/doc/storage.md
@@ -20,7 +20,7 @@ ceph.user.name                  | string    | ceph driver
 cephfs.cluster\_name            | string    | cephfs driver                     | ceph                       | storage\_driver\_cephfs            | Name of the ceph cluster in which to create new storage pools.
 cephfs.path                     | string    | cephfs driver                     | /                          | storage\_driver\_cephfs            | The base path for the CEPHFS mount
 cephfs.user.name                | string    | cephfs driver                     | admin                      | storage\_driver\_cephfs            | The ceph user to use when creating storage pools and volumes.
-lvm.thinpool\_name              | string    | lvm driver                        | LXDThinPool                | storage                            | Thin pool where images and containers are created.
+lvm.thinpool\_name              | string    | lvm driver                        | LXDThinPool                | storage                            | Thin pool where volumes are created.
 lvm.use\_thinpool               | bool      | lvm driver                        | true                       | storage\_lvm\_use\_thinpool        | Whether the storage pool uses a thinpool for logical volumes.
 lvm.vg\_name                    | string    | lvm driver                        | name of the pool           | storage                            | Name of the volume group to create.
 rsync.bwlimit                   | string    | -                                 | 0 (no limit)               | storage\_rsync\_bwlimit            | Specifies the upper limit to be placed on the socket I/O whenever rsync has to be used to transfer storage entities.
@@ -46,7 +46,7 @@ Key                     | Type      | Condition                 | Default
 size                    | string    | appropriate driver        | same as volume.size                   | storage           | Size of the storage volume
 block.filesystem        | string    | block based driver        | same as volume.block.filesystem       | storage           | Filesystem of the storage volume
 block.mount\_options    | string    | block based driver        | same as volume.block.mount\_options   | storage           | Mount options for block devices
-security.shifted        | bool      | custom volume             | false                                 | storage\_shifted  | Enable id shifting overlay (allows attach by multiple isolated containers)
+security.shifted        | bool      | custom volume             | false                                 | storage\_shifted  | Enable id shifting overlay (allows attach by multiple isolated instances)
 security.unmapped       | bool      | custom volume             | false                                 | storage\_unmapped | Disable id mapping for the volume
 zfs.remove\_snapshots   | string    | zfs driver                | same as volume.zfs.remove\_snapshots  | storage           | Remove snapshots as needed
 zfs.use\_refquota       | string    | zfs driver                | same as volume.zfs.zfs\_requota       | storage           | Use refquota instead of quota for space
@@ -59,16 +59,16 @@ lxc storage volume set [<remote>:]<pool> <volume> <key> <value>
 
 # Storage Backends and supported functions
 ## Feature comparison
-LXD supports using ZFS, btrfs, LVM or just plain directories for storage of images and containers.  
+LXD supports using ZFS, btrfs, LVM or just plain directories for storage of images, instances and custom volumes.  
 Where possible, LXD tries to use the advanced features of each system to optimize operations.
 
 Feature                                     | Directory | Btrfs | LVM   | ZFS  | CEPH
 :---                                        | :---      | :---  | :---  | :--- | :---
 Optimized image storage                     | no        | yes   | yes   | yes  | yes
-Optimized container creation                | no        | yes   | yes   | yes  | yes
+Optimized instance creation                 | no        | yes   | yes   | yes  | yes
 Optimized snapshot creation                 | no        | yes   | yes   | yes  | yes
 Optimized image transfer                    | no        | yes   | no    | yes  | yes
-Optimized container transfer                | no        | yes   | no    | yes  | yes
+Optimized instance transfer                 | no        | yes   | no    | yes  | yes
 Copy on write                               | no        | yes   | yes   | yes  | yes
 Block based                                 | no        | no    | yes   | no   | yes
 Instant cloning                             | no        | yes   | yes   | yes  | yes
@@ -85,7 +85,7 @@ While LXD will let you create loop based storage, this isn't recommended for pro
 
 Similarly, the directory backend is to be considered as a last resort option.  
 It does support all main LXD features, but is terribly slow and inefficient as it can't perform  
-instant copies or snapshots and so needs to copy the entirety of the container's filesystem every time.
+instant copies or snapshots and so needs to copy the entirety of the instance's storage every time.
 
 ## Security Considerations
 
@@ -102,15 +102,15 @@ mount options.
 
 ## Optimized image storage
 All backends but the directory backend have some kind of optimized image storage format.  
-This is used by LXD to make container creation near instantaneous by simply cloning a pre-made  
+This is used by LXD to make instance creation near instantaneous by simply cloning a pre-made  
 image volume rather than unpack the image tarball from scratch.
 
 As it would be wasteful to prepare such a volume on a storage pool that may never be used with that image,  
-the volume is generated on demand, causing the first container to take longer to create than subsequent ones.
+the volume is generated on demand, causing the first instance to take longer to create than subsequent ones.
 
-## Optimized container transfer
+## Optimized instance transfer
 ZFS, btrfs and CEPH RBD have an internal send/receive mechanisms which allow for optimized volume transfer.  
-LXD uses those features to transfer containers and snapshots between servers.
+LXD uses those features to transfer instances and snapshots between servers.
 
 When such capabilities aren't available, either because the storage driver doesn't support it  
 or because the storage backend of the source and target servers differ,  
@@ -122,7 +122,7 @@ value.
 
 ## Default storage pool
 There is no concept of a default storage pool in LXD.  
-Instead, the pool to use for the container's root is treated as just another "disk" device in LXD.
+Instead, the pool to use for the instance's root is treated as just another "disk" device in LXD.
 
 The device entry looks like:
 
@@ -133,7 +133,7 @@ The device entry looks like:
     pool: default
 ```
 
-And it can be directly set on a container ("-s" option to "lxc launch" and "lxc init")  
+And it can be directly set on an instance ("-s" option to "lxc launch" and "lxc init")  
 or it can be set through LXD profiles.
 
 That latter option is what the default LXD setup (through "lxd init") will do for you.  
@@ -144,8 +144,8 @@ lxc profile device add default root disk path=/ pool=default
 ```
 
 ## I/O limits
-I/O limits in IOp/s or MB/s can be set on storage devices when attached to a
-container (see [Containers](containers.md)).
+I/O limits in IOp/s or MB/s can be set on storage devices when attached to an
+instance (see [Instances](instances.md)).
 
 Those are applied through the Linux `blkio` cgroup controller which makes it possible  
 to restrict I/O at the disk level (but nothing finer grained than that).
@@ -154,7 +154,7 @@ Because those apply to a whole physical disk rather than a partition or path, th
 
  - Limits will not apply to filesystems that are backed by virtual devices (e.g. device mapper).
  - If a filesystem is backed by multiple block devices, each device will get the same limit.
- - If the container is passed two disk devices that are each backed by the same disk,  
+ - If the instance is passed two disk devices that are each backed by the same disk,  
    the limits of the two devices will be averaged.
 
 It's also worth noting that all I/O limits only apply to actual block device access,  
@@ -166,7 +166,7 @@ This also means that access to cached data will not be affected by the limit.
 
  - While this backend is fully functional, it's also much slower than
    all the others due to it having to unpack images or do instant copies of
-   containers, snapshots and images.
+   instances, snapshots and images.
  - Quotas are supported with the directory backend when running on
    either ext4 or XFS with project quotas enabled at the filesystem level.
 
@@ -186,7 +186,7 @@ lxc storage create pool2 dir source=/data/lxd
 
 ### CEPH
 
-- Uses RBD images for images, then snapshots and clones to create containers
+- Uses RBD images for images, then snapshots and clones to create instances
   and snapshots.
 - Due to the way copy-on-write works in RBD, parent filesystems can't be
   removed until all children are gone. As a result, LXD will automatically
@@ -197,7 +197,7 @@ lxc storage create pool2 dir source=/data/lxd
   a LXD OSD storage pool since LXD might delete them.
 - Note that sharing the same osd storage pool between multiple LXD instances is
   not supported. LXD only allows sharing of an OSD storage pool between
-  multiple LXD instances only for backup purposes of existing containers via
+  multiple LXD instances only for backup purposes of existing instances via
   `lxd import`. In line with this, LXD requires the "ceph.osd.force_reuse"
   property to be set to true. If not set, LXD will refuse to reuse an osd
   storage pool it detected as being in use by another LXD instance.
@@ -240,7 +240,7 @@ lxc storage create pool1 ceph source=my-already-existing-osd
 
 ### Btrfs
 
- - Uses a subvolume per container, image and snapshot, creating btrfs snapshots when creating a new object.
+ - Uses a subvolume per instance, image and snapshot, creating btrfs snapshots when creating a new object.
  - btrfs can be used as a storage backend inside a container (nesting), so long as the parent container is itself on btrfs. (But see notes about btrfs quota via qgroups.)
  - btrfs supports storage quotas via qgroups. While btrfs qgroups are
    hierarchical, new subvolumes will not automatically be added to the qgroups
@@ -280,19 +280,19 @@ sudo btrfs filesystem resize max /var/lib/lxd/storage-pools/<POOL>/
 
 ### LVM
 
- - Uses LVs for images, then LV snapshots for containers and container snapshots.
+ - Uses LVs for images, then LV snapshots for instances and instance snapshots.
  - The filesystem used for the LVs is ext4 (can be configured to use xfs instead).
  - By default, all LVM storage pools use an LVM thinpool in which logical
-   volumes for all LXD storage entities (images, containers, etc.) are created.
+   volumes for all LXD storage entities (images, instances, etc.) are created.
    This behavior can be changed by setting "lvm.use\_thinpool" to "false". In
-   this case, LXD will use normal logical volumes for all non-container
-   snapshot storage entities (images, containers etc.). This means most storage
+   this case, LXD will use normal logical volumes for all non-instance
+   snapshot storage entities (images, instances, etc.). This means most storage
    operations will need to fallback to rsyncing since non-thinpool logical
    volumes do not support snapshots of snapshots. Note that this entails
    serious performance impacts for the LVM driver causing it to be close to the
    fallback DIR driver both in speed and storage usage. This option should only
    be chosen if the use-case renders it necessary.
- - For environments with high container turn over (e.g continuous integration)
+ - For environments with high instance turn over (e.g continuous integration)
    it may be important to tweak the archival `retain_min` and `retain_days`
    settings in `/etc/lvm/lvm.conf` to avoid slowdowns when interacting with
    LXD.
@@ -332,7 +332,7 @@ lxc storage create pool1 lvm source=/dev/sdX lvm.vg_name=my-pool
 ### ZFS
 
  - When LXD creates a ZFS pool, compression is enabled by default.
- - Uses ZFS filesystems for images, then snapshots and clones to create containers and snapshots.
+ - Uses ZFS filesystems for images, then snapshots and clones to create instances and snapshots.
  - Due to the way copy-on-write works in ZFS, parent filesystems can't
    be removed until all children are gone. As a result, LXD will
    automatically rename any removed but still referenced object to a random
@@ -341,17 +341,17 @@ lxc storage create pool1 lvm source=/dev/sdX lvm.vg_name=my-pool
  - ZFS as it is today doesn't support delegating part of a pool to a
    container user. Upstream is actively working on this.
  - ZFS doesn't support restoring from snapshots other than the latest
-   one. You can however create new containers from older snapshots which
+   one. You can however create new instances from older snapshots which
    makes it possible to confirm the snapshots is indeed what you want to
    restore before you remove the newer snapshots.
 
-   Also note that container copies use ZFS snapshots, so you also cannot
-   restore a container to a snapshot taken before the last copy without
-   having to also delete container copies.
+   Also note that instance copies use ZFS snapshots, so you also cannot
+   restore an instance to a snapshot taken before the last copy without
+   having to also delete instance copies.
 
-   Copying the wanted snapshot into a new container and then deleting
-   the old container does however work, at the cost of losing any other
-   snapshot the container may have had.
+   Copying the wanted snapshot into a new instance and then deleting
+   the old instance does however work, at the cost of losing any other
+   snapshot the instance may have had.
 
  - Note that LXD will assume it has full control over the ZFS pool or dataset.
    It is recommended to not maintain any non-LXD owned filesystem entities in

From 01a8723b20cbca218f16b776ee1369a5e256550c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:16:50 -0500
Subject: [PATCH 6/7] doc: Bump releases in examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/clustering.md       | 14 +++++++-------
 doc/image-handling.md   |  4 ++--
 doc/index.md            |  2 +-
 doc/instances.md        |  2 +-
 doc/production-setup.md |  2 +-
 doc/rest-api.md         | 20 ++++++++++----------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/clustering.md b/doc/clustering.md
index 8ae120e9d9..9d5763394a 100644
--- a/doc/clustering.md
+++ b/doc/clustering.md
@@ -226,10 +226,10 @@ You can launch an instance on any node in the cluster from any node in
 the cluster. For example, from node1:
 
 ```bash
-lxc launch --target node2 ubuntu:16.04 xenial
+lxc launch --target node2 ubuntu:18.04 bionic
 ```
 
-will launch an Ubuntu 16.04 container on node2.
+will launch an Ubuntu 18.04 container on node2.
 
 When you launch an instance without defining a target, the instance will be 
 launched on the server which has the lowest number of instances.
@@ -247,10 +247,10 @@ After an instance is launched, you can operate it from any node. For
 example, from node1:
 
 ```bash
-lxc exec xenial ls /
-lxc stop xenial
-lxc delete xenial
-lxc pull file xenial/etc/hosts .
+lxc exec bionic ls /
+lxc stop bionic
+lxc delete bionic
+lxc pull file bionic/etc/hosts .
 ```
 
 ## Images
@@ -274,7 +274,7 @@ lxc config set cluster.images_minimal_replica 1
 
 As mentioned above, all nodes must have identical storage pools. The
 only difference between pools on different nodes might be their
-`source`, `size` or `zfs.pool_name` configuration keys.
+`source`, `size` or `zfs.pool\_name` configuration keys.
 
 To create a new storage pool, you first have to define it across all
 nodes, for example:
diff --git a/doc/image-handling.md b/doc/image-handling.md
index 737c4440c8..cf25fb02a9 100644
--- a/doc/image-handling.md
+++ b/doc/image-handling.md
@@ -111,9 +111,9 @@ LXD, at the moment, this contains:
 architecture: x86_64
 creation_date: 1424284563
 properties:
-  description: Ubuntu 14.04 LTS Intel 64bit
+  description: Ubuntu 18.04 LTS Intel 64bit
   os: Ubuntu
-  release: trusty 14.04
+  release: bionic 18.04
 templates:
   /etc/hosts:
     when:
diff --git a/doc/index.md b/doc/index.md
index 3ae2553695..d4ba7b809a 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -363,7 +363,7 @@ The `hello-ubuntu.json` file referenced above could contain something like:
         "mode":"pull",
         "protocol":"simplestreams",
         "server":"https://cloud-images.ubuntu.com/releases",
-        "alias":"14.04"
+        "alias":"18.04"
     }
 }
 ```
diff --git a/doc/instances.md b/doc/instances.md
index a080576ac0..e845ae0b92 100644
--- a/doc/instances.md
+++ b/doc/instances.md
@@ -729,7 +729,7 @@ For example, those 3 are equivalent:
 On the command line, this is passed like this:
 
 ```bash
-lxc launch ubuntu:16.04 my-instance -t t2.micro
+lxc launch ubuntu:18.04 my-instance -t t2.micro
 ```
 
 The list of supported clouds and instance types can be found here:
diff --git a/doc/production-setup.md b/doc/production-setup.md
index d7f26a47e9..d785334681 100644
--- a/doc/production-setup.md
+++ b/doc/production-setup.md
@@ -4,7 +4,7 @@ So you've made it past trying out [LXD live online](https://linuxcontainers.org/
 or on a server scavenged from random parts. You like what you see,
 and now you want to try doing some serious work with LXD.
 
-With the vanilla installation of Ubuntu Server 16.04, some modifications
+With the vanilla installation of Ubuntu Server 18.04, some modifications
 to the server configuration will be needed, to avoid common pitfalls when
 using containers that require tens of thousands of file operations.
 
diff --git a/doc/rest-api.md b/doc/rest-api.md
index fd31d117ca..ee26a3803f 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -523,7 +523,7 @@ Input (instance based on most recent match based on image properties):
     "source": {"type": "image",                                         // Can be: "image", "migration", "copy" or "none"
                "properties": {                                          // Properties
                     "os": "ubuntu",
-                    "release": "14.04",
+                    "release": "18.04",
                     "architecture": "x86_64"
                 }},
 }
@@ -1791,7 +1791,7 @@ Output:
 {
     "aliases": [
         {
-            "name": "trusty",
+            "name": "bionic",
             "description": "",
         }
     ],
@@ -1799,18 +1799,18 @@ Output:
     "auto_update": true,
     "cached": false,
     "fingerprint": "54c8caac1f61901ed86c68f24af5f5d3672bdc62c71d04f06df3a59e95684473",
-    "filename": "ubuntu-trusty-14.04-amd64-server-20160201.tar.xz",
+    "filename": "ubuntu-bionic-18.04-amd64-server-20180201.tar.xz",
     "properties": {
         "architecture": "x86_64",
-        "description": "Ubuntu 14.04 LTS server (20160201)",
+        "description": "Ubuntu 18.04 LTS server (20180601)",
         "os": "ubuntu",
-        "release": "trusty"
+        "release": "bionic"
     },
     "update_source": {
         "server": "https://10.1.2.4:8443",
         "protocol": "lxd",
         "certificate": "PEM certificate",
-        "alias": "ubuntu/trusty/amd64"
+        "alias": "ubuntu/bionic/amd64"
     },
     "public": false,
     "size": 123792592,
@@ -1834,9 +1834,9 @@ Input:
     "auto_update": true,
     "properties": {
         "architecture": "x86_64",
-        "description": "Ubuntu 14.04 LTS server (20160201)",
+        "description": "Ubuntu 18.04 LTS server (20180601)",
         "os": "ubuntu",
-        "release": "trusty"
+        "release": "bionic"
     },
     "public": true,
 }
@@ -1855,7 +1855,7 @@ Input:
 {
     "properties": {
         "os": "ubuntu",
-        "release": "trusty"
+        "release": "bionic"
     },
     "public": true,
 }
@@ -1941,7 +1941,7 @@ Return:
 ```json
 [
     "/1.0/images/aliases/sl6",
-    "/1.0/images/aliases/trusty",
+    "/1.0/images/aliases/bionic",
     "/1.0/images/aliases/xenial"
 ]
 ```

From f99e6ec33f064cf5b79d84ef091abdc3f576ba3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 Jan 2020 15:36:20 -0500
Subject: [PATCH 7/7] doc/rest-api: Cover the three instance endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/rest-api.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/rest-api.md b/doc/rest-api.md
index ee26a3803f..81012c0b3b 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -187,6 +187,19 @@ specifying the property that you want to change. To unset a key, setting
 it to empty will usually do the trick, but there are cases where PATCH
 won't work and PUT needs to be used instead.
 
+## instances, containers and virtual-machines
+This documentation will always show paths such as `/1.0/instances/...`.
+Those are fairly new, introduced with LXD 3.19 when virtual-machine support.
+
+Older releases that only supported containers will instead use the exact same API at `/1.0/containers/...`.
+
+For backward compatibility reasons, LXD does still expose and support
+that `/1.0/containers` API, though for the sake of brevity, we decided
+not to double-document everything below.
+
+An additional endpoint at `/1.0/virtual-machines` is also present and
+much like `/1.0/containers` will only show you instances of that type.
+
 ## API structure
  * [`/`](#)
    * [`/1.0`](#10)


More information about the lxc-devel mailing list