diff --git a/doc/common/section_cli_keystone_services.xml b/doc/common/section_cli_keystone_services.xml
index da96655fe7..326b66b068 100644
--- a/doc/common/section_cli_keystone_services.xml
+++ b/doc/common/section_cli_keystone_services.xml
@@ -56,20 +56,12 @@
+----------------------------------+----------+----------+---------------------------+
- To create a service, you use the following
- command syntax:
- $keystone help service-create
- usage: keystone service-create --name <name> --type <type>
- [--description <service-description>]
-
-Add service to Service Catalog.
-
-Arguments:
- --name <name> Name of new service (must be unique)
- --type <type> Service type (one of: identity, compute, network,
- image, or object-store)
- --description <service-description>
- Description of service
+ To create a service, use the following command:
+ $keystone service-create --name service_name --type service_type --description service_description
+ Where:
+ -service_name = Name of new service (must be unique)
+ -service_type = Service type (one of: identity, compute, network, image, or object-store)
+ -service_description = Description of serviceFor example, to create a service named
swift of type
object-store, run the
@@ -85,7 +77,9 @@ Arguments:
+-------------+----------------------------------+
- To get details for a specified service:
+ To get details for a specific service, run the following:
+ $keystone service-get service_ID
+ For example:$keystone service-get 84c23f4b942c44c38b9c42c5e517cd9a+-------------+----------------------------------+
| Property | Value |
diff --git a/doc/common/section_cli_nova_quotas.xml b/doc/common/section_cli_nova_quotas.xml
index c1250b3376..5d724f6dee 100644
--- a/doc/common/section_cli_nova_quotas.xml
+++ b/doc/common/section_cli_nova_quotas.xml
@@ -218,7 +218,7 @@
To view quota values for an existing tenant (project)
- Place the tenant ID in a useable variable, as follows:
+ Place the tenant ID in a usable variable, as follows:$tenant=$(keystone tenant-list | awk '/tenantName/ {print $2}')
@@ -285,11 +285,11 @@
View and update Compute quotas for a tenant userTo view quota values for a tenant user
- Place the user ID in a useable variable, as follows:
+ Place the user ID in a usable variable, as follows:$tenantUser=$(keystone user-list | awk '/userName/ {print $2}')
- Place the user's tenant ID in a useable variable, as follows:
+ Place the user's tenant ID in a usable variable, as follows:$tenant=$(keystone tenant-list | awk '/tenantName/ {print $2}')
@@ -319,10 +319,10 @@
To update quota values for a tenant user
- Place the user ID in a useable variable, as follows:
+ Place the user ID in a usable variable, as follows:$tenantUser=$(keystone user-list | awk '/userName/ {print $2}')
- Place the user's tenant ID in a useable variable, as follows:
+ Place the user's tenant ID in a usable variable, as follows:$tenant=$(keystone tenant-list | awk '/userName/ {print $2}')
diff --git a/doc/common/section_dashboard_access.xml b/doc/common/section_dashboard_access.xml
index a27c099770..9fe9c09147 100644
--- a/doc/common/section_dashboard_access.xml
+++ b/doc/common/section_dashboard_access.xml
@@ -39,7 +39,7 @@
In the address bar, type the host name or IP address
for the dashboard:
- $https://IP_ADDRESS_OR_HOSTNAME/
+ https://IP_ADDRESS_OR_HOSTNAME/Certificate warningIf a certificate warning appears when you try to
@@ -78,14 +78,15 @@
view and manage resources in that project.The Project tab displays the
details of the selected project.
-
+
+ Dashboard Projects
-
+
Access the following tabs:Manage Compute tab
@@ -125,7 +126,7 @@
Access &
Security
- Use these tabs to complete these
+ Use the following tabs to complete these
tasks:Security Groups
@@ -199,7 +200,8 @@
Enables administrative users to view usage and manage
instances, volumes, flavors, images, projects, users,
services, and quotas.
-
+
+ Admin Tab
-
+
Access the following categories to complete these tasks:
@@ -219,7 +221,7 @@
Resource Usage
- Use these tabs to view the following usages:
+ Use the following tabs to view the following usages:Global Disk Usage
tab
@@ -316,7 +318,7 @@
System Info
- Use these tabs to view the service info:
+ Use the following tabs to view the service info:Services tabView a list of the services.
diff --git a/doc/user-guide-admin/section_cli_cinder_quotas.xml b/doc/user-guide-admin/section_cli_cinder_quotas.xml
index dff72212fc..9e3b680fc7 100644
--- a/doc/user-guide-admin/section_cli_cinder_quotas.xml
+++ b/doc/user-guide-admin/section_cli_cinder_quotas.xml
@@ -14,8 +14,8 @@
-
Property name
-
Defines the number of
+
Property name
+
Defines the number of
diff --git a/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml b/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
index 4764d193e4..4dda480f30 100644
--- a/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
+++ b/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
@@ -172,7 +172,7 @@ export OS_TENANT_NAME=tenant01
Delete the new security group, as follows:$nova secgroup-delete GroupNameFor example:
- $nova secgroup-create global_http
+ $nova secgroup-delete global_http
@@ -193,10 +193,10 @@ export OS_TENANT_NAME=tenant01
Add a source group, as follows:$nova secgroup-add-group-rule secGroupName source-group ip-protocol from-port to-portFor example:
- $nova secgroup-add-group-rule cluster global-http tcp 22 22
+ $nova secgroup-add-group-rule cluster global_http tcp 22 22The cluster rule allows ssh access from
any other instance that uses the
- global-http group.
+ global_http group.
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml b/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
index 2a819b8ecf..7a6ea8bdf3 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
@@ -85,9 +85,9 @@
Depending on the current state of the instance,
you can choose to pause, un-pause, suspend,
resume, soft or hard reboot, or terminate an
- instance.
+ instance (items in red are disabled).
- Dashboard—Actions
+ Dashboard—Instance Actions
-
-
-
+ Edit the Users List
+
+
+
-
-
+
+
+ To assign a user to the current project, click
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml b/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
index b9ef1422ad..0ceb6d42e6 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
@@ -21,9 +21,9 @@
xlink:href="http://docs.openstack.org/user-guide/content/"
>OpenStack End User
Guide.
- As an administrative user, you can manage volumes and volume
- types for users in various projects. You can create and delete
- volumes types, and you can view and delete volumes.
+ As an administrative user, you can manage volumes and volume types for users in various
+ projects. You can create and delete volume types, and you can view and delete
+ volumes.Create a volume type