- Include option to skip lilo only for lenny

- Fix whitespace problems with conditions in pkgsel section

1 files changed, 5 insertions, 9 deletions

diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 985f04ab0..318162bdd 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1210,15 +1210,11 @@ to be used easily on the kernel command line as well.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-<phrase condition="lenny">
+#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
 # If the desktop task is selected, install the kde and xfce desktops
 # instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop
-</phrase>
-<phrase condition="etch">
-#tasksel tasksel/first multiselect standard, kde-desktop
-</phrase>
+#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop</phrase><phrase condition="etch">
+#tasksel tasksel/first multiselect standard, kde-desktop</phrase>
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
@@ -1238,10 +1234,10 @@ to be used easily on the kernel command line as well.
 <informalexample role="example"><screen>
 # Grub is the default boot loader (for x86). If you want lilo installed
 # instead, uncomment this:
-#d-i grub-installer/skip boolean true
+#d-i grub-installer/skip boolean true<phrase condition="lenny">
 # To also skip installing lilo, and install no bootloader, uncomment this
 # too:
-#d-i lilo-installer/skip boolean true
+#d-i lilo-installer/skip boolean true</phrase>
 
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # if no other operating system is detected on the machine.