Skip to content

Commit

Permalink
all language proofing feedback for User Guide for Admins is in
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.suse.de/svn/doc/trunk/cloud/en@56300 2463f871-af05-0410-bd21-ebfa852e3ce4
  • Loading branch information
taroth21 committed Dec 3, 2012
1 parent 0f426ad commit 37a64f3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
24 changes: 12 additions & 12 deletions xml/admin_cli.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<listitem>
<screen>keystone tenant-list</screen>
<para>
Lists all projects with their ID, name and the information if they
Lists all projects with their ID, name, and the information if they
are enabled or not.
</para>
</listitem>
Expand All @@ -102,7 +102,7 @@
<listitem>
<screen>keystone tenant-update <replaceable>PROJECT_ID</replaceable> --enabled false</screen>
<para>
For the details about the impact, refer to
For the details of the impact, refer to
<xref linkend="il.disabled.projects"/> .
</para>
</listitem>
Expand Down Expand Up @@ -254,7 +254,7 @@
</step>
<step>
<para>
To grant the user membership to a project:
To grant the user membership of a project:
</para>
<screen>keystone user-role-add --role-id=<replaceable>ROLE_ID</replaceable> --tenant_id=<replaceable>TENANT_ID</replaceable> \
--user_id=<replaceable>USER_ID</replaceable>&nbsp;</screen>
Expand Down Expand Up @@ -286,7 +286,7 @@
members of all projects). Private images can also be explicitly shared
with other projects, so that members of those projects can access the
images, too. Any image uploaded to Glance will get an
<literal>owner</literal> attribute. Per default, ownership is set to the
<literal>owner</literal> attribute. By default, ownership is set to the
primary project of the user that uploads the image.
</para>

Expand Down Expand Up @@ -321,7 +321,7 @@
</listitem>
<listitem>
<para>
The image does not include any end-user license agreements (EULA)
The image does not include any end-user license agreement (EULA)
dialogs.
</para>
</listitem>
Expand All @@ -331,7 +331,7 @@
<systemitem class="resource">cloud-init</systemitem> (part of the
&productname; ISO). It contains tools used for communication with the instance
metadata API, which is provided by Nova. The instance metadata API is
specific for each virtual machine and is only accessible from inside the
specific to each virtual machine and is only accessible from inside the
VM. The package is needed to pull keypairs into the virtual machine that
will run the image.
</para>
Expand Down Expand Up @@ -433,7 +433,7 @@
&img-props;
<para>
If the image upload has been successful, a message appears, displaying
the ID which has been assigned to the image.
the ID that has been assigned to the image.
</para>
</step>
</procedure>
Expand Down Expand Up @@ -583,7 +583,7 @@
<listitem>
<screen>nova flavor-list</screen>
<para>
List all flavors with their ID and name, the amount of memory, the
Lists all flavors with their ID and name, the amount of memory, the
amount of disk space for the root partition and for the ephemeral
partition, the swap, and the number of virtual CPUs.</para>
<!-- taroth 2012-08-10: did not mention RXTX factor as it is not used in
Expand Down Expand Up @@ -632,11 +632,11 @@

<variablelist>
<varlistentry>
<term>Show Default Quota Values</term>
<term>Showing Default Quota Values</term>
<listitem>
<screen>nova quota-defaults <replaceable>PROJECT_ID</replaceable>&nbsp;</screen>
<para>
List the default quotas for a tenant.
Lists the default quotas for a tenant.
<remark>taroth 2012-08-13: DEVs,
is the following correct?</remark>
They are hard-coded in &ostack; Nova.
Expand All @@ -650,11 +650,11 @@
</listitem>
</varlistentry>
<varlistentry>
<term>Show Quota Values for a Project</term>
<term>Showing Quota Values for a Project</term>
<listitem>
<screen>nova quota-show <replaceable>PROJECT_ID</replaceable>&nbsp;</screen>
<para>
List the currently set quota values for a project.
Lists the currently set quota values for a project.
</para>
</listitem>
</varlistentry>
Expand Down
30 changes: 15 additions & 15 deletions xml/admin_dashboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<para>
After a short introduction to the &dash;, learn how to execute key
administration tasks such as managing projects and users, adding images,
adding flavors or setting quotas.
adding flavors, and setting quotas.
</para>
</abstract>
<sect1 id="sec.adm.dash.req">
Expand All @@ -35,7 +35,7 @@
</para>

