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

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

This looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/installation.xml'
2--- serverguide/C/installation.xml 2015-02-13 16:06:39 +0000
3+++ serverguide/C/installation.xml 2015-04-24 03:46:19 +0000
4@@ -135,7 +135,7 @@
5 <itemizedlist>
6 <listitem>
7 <para>
8- First, download and burn the appropriate ISO file from the <ulink url="http://www.ubuntu.com/download/server/download">
9+ Download and burn the appropriate ISO file from the <ulink url="http://www.ubuntu.com/download/server/download">
10 Ubuntu web site</ulink>.
11 </para>
12 </listitem>
13@@ -158,7 +158,7 @@
14 </listitem>
15 <listitem>
16 <para>
17- The installer asks for which language it should use.
18+ The installer asks which language it should use.
19 Afterwards, you are asked to select your location.
20 </para>
21 </listitem>
22@@ -188,7 +188,7 @@
23 </listitem>
24 <listitem>
25 <para>
26- After the user settings have been completed, you will be asked to encrypt your
27+ After the user settings have been completed, you will be asked if you want to encrypt your
28 <filename role="directory">home</filename> directory.
29 </para>
30 </listitem>
31@@ -199,7 +199,7 @@
32 </listitem>
33 <listitem>
34 <para>
35- You can then choose from several options to configure the hard drive layout. Afterwards you are asked for
36+ You can then choose from several options to configure the hard drive layout. Afterwards you are asked
37 which disk to install to. You may get confirmation prompts before rewriting the partition table or setting up
38 LVM depending on disk layout. If you choose LVM, you will be asked for the size of the root logical volume.
39 For advanced disk options see <xref linkend="advanced-installation"/>.
40@@ -233,7 +233,7 @@
41 <para>
42 <emphasis>Manage the system with Landscape</emphasis>: Landscape is a paid service provided
43 by Canonical to help manage your Ubuntu machines. See the
44- <ulink url="http://www.canonical.com/projects/landscape">Landscape</ulink> site for details.
45+ <ulink url="http://landscape.canonical.com/">Landscape</ulink> site for details.
46 </para>
47 </listitem>
48 </itemizedlist>
49@@ -1233,7 +1233,7 @@
50 <title>Configuration</title>
51
52 <para>
53- Edit <filename>/etc/default/kdump-tool</filename> by including the following line:
54+ Edit <filename>/etc/default/kdump-tools</filename> by including the following line:
55 <programlisting>
56 USE_KDUMP=1
57 </programlisting>

Subscribers

People subscribed via source and target branches