diff --git a/doc/image-guide/source/convert-images.rst b/doc/image-guide/source/convert-images.rst
index 9ff8cb4058..46d2a20484 100644
--- a/doc/image-guide/source/convert-images.rst
+++ b/doc/image-guide/source/convert-images.rst
@@ -58,12 +58,12 @@ Run the following command to convert a vmdk image file to a qcow2 image file.
    Otherwise, you will get a blue screen when launching the image
    due to lack of the virtio driver.
    Another option is to set the image properties as below when you
-   update the image in glance to avoid this issue, but it will
-   reduce performance significantly.
+   update the image in the Image service to avoid this issue,
+   but it will reduce performance significantly.
 
    .. code-block:: console
 
-      $ glance image-update --property hw_disk_bus='ide' image_id
+      $ openstack image set --property hw_disk_bus='ide' image_name_or_id
 
 VBoxManage: VDI (VirtualBox) to raw
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/image-guide/source/image-metadata.rst b/doc/image-guide/source/image-metadata.rst
index 4dfb6eb84c..d1afac956c 100644
--- a/doc/image-guide/source/image-metadata.rst
+++ b/doc/image-guide/source/image-metadata.rst
@@ -19,13 +19,13 @@ hosts that satisfy that property.
 
 You can add metadata to Image service images by using the
 ``--property key=value`` parameter with the
-:command:`glance image-create` or :command:`glance image-update`
+:command:`openstack image create` or :command:`openstack image set`
 command. More than one property can be specified. For example:
 
 .. code-block:: console
 
-   $ glance image-update img-uuid --property architecture=arm \
-     --property hypervisor_type=qemu
+   $ openstack image set --property architecture=arm \
+     --property hypervisor_type=qemu image_name_or_id
 
 Common image properties are also specified in the
 ``/etc/glance/schema-image.json`` file.
@@ -34,49 +34,33 @@ For a complete list of valid property keys and values, refer to the
 <http://docs.openstack.org/cli-reference/glance.html#image-service-property-keys>`_.
 
 All associated properties for an image can be displayed using the
-:command:`glance image-show` command. For example:
+:command:`openstack image show` command. For example:
 
 .. code-block:: console
 
-   $ glance image-show myCirrosImage
-   +---------------------------------------+--------------------------------------+
-   | Property                              | Value                                |
-   +---------------------------------------+--------------------------------------+
-   | Property 'base_image_ref'             | 397e713c-b95b-4186-ad46-6126863ea0a9 |
-   | Property 'image_location'             | snapshot                             |
-   | Property 'image_state'                | available                            |
-   | Property 'image_type'                 | snapshot                             |
-   | Property 'instance_type_ephemeral_gb' | 0                                    |
-   | Property 'instance_type_flavorid'     | 2                                    |
-   | Property 'instance_type_id'           | 5                                    |
-   | Property 'instance_type_memory_mb'    | 2048                                 |
-   | Property 'instance_type_name'         | m1.small                             |
-   | Property 'instance_type_root_gb'      | 20                                   |
-   | Property 'instance_type_rxtx_factor'  | 1                                    |
-   | Property 'instance_type_swap'         | 0                                    |
-   | Property 'instance_type_vcpu_weight'  | None                                 |
-   | Property 'instance_type_vcpus'        | 1                                    |
-   | Property 'instance_uuid'              | 84c6e57d-a6b1-44b6-81eb-fcb36afd31b5 |
-   | Property 'kernel_id'                  | df430cc2-3406-4061-b635-a51c16e488ac |
-   | Property 'owner_id'                   | 66265572db174a7aa66eba661f58eb9e     |
-   | Property 'ramdisk_id'                 | 3cf852bd-2332-48f4-9ae4-7d926d50945e |
-   | Property 'user_id'                    | 376744b5910b4b4da7d8e6cb483b06a8     |
-   | checksum                              | 8e4838effa1969ad591655d6485c7ba8     |
-   | container_format                      | ami                                  |
-   | created_at                            | 2013-07-22T19:45:58                  |
-   | deleted                               | False                                |
-   | disk_format                           | ami                                  |
-   | id                                    | 7e5142af-1253-4634-bcc6-89482c5f2e8a |
-   | is_public                             | False                                |
-   | min_disk                              | 0                                    |
-   | min_ram                               | 0                                    |
-   | name                                  | myCirrosImage                        |
-   | owner                                 | 66265572db174a7aa66eba661f58eb9e     |
-   | protected                             | False                                |
-   | size                                  | 14221312                             |
-   | status                                | active                               |
-   | updated_at                            | 2013-07-22T19:46:42                  |
-   +---------------------------------------+--------------------------------------+
+   $ openstack image show cirros
+   +------------------+------------------------------------------------------+
+   | Field            | Value                                                |
+   +------------------+------------------------------------------------------+
+   | checksum         | ee1eca47dc88f4879d8a229cc70a07c6                     |
+   | container_format | bare                                                 |
+   | created_at       | 2016-04-15T13:57:38Z                                 |
+   | disk_format      | qcow2                                                |
+   | file             | /v2/images/55f0907f-70a5-4376-a346-432e4ec509ed/file |
+   | id               | 55f0907f-70a5-4376-a346-432e4ec509ed                 |
+   | min_disk         | 0                                                    |
+   | min_ram          | 0                                                    |
+   | name             | cirros                                               |
+   | owner            | f9574e69042645d6b5539035cb8c00bf                     |
+   | protected        | False                                                |
+   | schema           | /v2/schemas/image                                    |
+   | size             | 13287936                                             |
+   | status           | active                                               |
+   | tags             |                                                      |
+   | updated_at       | 2016-04-15T13:57:57Z                                 |
+   | virtual_size     | None                                                 |
+   | visibility       | public                                               |
+   +------------------+------------------------------------------------------+
 
 .. note::
 
diff --git a/doc/image-guide/source/windows-image.rst b/doc/image-guide/source/windows-image.rst
index 496100a296..c030d9d88a 100644
--- a/doc/image-guide/source/windows-image.rst
+++ b/doc/image-guide/source/windows-image.rst
@@ -90,5 +90,4 @@ Your image is ready to upload to the Image service:
 
 .. code-block:: console
 
-   $ glance image-create --name WS2012 --disk-format qcow2 \
-     --container-format bare --file ws2012.qcow2
+   $ openstack image create --disk-format qcow2 --file ws2012.qcow2 WS2012