<sect2 id="sec.adm.dash.intro.login">
<title>Logging Into the &cloud; &dash;</title>
<title>Logging in to the &cloud; &dash;</title>
&dash-login;
<figure><title>&cloud; &dash;&mdash;Login Screen</title>
<mediaobject>
Expand All @@ -55,7 +55,7 @@
<title>Main Screen (Administrator's View)</title>
&dash-main-screen;
<para>
If you are logged in as administrator, the main screen shows the
If you are logged in as an administrator, the main screen shows the
following tabs: <guimenu>Project</guimenu> and an
<guimenu>Admin</guimenu>.
</para>
Expand Down Expand Up @@ -102,7 +102,7 @@
<para>
Lists all currently running instances belonging to various users and
tenants. (Not all tenants may be visible to the administrator,
though). </para>
though.) </para>
</listitem>
</varlistentry>
<varlistentry>
Expand Down Expand Up @@ -182,8 +182,8 @@
<para>
As a &cloud; administrator, you can create additional projects and users
as needed. The following procedures guide you through the main management
tasks like adding, modifying or deleting projects and users. Learn how to
assign users to one or multiple projects or how to change or remove the
tasks like adding, modifying, or deleting projects and users. Learn how to
assign users to one or multiple projects, or how to change or remove the
assignment.
</para>

Expand Down Expand Up @@ -276,7 +276,7 @@
</figure>

<procedure id="pro.adm.dash.user.create">
<title>Creating Or Deleting Users</title>
<title>Creating Or Deleting Users Accounts</title>
&users;
<step>
<para>
Expand All @@ -286,7 +286,7 @@
</step>
<step>
<para>
To add a new user:
To add a new user account:
</para>
<substeps>
<step>
Expand Down Expand Up @@ -318,19 +318,19 @@
</para>
<para>
The &dash; automatically assigns an ID and shows the newly created
user in the <guimenu>Users</guimenu> category.
user account in the <guimenu>Users</guimenu> category.
</para>
</step>
</substeps>
</step>
<step>
<para>
To delete one or multiple users:
To delete one or multiple users accounts:
</para>
<substeps>
<step>
<para>
Activate the check boxes in front of the users that you want to
Activate the check boxes in front of the user accounts that you want to
delete.
</para>
</step>
Expand All @@ -345,8 +345,8 @@
<note>
<title>Remove User from Primary Project</title>
<para>
In case a user cannot be deleted, he is still assigned to his
primary project.
If a user account cannot be deleted, it is because it is still assigned
to its primary project.
</para>
<orderedlist>
<listitem>
Expand All @@ -371,7 +371,7 @@
</step>
<step>
<para>
To temporarily deactivate a user account: Select the user and from the
To temporarily deactivate a user account: Select the user, and from the
<guimenu>Actions</guimenu> drop-down list, select
<guimenu>Disable</guimenu>.
</para>
Expand Down Expand Up @@ -664,7 +664,7 @@ update instance_types set memory_mb=5120 where name='m1.xlarge';
<guimenu>Modify Quota</guimenu>.
</para>
<para>
The windows that opens shows the default quota values per project,
The window that opens shows the default quota values per project,
which are hard-coded in &ostack; Nova.
</para>
</step>
Expand Down
12 changes: 6 additions & 6 deletions xml/phrases-decl.ent
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@

<!ENTITY project-disable
'<para>
Projects can be created, deleted or temporarily disabled by cloud
Projects can be created, deleted, or temporarily disabled by cloud
administrators. Disabling a project has the following consequences:
</para>
<itemizedlist id="il.disabled.projects">
Expand Down Expand Up @@ -341,14 +341,14 @@
management are cloud administrator&apos;s tasks. When a new user account
is created, the user has to be assigned to a primary project. The user can
also be assigned to additional projects. </para>
<para>User accounts can be created, deleted or temporarily deactivated. If a
<para>User accounts can be created, deleted, or temporarily deactivated. If a
user account is deactivated, the user can no longer log in, but his data is
kept so that the account can be re-enabled at any time. Before a user account
can be deleted, the user needs to be removed from his primary project.
</para>'>

<!ENTITY images
'<para>In &productname; context, images are virtual disk images that represent
'<para>In the &productname; context, images are virtual disk images that represent
the contents and structure of a storage medium or device, such as a hard drive,
in a single file. Images are used as a template from which a virtual machine
can be started. For starting a virtual machine, &productname; always uses
Expand All @@ -366,7 +366,7 @@ line tool, <command>glance image-create</command>. For details, refer to
<xref linkend="sec.adm.cli.img.upload"/>.</para>'>

<!ENTITY img-props
'<para>Images have both contents and meta-data, the latter are also called
'<para>Images have both contents and meta-data; the latter are also called
properties. The following properties can be attached to an image in &cloud;:
<!--taroth 2012-10-01: todo - check the remaining option names and add
if optional or required-->
Expand Down Expand Up @@ -466,8 +466,8 @@ line tool, <command>glance image-create</command>. For details, refer to
<para>Specify the hypervisor ABI (application binary interface) with the
<literal>vm_mode</literal> flag. It can take the values <literal>pv</literal>,
<literal>hvm</literal>, or <literal>xen</literal>. Use <option>vm_mode=xen</option>
for XEN PV image import, <option>vm_mode=hvm</option> for XEN HVM image import.
For KVM, the correct modus is selected automatically.</para>
for XEN PV image import, or <option>vm_mode=hvm</option> for XEN HVM image import.
For KVM, the correct mode is selected automatically.</para>
</listitem>
</varlistentry>
</variablelist>'>
Expand Down

0 comments on commit 37a64f3

Please sign in to comment.