openstack
/
operations-guide
Code Issues Proposed changes

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
This commit is contained in:
guoshan 2015-12-22 11:19:12 +08:00
parent c9ca45fe85
commit 488dcaaa06
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/openstack-ops/ch_ops_user_facing.xml
View File

@ -1933,9 +1933,14 @@ Optional snapshot description. (Default=None)</programlisting>
but this is the base command that later details are layered upon.</para>
<para>To delete instances from the dashboard, select the
<guilabel>Terminate instance</guilabel> action next to the instance on
the <guilabel>Instances</guilabel> page. From the command line, do
this:</para>
<guilabel>Delete instance</guilabel> action next to the instance on
the <guilabel>Instances</guilabel> page.
<note>
<para>In releases prior to Mitaka, select the equivalent <guilabel>Terminate instance</guilabel> action.</para>
</note>.
From the command line, do this:</para>
<screen><prompt>$</prompt> <userinput>nova delete &lt;instance-uuid&gt;</userinput></screen>

12
doc/ops-guide/source/ops_user_facing_operations.rst
View File

@ -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