From 488dcaaa06a2df4dd4a7ea482756c4b1a6d85a08 Mon Sep 17 00:00:00 2001 From: guoshan Date: Tue, 22 Dec 2015 11:19:12 +0800 Subject: [PATCH] Replace "Terminate Instance" with "Delete Instance" In Mitaka, Horizon team change the term "Terminate Instance" with "Delete Instance". This bug was created since a commit was marked with DOCIMPACT Change-Id: Ib3516e6787dadbb971384c63733ff0d2f3e166a9 Partial-Bug: #1502773 --- doc/openstack-ops/ch_ops_user_facing.xml | 11 ++++++++--- doc/ops-guide/source/ops_user_facing_operations.rst | 12 +++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/openstack-ops/ch_ops_user_facing.xml b/doc/openstack-ops/ch_ops_user_facing.xml index 0d67c573..a57014dc 100644 --- a/doc/openstack-ops/ch_ops_user_facing.xml +++ b/doc/openstack-ops/ch_ops_user_facing.xml @@ -1933,9 +1933,14 @@ Optional snapshot description. (Default=None) but this is the base command that later details are layered upon. To delete instances from the dashboard, select the - Terminate instance action next to the instance on - the Instances page. From the command line, do - this: + Delete instance action next to the instance on + the Instances page. + + + In releases prior to Mitaka, select the equivalent Terminate instance action. + . + + From the command line, do this: $ nova delete <instance-uuid> diff --git a/doc/ops-guide/source/ops_user_facing_operations.rst b/doc/ops-guide/source/ops_user_facing_operations.rst index 4c7c2a0b..0f7945ee 100644 --- a/doc/ops-guide/source/ops_user_facing_operations.rst +++ b/doc/ops-guide/source/ops_user_facing_operations.rst @@ -1674,9 +1674,15 @@ read the rest of this section before trying to start an instance, but this is the base command that later details are layered upon. To delete instances from the dashboard, select the -:guilabel:`Terminate instance action` next to the -:guilabel:`instance` on the **Instances** page. From the -command line, do this: +:guilabel:`Delete instance action` next to the +:guilabel:`instance` on the **Instances** page. + +.. note:: + + In releases prior to Mitaka, select the equivalent :guilabel:`Terminate + instance` action. + +From the command line, do this: .. code-block:: console