From 7462f8cf5a2b5a6065b4197068a9a1c2fe23f33d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 11 Aug 2004 11:02:39 +0000 Subject: [PATCH] Stefan Fiedler: small cleanups and typos fixed in config.in, config.hlp files diff -dur rock-src-orig/architecture/arm/config.hlp rock-src/architecture/arm/config.hlp [2004080923495630446] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3795 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/arm/config.hlp | 2 ++ architecture/powerpc/config.hlp | 3 ++ architecture/sparc/config.hlp | 2 +- architecture/x86/config.hlp | 3 ++ misc/jailing/config.hlp | 4 +-- misc/jailing/config.in | 2 +- package/alessandro/busybox/config.hlp | 4 +-- package/alessandro/dbmail/config.hlp | 2 +- package/alessandro/php/config.hlp | 16 +++++----- package/avm/bootsplash/config.in | 4 +-- package/base/bash/config.hlp | 2 +- package/base/perl5/config.hlp | 2 +- package/base/sysfiles/config.hlp | 2 +- package/gnome14/glib12/config.hlp | 2 +- package/gnome14/gtk+12/config.hlp | 4 +-- package/kde/kdelibs/config.in | 4 +-- package/kde/qt/config.in | 2 +- package/rene/vim/config.hlp | 3 +- package/sirkull/dansguardian/config.hlp | 3 +- package/tschmidt/unreal-ircd/config.hlp | 42 ++++++++++++------------- scripts/config.func | 8 +++-- scripts/config.hlp | 34 +++++++++++++------- scripts/config.in | 8 ++--- target/bootdisk/config.hlp | 4 +-- 24 files changed, 92 insertions(+), 70 deletions(-) diff --git a/architecture/arm/config.hlp b/architecture/arm/config.hlp index 0395a3acc..262f25ae8 100644 --- a/architecture/arm/config.hlp +++ b/architecture/arm/config.hlp @@ -27,3 +27,5 @@ ROCKCFG_ARM_ENDIANESS ROCKCFG_ARM_OPT Please select the CPU you want to optimise for. +ROCKCFG_ARM_OPT_ARCH + Please select the architecture you want to build for. diff --git a/architecture/powerpc/config.hlp b/architecture/powerpc/config.hlp index da67593d9..45349a92e 100644 --- a/architecture/powerpc/config.hlp +++ b/architecture/powerpc/config.hlp @@ -22,3 +22,6 @@ ROCKCFG_POWERPC_OPT Please select the CPU you want to optimise for. + +ROCKCFG_POWERPC_ISA + Please select the ISA (Instruction Set Architecture) you want to build for. diff --git a/architecture/sparc/config.hlp b/architecture/sparc/config.hlp index 6bf200a0c..a223cab67 100644 --- a/architecture/sparc/config.hlp +++ b/architecture/sparc/config.hlp @@ -26,7 +26,7 @@ ROCKCFG_SPARC_BITS with the glibc - and is so _not_ recommended!) ROCKCFG_SPARC_64BIT_KERNEL - This options controls whether to build a 64-Bit kernel. + This options controls whether to build a 64-bit kernel. ROCKCFG_SPARC_OPT Please select the CPU you want to optimise for. diff --git a/architecture/x86/config.hlp b/architecture/x86/config.hlp index d845df501..3f97bbd18 100644 --- a/architecture/x86/config.hlp +++ b/architecture/x86/config.hlp @@ -26,3 +26,6 @@ ROCKCFG_X86_OPT You can also choose to not optimise for any specific CPU. The resulting binaries will run on any x86-compatible CPU but with a significant loss in performance. + +ROCKCFG_X86_BITS + Select if you want to build 32-bit or 64-bit code. diff --git a/misc/jailing/config.hlp b/misc/jailing/config.hlp index bd9b611a2..9617979c5 100644 --- a/misc/jailing/config.hlp +++ b/misc/jailing/config.hlp @@ -24,11 +24,11 @@ MENU_JAILING Here you can set various options to run applications in a jail. ROCKCFG_JAILING - If selecetd Jailing support will be enabledl. + If selected jailing support will be enabled. ROCKCFG_BASEJAIL The option specifies the base directory for jailing. ROCKCFG_JAILING_LIBSAFE If selected libsafe support will be enabled for jails. - Libsafe is a library which is used te prevent buffor overflows. + Libsafe is a library which is used to prevent buffer overflows. diff --git a/misc/jailing/config.in b/misc/jailing/config.in index ba37de603..487db3525 100644 --- a/misc/jailing/config.in +++ b/misc/jailing/config.in @@ -27,7 +27,7 @@ menu_begin MENU_JAILING 'Chroot-Jailing Options' block_begin 2 text 'Base directory for jail' ROCKCFG_BASEJAIL jail if pkgcheck libsafe X ; then - bool 'Install and Enable libsafe in jails' \ + bool 'Install and enable libsafe in jails' \ ROCKCFG_JAILING_LIBSAFE 1 fi comment "-- Packages --" diff --git a/package/alessandro/busybox/config.hlp b/package/alessandro/busybox/config.hlp index eaa79f125..f52c70b95 100644 --- a/package/alessandro/busybox/config.hlp +++ b/package/alessandro/busybox/config.hlp @@ -24,8 +24,8 @@ MENU_PKG_BUSYBOX Here you will find options concerning BusyBox ROCKCFG_PKG_BUSYBOX_ET - Please check here if you want to build an emergency BusyBoxtoolkit. - This toolkit is staticaly linked and thus can be used even if other + Please check here if you want to build an emergency BusyBox toolkit. + This toolkit is statically linked and thus can be used even if other vital libraries such as the libc are damaged. ROCKCFG_PKG_BUSYBOX_ET_DIR diff --git a/package/alessandro/dbmail/config.hlp b/package/alessandro/dbmail/config.hlp index e8eac34aa..65472b578 100644 --- a/package/alessandro/dbmail/config.hlp +++ b/package/alessandro/dbmail/config.hlp @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- MENU_PKG_DBMAIL - Here you will find options concerning DBMail + Here you will find options concerning DBMail. ROCKCFG_PKG_DBMAIL_DB Please check here which backend you want DBMail to use. diff --git a/package/alessandro/php/config.hlp b/package/alessandro/php/config.hlp index 1c9d6bc35..94710bb3d 100644 --- a/package/alessandro/php/config.hlp +++ b/package/alessandro/php/config.hlp @@ -21,30 +21,30 @@ # --- ROCK-COPYRIGHT-NOTE-END --- MENU_PKG_PHP - Here you will find all options concerning PHP + Here you will find all options concerning PHP. ROCKCFG_PKG_PHP_FORCESHARED Please check here if you want to use shared libraries instead of PHP's built-in support for various applications. ROCKCFG_PKG_PHP_mysql - Please check here if you want to activate MySQL-support + Please check here if you want to activate MySQL support. ROCKCFG_PKG_PHP_postgresql - Please check here if you want to activate PostgreSQL-support + Please check here if you want to activate PostgreSQL support. ROCKCFG_PKG_PHP_openldap - Please check here if you want to activate OpenLDAP-support + Please check here if you want to activate OpenLDAP support. ROCKCFG_PKG_PHP_openssl - Please check here if you want to activate OpenSSL-support + Please check here if you want to activate OpenSSL support. ROCKCFG_PKG_PHP_mcrypt - Please check here if you want to activate libmcrypt-support + Please check here if you want to activate libmcrypt support. ROCKCFG_PKG_PHP_mhash - Please check here if you want to activate libmhash-support + Please check here if you want to activate libmhash support. ROCKCFG_PKG_PHP_gd - Please check here if you want to activate libgd-support + Please check here if you want to activate libgd support. diff --git a/package/avm/bootsplash/config.in b/package/avm/bootsplash/config.in index e5ecf3cb2..85e53b711 100644 --- a/package/avm/bootsplash/config.in +++ b/package/avm/bootsplash/config.in @@ -24,8 +24,8 @@ if pkgcheck bootsplash X then menu_begin MENU_PKG_BOOTSPLASH 'BOOTSPLASH Options' bool 'Patch the kernel with the bootsplash patch' ROCKCFG_KERNEL_BOOTSPLASH 0 - comment 'Please also activate the "Apply custom kernel build configuration settings' - comment ' (you find it under Linux Kernel Options)' + comment 'Please also activate the "Apply custom kernel build configuration"' + comment 'setting (you find it under Linux Kernel Options)' if [ $ROCKCFG_KERNEL_BOOTSPLASH == '1' ]; then for x in CONFIG_FBCON_SPLASHSCREEN ; do diff --git a/package/base/bash/config.hlp b/package/base/bash/config.hlp index a8df2c2dd..96ecde3a3 100644 --- a/package/base/bash/config.hlp +++ b/package/base/bash/config.hlp @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- MENU_PKG_BASH - Here you'll find options for Bourne Again Shell. + Here you'll find options for the Bourne Again Shell. ROCKCFG_PKG_BASH_PROGCOMP This feature allows the arguments to bash commands to use completion diff --git a/package/base/perl5/config.hlp b/package/base/perl5/config.hlp index b098b3cb5..b4689d409 100644 --- a/package/base/perl5/config.hlp +++ b/package/base/perl5/config.hlp @@ -36,4 +36,4 @@ ROCKCFG_PKG_PERL5_SUIDPERL Please check here if you want to install perl with the SUID bit set. ROCKCFG_PKG_PERL5_THREADS - Please chekc here if you want thread-support in perl. + Please check here if you want thread support in perl. diff --git a/package/base/sysfiles/config.hlp b/package/base/sysfiles/config.hlp index 0c625c055..8c72bb25c 100644 --- a/package/base/sysfiles/config.hlp +++ b/package/base/sysfiles/config.hlp @@ -29,4 +29,4 @@ ROCKCFG_SYSFILE_SHOW_ANSI_ISSUE Here you can preview the issue. Remember that if you are running ./scripts/Config in xterm the issue will probably look pretty crappy. If you really want to preview it correctly you should run ./scripts/Config in the - plain text linux console. Then it might look correctly ;-) + plain text linux console. Then it might look correct ;-) diff --git a/package/gnome14/glib12/config.hlp b/package/gnome14/glib12/config.hlp index 8a7a7d51e..481d0c623 100644 --- a/package/gnome14/glib12/config.hlp +++ b/package/gnome14/glib12/config.hlp @@ -24,4 +24,4 @@ MENU_PKG_GNOME14 Here you will find options for a few leftover Gnome 1.4 packages. ROCKCFG_PKG_GNOME14_CORE_PREFIX - Please select where you want to install the Gnome 1.4 Libraries. + Please select where you want to install the Gnome 1.4 libraries. diff --git a/package/gnome14/gtk+12/config.hlp b/package/gnome14/gtk+12/config.hlp index 7e8f64474..fa35294e5 100644 --- a/package/gnome14/gtk+12/config.hlp +++ b/package/gnome14/gtk+12/config.hlp @@ -21,10 +21,10 @@ # --- ROCK-COPYRIGHT-NOTE-END --- MENU_PKG_GTK12 - Here you will find options for gtk+1. + Here you will find options for gtk+12. ROCKCFG_PKG_GTK12_INPUT_LOCALE - gtk+1 is unable to remap fonts, and so uses only fonts corresponding + gtk+12 is unable to remap fonts, and so uses only fonts corresponding to your locale setting (if any). With the NLS disabled that doesn't make so much sense, because the gnome applications are not translated anyway. Check here if you want the locale fonts to be used only on diff --git a/package/kde/kdelibs/config.in b/package/kde/kdelibs/config.in index 1e9d2456b..4147fa6e8 100644 --- a/package/kde/kdelibs/config.in +++ b/package/kde/kdelibs/config.in @@ -22,9 +22,9 @@ if pkgcheck kdelibs X ; then menu_begin MENU_PKG_KDE32 'KDE 3.2 Package Options' - text 'Install prefix for KDE 3.2 Packages' \ + text 'Install prefix for KDE 3.2 packages' \ ROCKCFG_PKG_KDE32_CORE_PREFIX "opt/kde32" - bool 'Generate KDE Library Documentation' \ + bool 'Generate KDE library documentation' \ ROCKCFG_PKG_KDE32_APIDOX 0 menu_end fi diff --git a/package/kde/qt/config.in b/package/kde/qt/config.in index e7a8140f7..4cc9f5e61 100644 --- a/package/kde/qt/config.in +++ b/package/kde/qt/config.in @@ -23,7 +23,7 @@ if pkgcheck qt X then menu_begin MENU_PKG_QT 'Qt widget library Options' - bool 'Build static qt libraries (see help)' \ + bool 'Build static Qt libraries (see help)' \ ROCKCFG_PKG_QT_STATIC 0 menu_end fi diff --git a/package/rene/vim/config.hlp b/package/rene/vim/config.hlp index e1e012e7f..0c93a1626 100644 --- a/package/rene/vim/config.hlp +++ b/package/rene/vim/config.hlp @@ -24,7 +24,8 @@ MENU_PKG_VIM Here you will find options for everyone's favorite editor, vim :-) ROCKCFG_PKG_VIM_TWO_BINARIES - Please check here if you want separate CLI and GUI binaries. + Please check here if you want separate CLI (Command Line Interface) and + GUI binaries. ROCKCFG_PKG_VIM_FEATURES +tiny almost no features enabled, not even multiple windows. diff --git a/package/sirkull/dansguardian/config.hlp b/package/sirkull/dansguardian/config.hlp index 32f5dcb4c..404602eaf 100644 --- a/package/sirkull/dansguardian/config.hlp +++ b/package/sirkull/dansguardian/config.hlp @@ -2,7 +2,8 @@ ROCKCFG_PKG_DANSGUARDIAN_SQUID This adds the Follow X-Forwarded-For support to Squid. This is needed if you wish to use ACLs on clients accessing through DansGuardian. + ROCKCFG_PKG_DANSGUARDIAN_DGVIRUS This adds Virus Scanning support to DansGuardian using the - DansGuardian Anti-Virus Plugin. + DansGuardian Anti-Virus plugin. diff --git a/package/tschmidt/unreal-ircd/config.hlp b/package/tschmidt/unreal-ircd/config.hlp index 33b72db40..392881a8a 100644 --- a/package/tschmidt/unreal-ircd/config.hlp +++ b/package/tschmidt/unreal-ircd/config.hlp @@ -23,54 +23,54 @@ MENU_PKG_UNREAL Replaces the call to ./Config when building unreal-ircd by hand, options not available here directly can be passed - to configure with the extra-options field + to configure with the extra-options field. ROCKCFG_PKG_UNREAL_PREFIX Installation-Prefix for unreal-ircd. - The binary can be found as prefix/ircd - The configurationfiles reside in prefix/config - The shared modules reside in prefix/config/modules + The binary can be found as prefix/ircd. + The configuration files reside in prefix/config. + The shared modules reside in prefix/config/modules. ROCKCFG_PKG_UNREAL_MAXCON - Maximum number of parallel connections allowed for unreal-ircd - Must be greater or equal than 100 + Maximum number of parallel connections allowed for unreal-ircd. + Must be greater or equal than 100. ROCKCFG_PKG_UNREAL_MAXSENDQ - Maximum length of the senqueue, must be at least 1000 + Maximum length of the sendqueue, must be at least 1000. ROCKCFG_PKG_UNREAL_BUFPOOLS Amount of sendbuffers allowed. ROCKCFG_PKG_UNREAL_BACKLOG - listen backlog for unreal-ircd, sometimes values grater than 5 make + Listen backlog for unreal-ircd, sometimes values grater than 5 make problems. ROCKCFG_PKG_UNREAL_NICKHIST - how far do you want to keep the nickname history? + How far do you want to keep the nickname history? default: 2000 ROCKCFG_PKG_UNREAL_DMODS - allow unreal to use shared modules. - does not compile without, but the original ./Config gives this option - so here it is + Allow unreal to use shared modules. + Does not compile without, but the original ./Config gives this option + so here it is. ROCKCFG_PKG_UNREAL_ZIP - allows unreal to compress the server-link treaffic - saves your money and should be enabled + Allows unreal to compress the server-link traffic. + Saves your money and should be enabled. ROCKCFG_PKG_UNREAL_SSL - enables unreal to have ssl links and ssl clients - requires openSSL (not checked yet) + Enables unreal to have SSL links and SSL clients. + Requires openSSL (not checked yet). ROCKCFG_PKG_UNREAL_IP6 - compile an IPv6 ready unreal-ircd + Compile an IPv6 ready unreal-ircd. ROCKCFG_PKG_UNREAL_ANTISPOOF - enable unreal-ircds anti spoofing features + Enable unreal-ircds anti-spoofing features. ROCKCFG_PKG_UNREAL_HUB - sets wether unreal can act as hub (and leaf) - or if it can only be a leaf + Sets wether unreal can act as hub (and leaf) + or if it can only be a leaf. ROCKCFG_PKG_UNREAL_ADDITIONAL - additional configure options + Additional configure options. diff --git a/scripts/config.func b/scripts/config.func index 063e34171..7c82b3ad6 100644 --- a/scripts/config.func +++ b/scripts/config.func @@ -504,15 +504,17 @@ There is no help on '$1' available. This is the ROCK Linux $rockver Configuration Tool. Please read the build Documentation (Documentation/BUILD) -and the ROCK Linux Guide (Documentation/Guide/GUIDE.txt) before building ROCK Linux. More information can be found on the ROCK Linux Homepage: http://www.rocklinux.org/ -Subscribe to the mailing list by sending an e-mail with the -subject 'subscribe rock-linux' to ." +Information about the ROCK Linux mailing lists and the mailing +list archive can be found at: + + http://www.rocklinux.org/mail.html and + http://www.rocklinux.net/lurker/splash" # Ok let us find a help for the current item ... diff --git a/scripts/config.hlp b/scripts/config.hlp index 750766c76..b1031cac7 100644 --- a/scripts/config.hlp +++ b/scripts/config.hlp @@ -29,11 +29,11 @@ COMMENT_TARGET to use. COMMENT_BUILD_SYS_CONF - Here you can set some basic options for our beautifull distribution + Here you can set some basic options for our beautiful distribution build system. ROCKCFG_ARCH - This options controls the target architecture like alpha, ia64, mips, + This option controls the target architecture like alpha, ia64, mips, ppc, sparc or x86. ROCKCFG_CROSSBUILD @@ -55,8 +55,15 @@ ROCKCFG_TARGET A distribution using Diet LibC instead of GLibC. DietLibC is a light-weight C-Library useful for embedded systems and other low-memory devices. + - Epiam ROCK Linux: + A distribution specially for VIA Epiam processors. - Generic ROCK Linux: A generic, all-purpose distribution that has simply everything. + - ROCK Linux LiveCD: + A system that can boot and run directly from CD without the need + to install anything on a hard disk. + - ROCK Linux Video Player (lvp): + A distribution that works as a video player and boots from CD. - Minimal ROCK Linux: A basic system that has only minimally more than a LFS. - Reference-Build for creating *.cache files: @@ -65,6 +72,9 @@ ROCKCFG_TARGET and consolidate its various information. - ROCK Router Linux: This is a _very_ minimal system with only routing-capabilities. + - ROCK Linux Server: + This target is intended to build a not blown up server distribution + to install web-, mail-, fileserver or similar. ROCKCFG_PARALLEL Select this option if you want to perform a parallel build on several @@ -101,7 +111,7 @@ ROCKCFG_XTRACE log-files. ROCKCFG_SRC_TMPFS - Check here if you want package buids to use tmpfs instead of the regular + Check here if you want package builds to use tmpfs instead of the regular filesystem on which ROCK resides. ROCKCFG_SRC_TMPFS_OPT @@ -121,7 +131,7 @@ ROCKCFG_SRC_TMPFS_OPT else your system might crash or start swapping. ROCKCFG_SRC_TMPFS_LOG - Please enter the path to the tmpfs-logfile. + Please enter the path to the tmpfs logfile. ROCKCFG_EXPERT This button will enable a lot of additional configuration options. @@ -171,18 +181,18 @@ ROCKCFG_CONFOPT_FILE:0 Use "--without-option" to disable a feature Use "--option[=value]" to specify a custom option - The Build-Syste will always check whether the configure script supports + The Build-System will always check whether the configure script supports the options before the options is really passed as argument. COMMENT_FLIST - Please see the help for the choice-menu. + Please see the help for the choice menu. ROCKCFG_FLIST This help is taken from Rolling ROCK Issue #2 2003 The ROCK Linux build scripts auto-detect which files are created by a package build and use this information to create the package - file-list. There are three techniques which can be used to auto-detect + file list. There are three techniques which can be used to auto-detect this file list * flist-wrapper @@ -220,16 +230,16 @@ ROCKCFG_FLIST if no other system for creating the file list can be used. ROCKCFG_USE_CROSSCC - This option controls whether to use a pseudo-cross-compiler even - for native (non cross) builds. This is needed when the host and + This option controls whether to use a pseudo-cross compiler even + for native (non-cross) builds. This is needed when the host and target gcc or glibc differ in the ABI. THIS IS STRONGLY RECOMMENDED! ROCKCFG_DO_REBUILD_STAGE This options controls whether to rebuild all packages in the final - rebuild-stage. - Each and every package is rebuilt in Stage 9 once more and only then - are the binary-packages created. This has the advantage that + rebuild stage. + Each and every package is rebuilt in stage 9 once more and only then + are the binary packages created. This has the advantage that circular dependencies are resolved, but it also almost doubles the build time. In former times this was recommended - but nowadays this is only a diff --git a/scripts/config.in b/scripts/config.in index c58c53cc0..f8493d670 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -126,12 +126,12 @@ block_begin 3 ROCKCFG_ALWAYS_CLEAN 0 bool 'Create debug information (xtrace) for builds' ROCKCFG_XTRACE 0 - bool 'Use TMPFS for building packages' ROCKCFG_SRC_TMPFS 0 + bool 'Use tmpfs for building packages' ROCKCFG_SRC_TMPFS 0 if [ "$ROCKCFG_SRC_TMPFS" = 1 ] ; then block_begin comment '! WARNING: This feature can hang your system, if' comment '! you do not have enough virtual memory!' - text 'TMPFS mount options' ROCKCFG_SRC_TMPFS_OPT \ + text 'tmpfs mount options' ROCKCFG_SRC_TMPFS_OPT \ 'size=800M,nr_inodes=100k' bool 'Write tmpfs log to var/adm/rock-debug/tmpfslog.txt' \ ROCKCFG_SRC_TMPFS_LOG 0 @@ -320,7 +320,7 @@ break packages!' fi choice ROCKCFG_OPT size \ - smart 'Smart optimisiation using a profile database' \ + smart 'Smart optimisation using a profile database' \ bizarre 'Inverse smart optimisation (this is bizarre)' \ speed 'Hard optimise for speed (often pretty slow)' \ size 'Hard optimise for size (recommended)' \ @@ -330,7 +330,7 @@ break packages!' bool 'Create statically linked binaries' ROCKCFG_STATIC 0 bool 'Disable exceptions and rtti in C++' ROCKCFG_LIMITCXX 0 - bool 'Enable c-compiler multilib support' ROCKCFG_MULTILIB 0 + bool 'Enable C compiler multilib support' ROCKCFG_MULTILIB 0 bool 'Disable National Language Support' ROCKCFG_DISABLE_NLS 0 if [ "$ROCKCFG_DISABLE_NLS" = 1 ] ; then diff --git a/target/bootdisk/config.hlp b/target/bootdisk/config.hlp index b36c937ac..81ffee729 100644 --- a/target/bootdisk/config.hlp +++ b/target/bootdisk/config.hlp @@ -22,7 +22,7 @@ ROCKCFG_BOOTDISK_USEKISS - If this options is enabled the kiss shell is installed into the first - stage initrd of the bootdisk. This is helpful for unusal installations + If this option is enabled the kiss shell is installed into the first + stage initrd of the bootdisk. This is helpful for unusual installations and debugging.