From: Michael Prokop Date: Sat, 23 Sep 2017 11:55:04 +0000 (+0200) Subject: Fix a bunch of typos X-Git-Tag: v0.31.1~8 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=81d68fd1cd4c828196882421dc42ec014007aa3f Fix a bunch of typos s/and and/and/ s/simplier/simpler/ s/dependancy/dependency/ s/mesages/messages/ s/retreive/retrieve/ s/to to/to/ s/specifed/specified/ --- diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 52541d1..e8862a6 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -451,7 +451,7 @@ installation process. Directory with lists of software packages to be installed or removed. The different classes describe what should find its way to your ISO. When running "grml-live -c GRMLBASE,GRML_SMALL,AMD64 ..." only the configuration of GRMLBASE, -GRML_SMALL and and AMD64 will be taken. If you use 'grml-live -c +GRML_SMALL and AMD64 will be taken. If you use 'grml-live -c GRMLBASE,GRML_SMALL,AMD64,FOOBAR ...' then the files of GRMLBASE, GRML_SMALL, AMD64 **plus** the files from FOOBAR will be taken. So just create a new class to adjust the package selection according to your needs. Please notice that the diff --git a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE index 80ffbe3..23b5763 100644 --- a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE +++ b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE @@ -11,7 +11,7 @@ # save-config mechanism, as init takes place (and reads the file # /etc/runlevel.conf) before restore-config can be executed at all. # If you want to customize the Grml boot sequence please either -# remaster the Grml ISO or (much simplier) just add your personal +# remaster the Grml ISO or (much simpler) just add your personal # stuff to the /etc/init.d/bootlocal.* scripts! ############################################################################ # Format: diff --git a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE index 23ac19c..ce17ae1 100755 --- a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE +++ b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE @@ -14,7 +14,7 @@ # prereq header {{{ # without this header booting will fail with: -# "PANIC: Circular dependancy. Exiting." +# "PANIC: Circular dependency. Exiting." PREREQ="" prereqs() { @@ -90,7 +90,7 @@ else GREEN="" # YELLOW: Descriptions YELLOW="" - # BLUE: System mesages + # BLUE: System messages BLUE="" # MAGENTA: Found devices or drivers MAGENTA="" diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs index d0baa3f..4999714 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs +++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs @@ -1,6 +1,6 @@ #!/bin/bash # Filename: ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/96-apt-listbugs -# Purpose: retreive list of bugreports of installed packages inside chroot +# Purpose: retrieve list of bugreports of installed packages inside chroot # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index af03a91..c069563 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -32,7 +32,7 @@ # PRESERVE_LOGFILE='1' # If package grml-live-db is installed the package selection and grml-live.log -# are being logged to to a sqlite database.Defaults to /var/log/grml-live.db +# are being logged to a sqlite database.Defaults to /var/log/grml-live.db # DPKG_DATABASE=/var/log/grml-live.db # Use your own database wrapper script for grml-live-db: diff --git a/templates/EFI/BOOT/grubx64.efi.signed b/templates/EFI/BOOT/grubx64.efi.signed index 7c31b00..d7d2117 100644 Binary files a/templates/EFI/BOOT/grubx64.efi.signed and b/templates/EFI/BOOT/grubx64.efi.signed differ diff --git a/templates/boot/isolinux/f8 b/templates/boot/isolinux/f8 index b4873a2..3307eda 100644 --- a/templates/boot/isolinux/f8 +++ b/templates/boot/isolinux/f8 @@ -3,7 +3,7 @@ 70 Grml configuration options ========================== - myconfig=/dev/ice -> search for config.tbz and grml.sh on specifed device + myconfig=/dev/ice -> search for config.tbz and grml.sh on specified device extract=/directory -> extract only provided directory of config archive netconfig=server.tld/path/to/config.tbz -> download specified archive and extract it