From 98dacc0492f32a5d20efb63ae6d76172dfff1514 Mon Sep 17 00:00:00 2001 From: Eric Scholz Date: Thu, 6 Mar 2014 09:08:33 -0700 Subject: [PATCH] Fix user guide typos and text Updated ubuntu user to format with in /openstack-manuals/doc/user-guide/section_dashboard_launch_instances.xml, and changed "username" to "user name." Updated "etc" to "and so on," changed "Heat" to "Orchestration," and changed intro paragraph about Orchestration to match what's on the OpenStack getting started site in: /openstack-manuals/doc/user-guide/section_dashboard_stacks.xml Change-Id: Ie33d9a31c9d8b1ada31bf1c226ccb92eb0c08f1f --- .../section_dashboard_launch_instances.xml | 49 ++++++++++--------- doc/user-guide/section_dashboard_stacks.xml | 28 +++++------ 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/doc/user-guide/section_dashboard_launch_instances.xml b/doc/user-guide/section_dashboard_launch_instances.xml index 0916ac1dfd..2090116206 100644 --- a/doc/user-guide/section_dashboard_launch_instances.xml +++ b/doc/user-guide/section_dashboard_launch_instances.xml @@ -10,14 +10,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="dashboard_launch_instances"> Launch and manage instances - Instances are virtual machines that run inside the cloud. - You can launch - an instance from an OpenStack image. The OpenStack + Instances are virtual machines that run inside the + cloud. + You can launch an + instance from an OpenStack image. The OpenStack Image Service provides a pool of images that are accessible to members of different projects. - You can also - launch - an instance from an image that you have copied to a + You can also launch an + instance from an image that you have copied to a persistent volume. The instance boots from the volume, which is provided by nova-volume through iSCSI. When you launch @@ -40,7 +42,7 @@ xvda for Xen images. - + @@ -52,8 +54,8 @@ To SSH into your instance, you use the downloaded keypair file. - The username is ubuntu for the Ubuntu cloud images - on TryStack. + The user name is ubuntu for the + Ubuntu cloud images on TryStack. @@ -72,15 +74,15 @@
Track usage for instances - You can track usage for instances for each tenant, also known as a project. You - can track costs per month by showing metrics like number - of VCPUs, disks, RAM, and uptime for all your - instances. + You can track usage for instances for each tenant, also + known as a project. You can track costs per month by + showing metrics like number of VCPUs, disks, RAM, and + uptime for all your instances. - Log in to the dashboard, choose a - project, and click the - Overview category. + Log in to the dashboard, choose a project, and + click the Overview + category. To query the instance usage for a month, select @@ -97,9 +99,8 @@ Create instance snapshots - Log in to the dashboard, choose a - project, and click the - Instances + Log in to the dashboard, choose a project, and + click the Instances category. @@ -129,9 +130,8 @@ Manage an instance - Log in to the dashboard, choose a - project, and click the - Instances + Log in to the dashboard, choose a project, and + click the Instances category. @@ -141,7 +141,10 @@ In the More drop-down list in the Actions column, select the state. - You can resize or rebuild an instance. You can also choose to view the instance console log. Depending on the current state of the instance, you can choose to pause, resume, suspend, soft or + You can resize or rebuild an instance. You can + also choose to view the instance console log. + Depending on the current state of the instance, + you can choose to pause, resume, suspend, soft or hard reboot, or terminate an instance. diff --git a/doc/user-guide/section_dashboard_stacks.xml b/doc/user-guide/section_dashboard_stacks.xml index b7d9f36f41..2e14dfe293 100644 --- a/doc/user-guide/section_dashboard_stacks.xml +++ b/doc/user-guide/section_dashboard_stacks.xml @@ -10,24 +10,24 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="dashboard_stacks"> Launch and manage stacks - Heat is a service used to orchestrate multiple composite - cloud applications using the AWS CloudFormation template - format, through both an OpenStack-native ReST API and a - CloudFormation-compatible Query API. - The purpose of Heat is to provide a template based - orchestration for describing a cloud application by executing - appropriate OpenStack API calls to generate running cloud - applications, integrate other core components of OpenStack - into a one-file template system. The templates allow creation - of most OpenStack resource types such as instances, floating - ips, volumes, security groups, users, etc. + Orchestration is a service used to orchestrate + multiple composite cloud applications using the AWS + CloudFormation template format, through both an + OpenStack-native REST API and a CloudFormation-compatible + Query API. + The flexible template language enables application + developers to describe and automate the deployment of + infrastructure, services, and applications. The templates + allow creation of most OpenStack resource types such as + instances, floating ips, volumes, security groups, users, and + so on.
Launch a stack - Log in to the dashboard, choose a - project, and click Stacks - in the Orchestration + Log in to the dashboard, choose a project, and + click Stacks in the + Orchestration category.