From 31743bb1d5c90723624e8fb4dcc3cf0b7618a2e7 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 28 Aug 2013 22:27:48 +0200 Subject: [PATCH] Remove duplicated words egrep -r '\b(\w+)\b \1 ' *xml showed a few wrongly duplicated words. Change-Id: Ie1ec3170fce94d61d2b209bbae12279cb931b1c9 --- doc/src/docbkx/common/section_vmware.xml | 2 +- doc/src/docbkx/openstack-compute-admin/ch_identity_mgmt.xml | 2 +- doc/src/docbkx/openstack-compute-admin/ch_instance_mgmt.xml | 2 +- doc/src/docbkx/openstack-image/centos-example.xml | 2 +- doc/src/docbkx/openstack-image/ch_obtaining_images.xml | 2 +- doc/src/docbkx/openstack-image/ubuntu-example.xml | 2 +- doc/src/docbkx/openstack-install/ap_installingfolsom.xml | 6 +++--- .../openstack-network-connectivity-admin/ch_install.xml | 2 +- doc/src/docbkx/openstack-user/src/section_cli_install.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/src/docbkx/common/section_vmware.xml b/doc/src/docbkx/common/section_vmware.xml index eed3a0acff..159f7db309 100644 --- a/doc/src/docbkx/common/section_vmware.xml +++ b/doc/src/docbkx/common/section_vmware.xml @@ -197,7 +197,7 @@ is_public=true --property vmware_adaptertype="ide" \ --property vmware_ostype="ubuntu64Guest" < unbuntuLTS-thin-flat.vmdk The complete list of supported vmware disk properties is documented in the Image Management section. It's critical that the adaptertype is correct; In fact, the image will not - boot with the incorrect adaptertype. If you have the meta-data VMDK file the the + boot with the incorrect adaptertype. If you have the meta-data VMDK file the ddb.adapterType property specifies the adaptertype. The default adaptertype is "lsilogic" which is SCSI. diff --git a/doc/src/docbkx/openstack-compute-admin/ch_identity_mgmt.xml b/doc/src/docbkx/openstack-compute-admin/ch_identity_mgmt.xml index 83d4842aa6..d0936c5600 100644 --- a/doc/src/docbkx/openstack-compute-admin/ch_identity_mgmt.xml +++ b/doc/src/docbkx/openstack-compute-admin/ch_identity_mgmt.xml @@ -202,7 +202,7 @@ pipeline = [...] json_body stats_reporting ec2_extension [...] admin_serviceSet Up Middleware
Identity Service Auth-Token Middleware - The the Identity Service auth_token middleware is a WSGI component + The Identity Service auth_token middleware is a WSGI component that can be inserted in the WSGI pipeline to handle authenticating tokens with the Identity Service.
diff --git a/doc/src/docbkx/openstack-compute-admin/ch_instance_mgmt.xml b/doc/src/docbkx/openstack-compute-admin/ch_instance_mgmt.xml index c705e59590..99f95a39e7 100644 --- a/doc/src/docbkx/openstack-compute-admin/ch_instance_mgmt.xml +++ b/doc/src/docbkx/openstack-compute-admin/ch_instance_mgmt.xml @@ -113,7 +113,7 @@ Compute API OpenStack provides a RESTful API for all functionality. Complete API documentation is available - at at http://docs.openstack.org/api. The OpenStack Compute API documentation refers to instances as "servers". diff --git a/doc/src/docbkx/openstack-image/centos-example.xml b/doc/src/docbkx/openstack-image/centos-example.xml index 25783d12f8..20111c48a3 100644 --- a/doc/src/docbkx/openstack-image/centos-example.xml +++ b/doc/src/docbkx/openstack-image/centos-example.xml @@ -220,7 +220,7 @@ guest by adding the EPEL repo:# rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm # yum install cloud-init - The account varies by distribution. On Ubuntu-based virtual virtual machines, the + The account varies by distribution. On Ubuntu-based virtual machines, the account is called "ubuntu". On Fedora-based virtual machines, the account is called "ec2-user". You can change the name of the account used by cloud-init by editing the diff --git a/doc/src/docbkx/openstack-image/ch_obtaining_images.xml b/doc/src/docbkx/openstack-image/ch_obtaining_images.xml index e05ce05312..3a4aec65ef 100644 --- a/doc/src/docbkx/openstack-image/ch_obtaining_images.xml +++ b/doc/src/docbkx/openstack-image/ch_obtaining_images.xml @@ -5,7 +5,7 @@ xml:id="ch_obtaining_images"> Obtaining images - The simplest way to obtain a virtual machine image that works with OpenStack is is to + The simplest way to obtain a virtual machine image that works with OpenStack is to download one that someone else has already created.
CirrOS (test) images diff --git a/doc/src/docbkx/openstack-image/ubuntu-example.xml b/doc/src/docbkx/openstack-image/ubuntu-example.xml index 0caadadeb9..fbaacdd4e1 100644 --- a/doc/src/docbkx/openstack-image/ubuntu-example.xml +++ b/doc/src/docbkx/openstack-image/ubuntu-example.xml @@ -156,7 +156,7 @@ The cloud-init package will automatically fetch the public key from the metadata server and place the key in an account. # apt-get install cloud-init - The account varies by distribution. On Ubuntu-based virtual virtual machines, the + The account varies by distribution. On Ubuntu-based virtual machines, the account is called "ubuntu". On Fedora-based virtual machines, the account is called "ec2-user". You can change the name of the account used by cloud-init by editing the diff --git a/doc/src/docbkx/openstack-install/ap_installingfolsom.xml b/doc/src/docbkx/openstack-install/ap_installingfolsom.xml index a623a5afe2..9e8aff129a 100644 --- a/doc/src/docbkx/openstack-install/ap_installingfolsom.xml +++ b/doc/src/docbkx/openstack-install/ap_installingfolsom.xml @@ -773,9 +773,9 @@ vm_test_mode = yes $ sudo sed -i ’s/6010/6040/g;s/LOCAL2/LOCAL5/g;’ /etc/swift/object-server/4.confConfigure the rings.$ pushd /etc/swift -$ sudo sudo swift-ring-builder object.builder create 18 3 1 -$ sudo sudo swift-ring-builder container.builder create 18 3 1 -$ sudo sudo swift-ring-builder account.builder create 18 3 1 +$ sudo swift-ring-builder object.builder create 18 3 1 +$ sudo swift-ring-builder container.builder create 18 3 1 +$ sudo swift-ring-builder account.builder create 18 3 1 Create the zones and balance them. $ sudo swift-ring-builder object.builder add z1-127.0.0.1:6010/device 1 diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml index 05c4119973..8a3e436321 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml @@ -949,7 +949,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver Enable and start the agent: $sudo chkconfig enable neutron-l3-agent on -$sudo start start neutron-l3-agent +$sudo service neutron-l3-agent start Enable and start the meta data agent: diff --git a/doc/src/docbkx/openstack-user/src/section_cli_install.xml b/doc/src/docbkx/openstack-user/src/section_cli_install.xml index 85640ae834..9bb8d1110b 100644 --- a/doc/src/docbkx/openstack-user/src/section_cli_install.xml +++ b/doc/src/docbkx/openstack-user/src/section_cli_install.xml @@ -137,7 +137,7 @@ Open Build Service enables you to use rpm or zypper to - install the the python-novaclient. + install the python-novaclient. # zypper install python-PROJECT Replace PROJECT