Imported Upstream version 24.2

[rrq/maintain_lilo.git] / man / liloconfig.pod

diff --git a/man/liloconfig.pod b/man/liloconfig.pod
index ce1b31a3709ed6506d1f4811924e38afce797642..b5c91612eacc012fc9e6965bf18fc56c95c60287 100644 (file)
--- a/man/liloconfig.pod
+++ b/man/liloconfig.pod
@@ -2,8 +2,8 @@
 manpage:  LILOCONFIG
 section:  8
 title:    liloconfig documentation
-version:  24.1
-datum:    2014-10-13
+version:  24.2
+datum:    2015-11-22
 
 =encoding utf8
 
@@ -59,7 +59,8 @@ Lines in the configuration file /etc/lilo.conf:
 
   #large-memory
   lba32
-  boot = /dev/sda
+  #boot = /dev/sda
+  boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
   #root = /dev/sda1
   root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
   map = /boot/map
@@ -68,14 +69,12 @@ Lines in the configuration file /etc/lilo.conf:
   prompt
   timeout = 100
   vga = normal
+  #password = 
   #default = Linux
 
   ### LILO per-image section ###
 
-  #boot = /dev/sda
-  boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
-
-  image = /boot/vmlinuz-3.12-trunk-686
+  image = /boot/vmlinuz-3.17-trunk-686
       label = "Linux"
       #root = /dev/sda1
       #root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
@@ -83,9 +82,9 @@ Lines in the configuration file /etc/lilo.conf:
   #   restricted
   #   alias = 1
   #   optional
-      initrd = /boot/initrd.img-3.12-trunk-686
+      initrd = /boot/initrd.img-3.17-trunk-686
 
-  image = /boot/vmlinuz-3.2.0-4-686
+  image = /boot/vmlinuz-3.14-trunk-686
       label = "Linux Old"
       #root = /dev/sda1
       #root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
@@ -93,11 +92,11 @@ Lines in the configuration file /etc/lilo.conf:
   #   restricted
   #   alias = 2
   #   optional
-      initrd = /boot/initrd.img-3.2.0-4-686
+      initrd = /boot/initrd.img-3.14-trunk-686
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2011-2014 Joachim Wiedorn
+Copyright (C) 2011-2015 Joachim Wiedorn
 
 This script is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by 
@@ -106,7 +105,7 @@ the Free Software Foundation; either version 2 of the License, or
 
 =head1 AUTHOR
 
-B<lilconfig> was written by Joachim Wiedorn.
+B<liloconfig> was written by Joachim Wiedorn.
 
 This manual page was written by Joachim Wiedorn <joodevel at joonet.de>.