deploy: Note that some of the extensions listed live in definitions.git

The user should be aware of this because if they aren't building
baserock:baserock/definitions or a repo forked from it, those extensions
won't be available.

Also fix some long lines that I seem to have failed to commit already.

4 files changed, 18 insertions, 14 deletions

diff --git a/morphlib/exts/openstack.write.help b/morphlib/exts/openstack.write.help
index 579512f5..75ad9f0c 100644
--- a/morphlib/exts/openstack.write.help
+++ b/morphlib/exts/openstack.write.help
@@ -16,15 +16,15 @@ help: |
         where
 
         * HOST is the host running OpenStack
-        * PORT is the port which is using OpenStack for authentifications.
-        * VERSION is the authentification version of OpenStack (Only v2.0
+        * PORT is the port which is using OpenStack for authentications.
+        * VERSION is the authentication version of OpenStack (Only v2.0
           supported)
 
     * OPENSTACK_USER=username: the username to use in the `--os-username`
       argument to `glance`.
 
-    * OPENSTACK_TENANT=tenant: the project name to use in the `--os-tenant-name`
-      argument to `glance`.
+    * OPENSTACK_TENANT=tenant: the project name to use in the
+      `--os-tenant-name` argument to `glance`.
 
     * OPENSTACK_IMAGENAME=imagename: the name of the image to use in the
       `--name` argument to `glance`.
diff --git a/morphlib/exts/rawdisk.write.help b/morphlib/exts/rawdisk.write.help
index f225276d..81f35024 100644
--- a/morphlib/exts/rawdisk.write.help
+++ b/morphlib/exts/rawdisk.write.help
@@ -12,14 +12,15 @@ help: |
     create virtual machines with KVM / libvirt, OpenStack or, after converting
     it to VDI format, VirtualBox.
 
-    `morph deploy` will fail if the file specified by `location` already exists.
+    `morph deploy` will fail if the file specified by `location` already
+    exists.
 
-    If used in `morph upgrade`, the rootfs produced by 'morph build' is added to
-    the existing raw disk image or device as an additional btrfs sub-volume.
+    If used in `morph upgrade`, the rootfs produced by 'morph build' is added
+    to the existing raw disk image or device as an additional btrfs sub-volume.
     `morph upgrade` will fail if the file specified by `location` does not
-    exist, or is not a Baserock raw disk image. (Most users are unlikely to need
-    or use this functionality: it is useful mainly for developers working on the
-    Baserock tools.)
+    exist, or is not a Baserock raw disk image. (Most users are unlikely to
+    need or use this functionality: it is useful mainly for developers working
+    on the Baserock tools.)
 
     Parameters:
 
diff --git a/morphlib/exts/ssh-rsync.write.help b/morphlib/exts/ssh-rsync.write.help
index 4ef666e8..d03508c0 100644
--- a/morphlib/exts/ssh-rsync.write.help
+++ b/morphlib/exts/ssh-rsync.write.help
@@ -23,8 +23,8 @@ help: |
     Parameters:
 
     * location: the 'user@hostname' string that will be used by ssh and rsync.
-      'user' will always be `root` and `hostname` the hostname or address of the
-      system being upgraded.
+      'user' will always be `root` and `hostname` the hostname or address of
+      the system being upgraded.
 
     * VERSION_LABEL=label - **(MANDATORY)** should contain only alpha-numeric
       characters and the '-' (hyphen) character.
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index f6bee95c..0121c110 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -149,10 +149,13 @@ class DeployPlugin(cliapp.Plugin):
           `system-version-manager` from the tbdiff chunk
 
         * `initramfs`, where Morph turns the system into an initramfs image,
-          suitable for being used as the early userland environment for a system
-          to be able to locate more complicated storage for its root
+          suitable for being used as the early userland environment for a
+          system to be able to locate more complicated storage for its root
           file-system, or on its own for diskless deployments.
 
+        There are additional extensions that currently live in the Baserock
+        definitions repo (baserock:baserock/definitions). These include:
+
         * `image-package` where Morph creates a tarball that includes scripts
           that can be used to make disk images outside of a Baserock
           environment. The example in definitions.git will create scripts for