Merge lp:~nhandler/ubuntu-docs/fix-lp507624 into lp:ubuntu-docs/lucid

[Nathan Handler]

[Matthew East (mdke)]

Looks good but I'd suggest that instead of using "lucid" in the various places where you have updated the release codename, we use an entity that will automatically keep this updated, so "&distro-short-codename;".

If that works, then would you mind added this to the different places where "lucid" appears?

review: Needs Fixing

[lp:~nhandler/ubuntu-docs/fix-lp507624]

423. By Nathan Handler on 2010-01-21

Use &distro-short-codename; instead of 'lucid'

[Matthew East (mdke)]

Thanks Nathan, now merged

review: Approve

=== modified file 'serverguide/C/virtualization.xml'
--- serverguide/C/virtualization.xml	2009-04-20 19:15:11 +0000
+++ serverguide/C/virtualization.xml	2010-01-21 00:04:12 +0000
@@ -34,12 +34,12 @@
 <screen> <command>egrep '(vmx|svm)' /proc/cpuinfo</command>
 </screen>
     <para>
-    If nothing is printed, it means that your cpu does <emphasis>not</emphasis> support hardware virtualization.
+    If nothing is printed, it means that your CPU does <emphasis>not</emphasis> support hardware virtualization.
     </para>
     <note>
       <para>
       On most computer whose processor supports virtualization, it is
-      necessary to activate an option in the bios to enable it. The method
+      necessary to activate an option in the BIOS to enable it. The method
       described above does not show the status of it's activation.
       </para>
     </note>
@@ -442,7 +442,7 @@
 
       <para>
       With vmbuilder, there is no need to download a JeOS ISO anymore. vmbuilder will fetch the various package and build a virtual machine 
-      tailored for our need in about a minute for us. Vmbuilder is a Script that automates the process of creating a ready to use Linux based
+      tailored for your needs in about a minute. vmbuilder is a script that automates the process of creating a ready to use Linux based
       VM. The currently supported hypervisors are KVM and Xen.
       </para>
 
@@ -453,7 +453,7 @@
       </para>
 
       <para>
-      First introduced as a shell script in Ubuntu 8.04LTS, <application>ubuntu-vm-builder</application> started with little emphasis as 
+      First introduced as a shell script in Ubuntu 8.04 LTS, <application>ubuntu-vm-builder</application> started with little emphasis as 
       a hack to help developers test their new code in a virtual machine without having to restart from scratch each time. As a few Ubuntu 
       administrators started to notice this script, a few of them went on improving it and adapting it for so many use case that 
       Soren Hansen (the author of the script and Ubuntu virtualization specialist, not the golf player) decided to rewrite it from scratch 
@@ -722,7 +722,7 @@
 
 <programlisting>
 --part PATH
-  Allows to specify a partition table in partfile each  line  of  partfile  should  specify
+  Allows you to specify a partition table in a partition file, located at PATH. Each line of the partition file should specify
   (root first):
       mountpoint size
   where  size  is  in megabytes. You can have up to 4 virtual disks, a new disk starts on a
@@ -806,7 +806,7 @@
         </para>
 
 <screen>
-<command>sudo vmbuilder kvm ubuntu --suite intrepid --flavour virtual --arch i386 \
+<command>sudo vmbuilder kvm ubuntu --suite &distro-short-codename; --flavour virtual --arch i386 \
          -o --libvirt qemu:///system --ip 192.168.0.100 --part vmbuilder.partition \ 
          --user user --name user --pass default</command>
 </screen>
@@ -831,7 +831,7 @@
       </itemizedlist>
 
       <para>
-      This is done using vmbuilder by specifying the --addpkg command multiple times:
+      This is done using vmbuilder by specifying the --addpkg option multiple times:
       </para>
 
 <programlisting>
@@ -899,7 +899,7 @@
           to one of the official repositories, which, depending on your internet connection speed and the load of the mirror, can 
           have a big impact on the actual build time. In order to reduce this, it is recommended to either have a local repository 
           (which can be created using <application>apt-mirror</application>) or using a caching proxy such as 
-          <application>apt-cache</application>. The later option being much simpler to implement and requiring less disk space, it
+          <application>apt-proxy</application>. The later option being much simpler to implement and requiring less disk space, it
           is the one we will pick in this tutorial. To install it, simply type:
           </para>
 
@@ -929,8 +929,8 @@
 
           <note>
             <para>
-            The mirror address specified here will also be used in the <filename>/etc/apt/source.list</filename> of the newly created 
-            guest, so it is usefull to specify here an address that can be resolved by the guest or to plan on reseting this address 
+            The mirror address specified here will also be used in the <filename>/etc/apt/sources.list</filename> of the newly created 
+            guest, so it is useful to specify here an address that can be resolved by the guest or to plan on reseting this address 
             later on, such as in a <emphasis>--firstboot</emphasis> script.
             </para>
           </note>
@@ -1146,7 +1146,7 @@
       </para>
 
 <screen>
-<command>sudo vmbuilder kvm ubuntu --suite intrepid --flavour virtual --arch i386 -o \ 
+<command>sudo vmbuilder kvm ubuntu --suite &distro-short-codename; --flavour virtual --arch i386 -o \ 
          --libvirt qemu:///system --ip 192.168.0.100 --part vmbuilder.partition --user user \
          --name user --pass default --addpkg apache2 --addpkg apache2-mpm-prefork \ 
          --addpkg apache2-utils --addpkg apache2.2-common --addpkg dbconfig-common \ 
@@ -1286,14 +1286,6 @@
 <command>sudo /etc/init.d/eucalyptus-nc restart</command>
 </screen>
 
-
-      <note>
-        <para>
-        Be sure to replace <emphasis>nodecontroller</emphasis>, <emphasis>node01</emphasis>, and <emphasis>node02</emphasis> 
-        with actual hostnames.
-        </para>
-      </note>
-
       <para>
       <application>Eucalyptus</application> is now ready to host images on the cloud. 
       </para>