Merge lp:~ted-m-cox/serverguide/virtualization_punctuation into lp:serverguide/trunk

Proposed by Ted Cox
Status: Merged
Approved by: Doug Smythies
Approved revision: 250
Merged at revision: 251
Proposed branch: lp:~ted-m-cox/serverguide/virtualization_punctuation
Merge into: lp:serverguide/trunk
Diff against target: 226 lines (+31/-39)
1 file modified
serverguide/C/virtualization.xml (+31/-39)
To merge this branch: bzr merge lp:~ted-m-cox/serverguide/virtualization_punctuation
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+258447@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

O.K. thanks.

Ted: Please consider to not make long lines.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/virtualization.xml'
2--- serverguide/C/virtualization.xml 2014-12-18 23:05:34 +0000
3+++ serverguide/C/virtualization.xml 2015-05-07 04:56:37 +0000
4@@ -112,9 +112,9 @@
5
6 <para>Yet another way to install an Ubuntu virtual machine is to use
7 <application>uvtool</application>.
8- This application, available as of 14.04 allows you to set up
9+ This application, available as of 14.04, allows you to set up
10 specific VM options, execute custom post-install scripts, etc. For
11- details see <xref linkend="cloud-images-and-uvtool"/></para>
12+ details see <xref linkend="cloud-images-and-uvtool"/>.</para>
13
14 <para>Libvirt can also be configured work with
15 <application>Xen</application>. For details, see the Xen Ubuntu
16@@ -198,7 +198,7 @@
17
18 <para>After launching <application>virt-install</application> you can
19 connect to the virtual machine's console either locally using a GUI (if
20- your server has a GUI), or via a remote VNC client from a GUI based
21+ your server has a GUI), or via a remote VNC client from a GUI-based
22 computer.</para>
23 </sect2>
24
25@@ -433,7 +433,7 @@
26 </listitem>
27
28 <listitem>
29- <para>The <ulink url="http://virt-manager.et.redhat.com/">Virtual
30+ <para>The <ulink url="http://virt-manager.org/">Virtual
31 Machine Manager</ulink> site has more information on
32 <application>virt-manager</application> development.</para>
33 </listitem>
34@@ -466,8 +466,7 @@
35 <sect2 id="cloud-image-introduction" status="review">
36 <title>Introduction</title>
37
38- <para>With Ubuntu being one of the most used operating systems on most of
39- the cloud platforms, the availability of stable and secure cloud images
40+ <para>With Ubuntu being one of the most used operating systems on many cloud platforms, the availability of stable and secure cloud images
41 has become very important. As of 12.04 the utilization of cloud
42 images outside of a cloud infrastructure has been improved. It is now
43 possible to use those images to create a virtual machine without the
44@@ -486,7 +485,7 @@
45 <sect3>
46 <title>Uvtool packages</title>
47
48- <para>The following packages and their dependancies will be required
49+ <para>The following packages and their dependencies will be required
50 in order to use uvtool:</para>
51
52 <para/>
53@@ -502,8 +501,7 @@
54
55 </itemizedlist>
56
57-<para>Installation of <application>uvtool</application> is done the same as
58-for any other application by using apt-get:</para>
59+<para>To install <application>uvtool</application>, run:</para>
60 <programlisting>$ apt-get -y install uvtool</programlisting>
61
62 <para>This will install uvtool's main commands: </para>
63@@ -523,7 +521,7 @@
64
65 <programlisting>$ uvt-simplestreams-libvirt sync arch=amd64</programlisting>
66
67-<para>After an amount of time required to download all the images from the internet, you will have
68+<para>After an amount of time required to download all the images from the Internet, you will have
69 a complete set of cloud images stored locally. To see what has been downloaded use the following
70 command:</para>
71
72@@ -545,9 +543,7 @@
73 <sect3>
74 <title>Create the VM using uvt-kvm</title>
75
76-<para>In order to be able to connect to the virtual machine once it has been created, it is necessary to have a
77-valid SSH key available for the ubuntu user. If your environment does not have a ssh key, you can easily create
78-one using the following command:</para>
79+<para>In order to connect to the virtual machine once it has been created, you must have a valid SSH key available for the Ubuntu user. If your environment does not have an SSH key, you can easily create one using the following command:</para>
80
81 <programlisting>
82 $ ssh-keygen
83@@ -572,18 +568,17 @@
84 | E |
85 +-----------------+
86 </programlisting>
87- <para>The creation of a new virtual machine using uvtool is easy. In its simplest form,
88- you only need to do:</para>
89+ <para>To create of a new virtual machine using uvtool, run the following in a terminal:</para>
90
91 <programlisting>$ uvt-kvm create firsttest</programlisting>
92
93 <para>This will create a VM named <emphasis role="bold">firsttest</emphasis> using the current LTS cloud image available locally.
94-If you want to specify a release to be used to create the VM, you need to use the <emphasis role="bold">release=</emphasis> filter</para>
95+If you want to specify a release to be used to create the VM, you need to use the <emphasis role="bold">release=</emphasis> filter:</para>
96
97 <programlisting>$ uvt-kvm create secondtest release=trusty</programlisting>
98
99-<para>The <application>uvt-kvm wait {name}</application> can be used to wait until the creation of
100-the VM has completed</para>
101+<para><application>uvt-kvm wait</application> can be used to wait until the creation of
102+the VM has completed:</para>
103
104 <programlisting>$ uvt-kvm wait secondttest --insecure
105 Warning: secure wait for boot-finished not yet implemented; use --insecure.
106@@ -591,16 +586,14 @@
107 </sect3>
108
109 <sect3><title>Connect to the running VM</title>
110-<para>Once the virtual machine creation is completed, you can connect to it using ssh:
111+<para>Once the virtual machine creation is completed, you can connect to it using SSH:
112 </para>
113
114 <programlisting>$ uvt-kvm ssh secondtest --insecure</programlisting>
115
116-<para>For the time being, the <emphasis role="bold">--insecure</emphasis> is required so you should be
117-using this mechanism to connect to your VM only if you completely trust your network infrastructure</para>
118+<para>For the time being, the <emphasis role="bold">--insecure</emphasis> is required, so use this mechanism to connect to your VM only if you completely trust your network infrastructure.</para>
119
120-<para>You can also connect to your VM using a regular ssh session using the IP address of the VM. The address
121-can be queried using the following command: </para>
122+<para>You can also connect to your VM using a regular SSH session using the IP address of the VM. The address can be queried using the following command:</para>
123
124 <programlisting>
125 $ uvt-kvm ip secondtest
126@@ -629,7 +622,7 @@
127 </sect3>
128
129 <sect3><title>Get the list of running VMs</title>
130-<para>You can get the list of VM running on your system with this command:</para>
131+<para>You can get the list of VMs running on your system with this command:</para>
132
133 <programlisting>$ uvt-kvm list
134 secondtest
135@@ -637,29 +630,28 @@
136 </sect3>
137
138 <sect3><title>Destroy your VM</title>
139-<para>Once you are done with your VM, you can proceed to destroy it with: </para>
140+<para>Once you are done with your VM, you can destroy it with:</para>
141
142 <programlisting>$ uvt-kvm destroy secondtest</programlisting>
143 </sect3>
144 <sect3><title>More uvt-kvm options</title>
145
146-<para>The following options can be used to change some of the characteristics of
147-the virtual memory that you are creating</para>
148+<para>The following options can be used to change some of the characteristics of the VM that you are creating:</para>
149
150 <itemizedlist mark="bullet">
151-<listitem><para>--memory : Amount of RAM in megabytes. Default: 512</para></listitem>
152-<listitem><para>--disk : Size of the OS disk in gigabytes. Default: 8</para></listitem>
153-<listitem><para>--cpu : Number of CPU cores. Default: 1</para></listitem>
154+<listitem><para>--memory : Amount of RAM in megabytes. Default: 512.</para></listitem>
155+<listitem><para>--disk : Size of the OS disk in gigabytes. Default: 8.</para></listitem>
156+<listitem><para>--cpu : Number of CPU cores. Default: 1.</para></listitem>
157 </itemizedlist>
158
159-<para>Some other parameters will have an impact on the cloud-init configuration</para>
160+<para>Some other parameters will have an impact on the cloud-init configuration:</para>
161 <itemizedlist mark="bullet">
162-<listitem><para>--password password : Allow login to the VM using the ubuntu account and this provided password</para></listitem>
163+<listitem><para>--password password : Allow login to the VM using the Ubuntu account and this provided password.</para></listitem>
164 <listitem><para>--run-script-once script_file : Run script_file as root on the VM the first time it is booted, but never again.</para></listitem>
165 <listitem><para>--packages package_list : Install the comma-separated packages specified in package_list on first boot.</para></listitem>
166 </itemizedlist>
167
168-<para>A complete description of all available modifiers is available in the manpage of uvt-kvm</para>
169+<para>A complete description of all available modifiers is available in the manpage of uvt-kvm.</para>
170 </sect3>
171 </sect2>
172
173@@ -846,7 +838,7 @@
174 <sect3>
175 <title>Basic privileged usage</title>
176 <para>
177- To create a privileged container, you can simply to
178+ To create a privileged container, you can simply do:
179 </para>
180 <screen>
181 <command>
182@@ -1027,7 +1019,7 @@
183 </para>
184 <para>
185 <filename>lxc.conf</filename> and <filename>default.conf</filename> are
186- exist both under <filename>/etc/lxc</filename> and <filename>$HOME/.config/lxc</filename>,
187+ both under <filename>/etc/lxc</filename> and <filename>$HOME/.config/lxc</filename>,
188 while <filename>lxc-usernet.conf</filename> is only host-wide.
189 </para>
190 <para>
191@@ -1130,7 +1122,7 @@
192 </para>
193 </listitem>
194 <listitem>
195- <para><filename>/etc/init/lxc-instance.conf:</filename>
196+ <para><filename>/etc/init/lxc-instance.conf</filename>
197 is used by <filename>/etc/init/lxc.conf</filename>
198 to autostart a container.
199 </para>
200@@ -1312,7 +1304,7 @@
201 If you wish to use libvirt inside containers, then you will need
202 to edit that policy (which is defined in
203 <filename>/etc/apparmor.d/lxc/lxc-default-with-nesting</filename>)
204- to uncomment the following line
205+ by uncommenting the following line:
206 <screen>
207 mount fstype=cgroup -> /sys/fs/cgroup/**,
208 </screen>
209@@ -1452,7 +1444,7 @@
210 </command>
211 </screen>
212
213- <para>A snapshot can be created using</para>
214+ <para>A snapshot can be created using:</para>
215 <screen>
216 <command>
217 sudo lxc-clone -s -o C1 -n C2
218@@ -1588,7 +1580,7 @@
219 specified by the <command>lxc.tty</command> variable, and is usually
220 set to 4. Those consoles are shown on <filename>/dev/ttyN</filename>
221 (for 1 &lt;= N &lt;= 4). To log into console 3 from the host,
222- use</para>
223+ use:</para>
224
225 <screen>
226 <command>

Subscribers

People subscribed via source and target branches