diff --git a/doc/source/admin/hw-machine-type.rst b/doc/source/admin/hw-machine-type.rst
index abbed019701c..7b6af4e410ee 100644
--- a/doc/source/admin/hw-machine-type.rst
+++ b/doc/source/admin/hw-machine-type.rst
@@ -165,4 +165,5 @@ To update the stored image properties of an instance:
 
 .. code-block:: shell
 
-    $ nova-manage image_property set $instance_uuid --property $property
+    $ nova-manage image_property set \
+        $instance_uuid --property $property_name=$property_value
diff --git a/doc/source/cli/nova-manage.rst b/doc/source/cli/nova-manage.rst
index 9d58e7ebf51b..8aacf965b4c7 100644
--- a/doc/source/cli/nova-manage.rst
+++ b/doc/source/cli/nova-manage.rst
@@ -521,6 +521,7 @@ This command should be run before ``nova-manage db sync``.
 
 .. _man-page-cells-v2:
 
+
 Cells v2 Commands
 =================
 
@@ -1144,6 +1145,7 @@ Delete a host by the given host name and the given cell UUID.
    * - 4
      - The host with the specified name has instances (host not empty).
 
+
 Placement Commands
 ==================
 
@@ -1531,6 +1533,7 @@ command.
    * - 6
      - Instance is not attached to volume
 
+
 Libvirt Commands
 ================
 
@@ -1668,6 +1671,7 @@ within an environment.
    * - 3
      - Instances found without ``hw_machine_type`` set
 
+
 Image Property Commands
 =======================
 
@@ -1754,12 +1758,14 @@ for example.
    * - 5
      - The provided image property value is invalid
 
+
 See Also
 ========
 
 :doc:`nova-policy(1) <nova-policy>`,
 :doc:`nova-status(1) <nova-status>`
 
+
 Bugs
 ====
 
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index f704a42698e0..5ee30ccff53c 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -3192,7 +3192,7 @@ class VolumeAttachmentCommands(object):
             return 1
 
 
-class ImagePropertyCommands():
+class ImagePropertyCommands:
 
     @action_description(_("Show the value of an instance image property."))
     @args(