Changed placeholder in README and installer.conf.

diff --git a/config/bootloader/installer.conf b/config/bootloader/installer.conf
index 64af13e33ea17d416bc9af60c0f251d4048119c9..02e8b5c8ce0f3242af8af607ad81d146fd9081a1 100644 (file)
--- a/config/bootloader/installer.conf
+++ b/config/bootloader/installer.conf
@@ -8,7 +8,7 @@ F1 boot.msg
 F2 options.msg
 
 MENU BACKGROUND splash.jpg
-MENU TITLE Welcome to NAME VERSION!
+MENU TITLE Welcome to @NAME@ @VERSION@!
 MENU COLOR border 0 #ffffffff #00000000
 MENU COLOR sel 7 #ffffffff #ff000000
 MENU COLOR title 0 #ffffffff #00000000
@@ -20,14 +20,14 @@ MENU hidden
 MENU hiddenrow 5
 
 LABEL install
-       MENU label ^Install a new NAME system
+       MENU label ^Install a new @NAME@ system
        MENU default
-       KERNEL SNAME0
-       APPEND initrd=initrd0 root=CDLABEL=NAME_VERSION rootfstype=iso9660 vga=791 splash mode=install quiet ro
+       KERNEL @SNAME@0
+       APPEND initrd=initrd0 root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 vga=791 splash mode=install quiet ro
 label rescue
-       MENU label ^Rescue installed NAME system
-       KERNEL SNAME0
-       APPEND initrd=initrd0 root=CDLABEL=NAME_VERSION rootfstype=iso9660 vga=791 splash mode=rescue quiet ro
+       MENU label ^Rescue installed @NAME@ system
+       KERNEL @SNAME@0
+       APPEND initrd=initrd0 root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 vga=791 splash mode=rescue quiet ro
 label local
        MENU label Boot from ^local drive
        LOCALBOOT 0xffff

diff --git a/config/cdrom/README.txt b/config/cdrom/README.txt
index 291ca34af048d42a2dd9274181bb732f14f1a63c..0709462cc2c4ed9c723c5bd66f1f349c0b83d841 100644 (file)
--- a/config/cdrom/README.txt
+++ b/config/cdrom/README.txt
@@ -1,10 +1,10 @@
-IPFire - Security for future (VERSION)
+@NAME@-@VERSION@ (@SLOGAN@)
 ------------------------------------------
 
 Installation
 ------------
 
-Please read the IPFire Installation manual before installing the firewall.
+Please read the @NAME@ Installation manual before installing the firewall.
 This document is located on our wiki (http://wiki.ipfire.org/Installation)
 but temporarily only available in german. It will guide you through
 the installation process and will help you make the necessary
@@ -13,7 +13,7 @@ decisions during the installation process.
 License
 -------
 
-IPFire is licensed under the terms of the GPL (Version 3).
+@NAME@ is licensed under the terms of the GPL (Version 3).
 Please read the file COPYING for more information on the license.
 
 
@@ -21,8 +21,8 @@ Disclaimer of Warranty
 ----------------------
 
 Users of this software must accept this disclaimer of warranty:  "This
-software is supplied AS IS. IPFire disclaims all warranties, expressed
+software is supplied AS IS. @NAME@ disclaims all warranties, expressed
 or implied, including, without limitation, the warranties of merchantability
-and of fitness for any purpose. IPFire assumes no liability for
+and of fitness for any purpose. @NAME@ assumes no liability for
 damages, direct or consequential, which may result from the use of this
 software."