Banner: "and contributors" is just too long; try "et al"

Impact: aestetics

Change "and contributors" to "et al" so that the message actually fits
on one line.  This is unfortunate, but what can you do...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/core/extlinux.asm b/core/extlinux.asm
index 5c6c023..963dd8b 100644 (file)
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -1553,7 +1553,7 @@ build_curdir_str:
                section .data
 copyright_str   db ' Copyright (C) 1994-'
                asciidec YEAR
-               db ' H. Peter Anvin and contributors', CR, LF, 0
+               db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
                db 'a key to continue.', CR, LF, 0
 config_name    db 'extlinux.conf',0            ; Unmangled form

diff --git a/core/isolinux.asm b/core/isolinux.asm
index 2da96d4..f87176b 100644 (file)
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -1029,7 +1029,7 @@ writestr_early    equ writestr
 syslinux_banner        db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0
 copyright_str   db ' Copyright (C) 1994-'
                asciidec YEAR
-               db ' H. Peter Anvin and contributors', CR, LF, 0
+               db ' H. Peter Anvin et al', CR, LF, 0
 isolinux_str   db 'isolinux: ', 0
 %ifdef DEBUG_MESSAGES
 startup_msg:   db 'Starting up, DL = ', 0

diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index b05a7e1..7e67da1 100644 (file)
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -2056,7 +2056,7 @@ getfatsector:
                section .data
 copyright_str   db ' Copyright (C) 1994-'
                asciidec YEAR
-               db ' H. Peter Anvin and contributors', CR, LF, 0
+               db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
                db 'a key to continue.', CR, LF, 0
 syslinux_cfg1  db '/boot'                      ; /boot/syslinux/syslinux.cfg

diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 6a38e5f..5c3de48 100644 (file)
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -2657,7 +2657,7 @@ writestr_early    equ writestr
 
 copyright_str   db ' Copyright (C) 1994-'
                asciidec YEAR
-               db ' H. Peter Anvin and contributors', CR, LF, 0
+               db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed db CR, LF, 'Boot failed: press a key to retry, or wait for reset...', CR, LF, 0
 bailmsg                equ err_bootfailed
 err_nopxe      db "No !PXE or PXENV+ API found; we're dead...", CR, LF, 0

diff --git a/memdisk/setup.c b/memdisk/setup.c
index 1939a69..8765fd7 100644 (file)
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -20,7 +20,7 @@
 const char memdisk_version[] =
 "MEMDISK " VERSION_STR " " DATE;
 const char copyright[] =
-"Copyright " FIRSTYEAR "-" YEAR_STR " H. Peter Anvin and contributors";
+"Copyright " FIRSTYEAR "-" YEAR_STR " H. Peter Anvin et al";
 
 extern const char _binary_memdisk_chs_bin_start[];
 extern const char _binary_memdisk_chs_bin_end[];