summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-04-04 00:49:51 +0100
committerMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-04-04 00:49:51 +0100
commit8c8c6d8d23f48887896e727dde2a4e77e481724e (patch)
tree609406866fe326abd3cf70afa4a5df9ba8d878f6
parentf562ef2b8cfcb74938e569cf984cf3baf6ab87fd (diff)
downloadbootloader-utils-8c8c6d8d23f48887896e727dde2a4e77e481724e.tar
bootloader-utils-8c8c6d8d23f48887896e727dde2a4e77e481724e.tar.gz
bootloader-utils-8c8c6d8d23f48887896e727dde2a4e77e481724e.tar.bz2
bootloader-utils-8c8c6d8d23f48887896e727dde2a4e77e481724e.tar.xz
bootloader-utils-8c8c6d8d23f48887896e727dde2a4e77e481724e.zip
Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r819 | dmorgan | 2011-04-04 00:49:51 +0100 (Mon, 04 Apr 2011) | 1 line Import bootloader-utils ------------------------------------------------------------------------
-rw-r--r--detectloader.83
-rwxr-xr-x[-rw-r--r--]kheader.pl0
2 files changed, 2 insertions, 1 deletions
diff --git a/detectloader.8 b/detectloader.8
index 366bce8..928009f 100644
--- a/detectloader.8
+++ b/detectloader.8
@@ -3,10 +3,11 @@
detectloader \- Detect what type of loader you have on your disk.
.SH LIMITATION
.PP
-Supports only grub, lilo, and yaboot (the boot loaders we use for \fBMandriva
+Supports only grub, lilo, and yaboot (the boot loaders we use for \fBMageia
Linux\fR). Patches welcome for other boot loaders.
.SH COPYRIGHT
Copyright \(co 1999-2004 Mandriva.
+Copyright \(co 2010-2011 Mageia.
.PP
This is free software; see the source for copying conditions. There
is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
diff --git a/kheader.pl b/kheader.pl
index 8dbf935..8dbf935 100644..100755
--- a/kheader.pl
+++ b/kheader.pl