From 84be4180aa25b779a0493887ba03b2bace80e2ee Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Mon, 8 Sep 2014 10:50:10 +0900 Subject: [PATCH] change Virtual Box to VirtualBox follow the official name Change-Id: I590b09a019e15fe9683f7acec6359d293304382f Closes-Bug: 1366644 --- .../basic-install-guide/lab_control-node.xml | 10 +++++----- .../lab_important-terms.xml | 4 ++-- .../lab_virtualbox-basics.xml | 20 +++++++++---------- .../training-cluster-by-script.xml | 14 ++++++------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/training-guides/basic-install-guide/lab_control-node.xml b/doc/training-guides/basic-install-guide/lab_control-node.xml index 304220cc..47207fd7 100644 --- a/doc/training-guides/basic-install-guide/lab_control-node.xml +++ b/doc/training-guides/basic-install-guide/lab_control-node.xml @@ -61,20 +61,20 @@ auto lo iface lo inet loopback -# The primary network interface - Virtual Box NAT connection -# (Virtual Box Network Adapter 1) +# The primary network interface - VirtualBox NAT connection +# (VirtualBox Network Adapter 1) auto eth0 iface eth0 inet dhcp -# Virtual Box vboxnet0 - OpenStack management network -# (Virtual Box Network Adapter 2) +# VirtualBox vboxnet0 - OpenStack management network +# (VirtualBox Network Adapter 2) auto eth1 iface eth1 inet static address 10.10.10.51 netmask 255.255.255.0 # VirtualBox vboxnet2 - OpenStack API network -# (Virtual Box Network Adapter 3) +# (VirtualBox Network Adapter 3) auto eth2 iface eth2 inet static address 192.168.100.51 diff --git a/doc/training-guides/basic-install-guide/lab_important-terms.xml b/doc/training-guides/basic-install-guide/lab_important-terms.xml index 50781df6..63390389 100644 --- a/doc/training-guides/basic-install-guide/lab_important-terms.xml +++ b/doc/training-guides/basic-install-guide/lab_important-terms.xml @@ -9,12 +9,12 @@ The operating system that is installed on your laptop or desktop that hosts virtual machines. This is commonly referred to as the host OS or host. - In short, the machine where your Virtual Box is + In short, the machine where your VirtualBox is installed. Guest Operating System (Guest) - The operating system that is installed on your Virtual Box + The operating system that is installed on your VirtualBox Virtual Machine. This virtual instance is independent of the host OS. It is commonly referred to as guest OS or guest. diff --git a/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml b/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml index 49d0b5ac..9609f2fe 100644 --- a/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml +++ b/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml @@ -11,7 +11,7 @@ VirtualBox basics Getting Started The following methods are conventional for deploying - OpenStack on Virtual Box for the sake of a test/sandbox or just to + OpenStack on VirtualBox for the sake of a test/sandbox or just to try out OpenStack on commodity hardware. 1. DevStack 2. Vagrant @@ -88,7 +88,7 @@ INFO: Your CPU does not support KVM extensions KVM acceleration can NOT be used - You will still be able to use Virtual Box but the instances + You will still be able to use VirtualBox but the instances will be very slow. There are many ways to configure your OpenStack Setup. In this example, we will deploy OpenStack multi node using OVS as the network @@ -146,7 +146,7 @@ - Oracle Virtual Box + Oracle VirtualBox You cannot set up an AMD64 VM on a x86 machine. @@ -178,14 +178,14 @@ networks for your Virtual Machine. - Launch Virtual Box + Launch VirtualBox Click on File>Preferences present on the menu bar of - Virtual Box. + VirtualBox. Select the Network @@ -329,7 +329,7 @@ You may benefit by installing SSH and FTP so that you can use your remote shell to login into the machine and use your terminal which is more convenient than using the - Virtual Machines tty through the Virtual Box's UI. You get a + Virtual Machines tty through the VirtualBox's UI. You get a few added features such as copy - paste commands into the remote terminal, which is not possible directly on VM. @@ -643,7 +643,7 @@ If this doesn't work, check your network - settings from Virtual Box. Something may be missing or it may be + settings from VirtualBox. Something may be missing or it may be misconfigured. @@ -653,15 +653,15 @@ Note: There are known bugs with the ping under NAT. - Although the latest versions of Virtual Box have better + Although the latest versions of VirtualBox have better performance, sometimes ping may not work even if the Network is connected to the Internet. Congratulations! You are now setup with the infrastructure for deploying OpenStack. Just make sure that the Ubuntu Server - is installed on the above setup Virtual Box instances. In the + is installed on the above setup VirtualBox instances. In the next section we will go through deploying OpenStack using the - above created Virtual Box instances. + above created VirtualBox instances. diff --git a/doc/training-guides/training-cluster-by-script.xml b/doc/training-guides/training-cluster-by-script.xml index 095e6f67..cead1121 100644 --- a/doc/training-guides/training-cluster-by-script.xml +++ b/doc/training-guides/training-cluster-by-script.xml @@ -16,7 +16,7 @@ To test scripts Set up the test environment - To use Virtual Box as test environment, you must attach + To use VirtualBox as test environment, you must attach the following network adapters: @@ -38,7 +38,7 @@ Test scripts individually Run the shell scripts in the Scripts - folder to verify they run correctly. Do not install Virtual Box, + folder to verify they run correctly. Do not install VirtualBox, although it is recommended because your host machine might fail. To test the scripts, run them. Some scripts require input parameters. If you do not want to run them manually, run @@ -48,13 +48,13 @@ Test the entire system - You must install Virtual Box, Ubuntu Server 12.04 or - 13.04, and the Virtual Box guest add-ons. - To install Virtual Box guest add-ons, complete one of + You must install VirtualBox, Ubuntu Server 12.04 or + 13.04, and the VirtualBox guest add-ons. + To install VirtualBox guest add-ons, complete one of these steps: - Install the Virtual Box guest add-ons through + Install the VirtualBox guest add-ons through ISO: # apt-get install linux-headers-generic # mount /dev/cdrom0/ /tmp/cdrom @@ -62,7 +62,7 @@ # ./virtualbox - Install the Virtual Box guest add-ons through Ubuntu + Install the VirtualBox guest add-ons through Ubuntu repositories: # apt-get install linux-headers-generic # apt-get --no-install-recommends install virtualbox-guest-additions