@@ -10,18 +10,22 @@ server image create
 
 Create a new disk image from a running server
 
+.. program:: server image create
 .. code:: bash
 
     os server image create
         [--name <image-name>]
         [--wait]
         <server>
 
-:option:`--name` <image-name>
+.. option:: --name <image-name>
+
     Name of new image (default is server name)
 
-:option:`--wait`
+.. option:: --wait
+
     Wait for image create to complete
 
-:option:`<server>`
+.. describe:: <server>
+
     Server (name or ID)