From d90fbeadc573c019c2daaf8a2e9c4f86cc4b2a41 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Mon, 14 Jul 2014 21:10:22 +0200 Subject: [PATCH] Removed some duplicate spaces The duplicate in doc/common/section_getstart_object-storage.xml will be removed with https://review.openstack.org/#/c/106834/ . Change-Id: I1f98a479568be9f07a324e60a2dffb9d348f25e4 --- .../compute/section_compute-networking-nova.xml | 2 +- .../networking/section_networking-multi-dhcp-agents.xml | 2 +- .../networking/section_networking-scenarios.xml | 2 +- doc/cli-reference/ch_cli_glance_property_keys.xml | 2 +- doc/common/section_cli_cinder_manage_volumes.xml | 2 +- doc/common/section_getstart_networking.xml | 2 +- doc/common/section_keystone-concepts.xml | 2 +- doc/common/section_using-vnc-console.xml | 2 +- doc/install-guide/ch_overview.xml | 2 +- doc/install-guide/section_cinder-controller.xml | 2 +- doc/user-guide-admin/section_dashboard_admin_manage_roles.xml | 2 +- .../section_dashboard_admin_view_cloud_resources.xml | 2 +- doc/user-guide/section_cli_nova_config-drive.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml index 4bac0a0f1e..e997a402ff 100644 --- a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml +++ b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml @@ -9,7 +9,7 @@ you design the best configuration for your Compute instances. You can choose to either install and configure nova-network for networking between VMs or use the OpenStack Networking + >nova-network for networking between VMs or use the OpenStack Networking service (neutron) for networking. To configure Compute networking options with OpenStack Networking, see the .
diff --git a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml index e6c26a03b4..58a9d11bb4 100644 --- a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml +++ b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml @@ -242,7 +242,7 @@ export OS_AUTH_URL=http://controlnode:5000/v2.0/ The agent-list command shows details for a specified agent: - $ neutron agent-show a0c1c21c-d4f4-4577-9ec7-908f2d48622d + $ neutron agent-show a0c1c21c-d4f4-4577-9ec7-908f2d48622d +---------------------+----------------------------------------------------------+ | Field | Value | +---------------------+----------------------------------------------------------+ diff --git a/doc/admin-guide-cloud/networking/section_networking-scenarios.xml b/doc/admin-guide-cloud/networking/section_networking-scenarios.xml index 685ce17ee3..b64c2aca53 100644 --- a/doc/admin-guide-cloud/networking/section_networking-scenarios.xml +++ b/doc/admin-guide-cloud/networking/section_networking-scenarios.xml @@ -455,7 +455,7 @@ ovs-vsctl add-port OVS-BR0 vxlan1 -- set Interface vxlan1 type=vxlan options:rem implements the Networking abstractions. For information about DHCP and L3 agents, see . -
+
Configuration This example uses VLAN isolation on the switches to isolate tenant networks. This configuration labels the diff --git a/doc/cli-reference/ch_cli_glance_property_keys.xml b/doc/cli-reference/ch_cli_glance_property_keys.xml index 0cc3925128..371ee529ba 100644 --- a/doc/cli-reference/ch_cli_glance_property_keys.xml +++ b/doc/cli-reference/ch_cli_glance_property_keys.xml @@ -290,7 +290,7 @@ libvirt API driver hw_watchdog_action Enables a virtual hardware watchdog device that carries out the specified action - if the server hangs. The watchdog uses the i6300esb device (emulating a PCI + if the server hangs. The watchdog uses the i6300esb device (emulating a PCI Intel 6300ESB). If hw_watchdog_action is not specified, the watchdog is disabled. diff --git a/doc/common/section_cli_cinder_manage_volumes.xml b/doc/common/section_cli_cinder_manage_volumes.xml index 4f928c67df..a1e02473a4 100644 --- a/doc/common/section_cli_cinder_manage_volumes.xml +++ b/doc/common/section_cli_cinder_manage_volumes.xml @@ -122,7 +122,7 @@ Attach your volume to a server, specifying the server ID and the volume ID: - $ nova volume-attach 84c6e57d-a6b1-44b6-81eb-fcb36afd31b5 573e024d-5235-49ce-8332-be1576d323f8 /dev/vdb + $ nova volume-attach 84c6e57d-a6b1-44b6-81eb-fcb36afd31b5 573e024d-5235-49ce-8332-be1576d323f8 /dev/vdb +----------+--------------------------------------+ | Property | Value | +----------+--------------------------------------+ diff --git a/doc/common/section_getstart_networking.xml b/doc/common/section_getstart_networking.xml index af08cd395d..87cc0bbda8 100644 --- a/doc/common/section_getstart_networking.xml +++ b/doc/common/section_getstart_networking.xml @@ -20,7 +20,7 @@ OpenStack Networking plug-ins and agents Plugs and unplugs ports, creates networks or subnets, - and provides IP addressing. These plug-ins and agents differ + and provides IP addressing. These plug-ins and agents differ depending on the vendor and technologies used in the particular cloud. OpenStack Networking ships with plug-ins and agents for Cisco virtual and physical switches, NEC OpenFlow products, Open diff --git a/doc/common/section_keystone-concepts.xml b/doc/common/section_keystone-concepts.xml index becb709fe9..568db36bc9 100644 --- a/doc/common/section_keystone-concepts.xml +++ b/doc/common/section_keystone-concepts.xml @@ -64,7 +64,7 @@ Token An alpha-numeric string of text used to access - OpenStack APIs and resources. A token may be + OpenStack APIs and resources. A token may be revoked at any time and is valid for a finite duration. While OpenStack Identity supports token-based diff --git a/doc/common/section_using-vnc-console.xml b/doc/common/section_using-vnc-console.xml index fc6ad30a9a..878cab7971 100644 --- a/doc/common/section_using-vnc-console.xml +++ b/doc/common/section_using-vnc-console.xml @@ -14,7 +14,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="getting-an-access-url"> Get an access URL - The Compute service enables you to create access_urls + The Compute service enables you to create access_urls through the os-consoles extension. Support for accessing this URL is provided by the nova client: $ nova get-vnc-console [server_id] [novnc|xvpvnc] diff --git a/doc/install-guide/ch_overview.xml b/doc/install-guide/ch_overview.xml index ac1265037d..711e37bf5e 100644 --- a/doc/install-guide/ch_overview.xml +++ b/doc/install-guide/ch_overview.xml @@ -108,7 +108,7 @@ The basic - controller node + controller node runs the Identity service, Image Service, management portion of Compute, and the dashboard necessary to launch a simple instance. It also includes supporting services such as a database, message diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml index 7a9a7acb2f..337c868496 100644 --- a/doc/install-guide/section_cinder-controller.xml +++ b/doc/install-guide/section_cinder-controller.xml @@ -23,7 +23,7 @@ service: # apt-get install cinder-api cinder-scheduler # yum install openstack-cinder - # zypper install openstack-cinder-api openstack-cinder-scheduler + # zypper install openstack-cinder-api openstack-cinder-scheduler Respond to the prompts for /etc/keystone/policy.json file. -
+
Create a role diff --git a/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml b/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml index a68d05243b..1fdf69a1ea 100644 --- a/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml +++ b/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml @@ -34,7 +34,7 @@ (project). Global Object Storage Usage tab to view incoming and outgoing storage bytes per tenant (project). Global Network Usage tab to view duration and creation requests for - networks, subnets, routers, ports, and floating IPs, per tenant + networks, subnets, routers, ports, and floating IPs, per tenant (project). Stats tab to view a multi-series line chart with user-defined metrics. You group by project, define the value type (min, max, avg, or sum), diff --git a/doc/user-guide/section_cli_nova_config-drive.xml b/doc/user-guide/section_cli_nova_config-drive.xml index e94497294c..13f93f7847 100644 --- a/doc/user-guide/section_cli_nova_config-drive.xml +++ b/doc/user-guide/section_cli_nova_config-drive.xml @@ -228,7 +228,7 @@ openstack/latest/user_data config_drive_format=iso9660 By default, you cannot attach the configuration drive image as a CD drive instead of as a disk drive. To attach a CD drive, add - the following line to the + the following line to the /etc/nova/nova.conf file: config_drive_cdrom=true For legacy reasons, you can configure the