openstack
/
operations-guide
Code Issues Proposed changes

Merge "Replace "Terminate Instance" with "Delete Instance""

This commit is contained in:
Jenkins 2016-04-01 09:16:07 +00:00 committed by Gerrit Code Review
parent 2467b57dfe 488dcaaa06
commit 0201b1872b
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> but this is the base command that later details are layered upon.</para>
<para>To delete instances from the dashboard, select the <para>To delete instances from the dashboard, select the
<guilabel>Terminate instance</guilabel> action next to the instance on <guilabel>Delete instance</guilabel> action next to the instance on
the <guilabel>Instances</guilabel> page. From the command line, do the <guilabel>Instances</guilabel> page.
this:</para>
<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> <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. this is the base command that later details are layered upon.
To delete instances from the dashboard, select the To delete instances from the dashboard, select the
:guilabel:`Terminate instance action` next to the :guilabel:`Delete instance action` next to the
:guilabel:`instance` on the **Instances** page. From the :guilabel:`instance` on the **Instances** page.
command line, do this:
.. note::
In releases prior to Mitaka, select the equivalent :guilabel:`Terminate
instance` action.
From the command line, do this:
.. code-block:: console .. code-block:: console