SliTaz Repositories

     1.1 --- a/examples/config.site	Mon Mar 07 08:52:51 2011 +0100
     1.2 +++ b/examples/config.site	Mon Mar 07 08:02:53 2011 +0000
     1.3 @@ -1,33 +1,33 @@
     1.4 -# This file contains default option passed to ./configure at compile time.
     1.5 -# Variables are setted this way :
     1.6 +# This file contains default options passed to ./configure at compile time.
     1.7 +# Variables are set this way :
     1.8  # { [ "$var" = NONE ] || [ ! "$var" ] ; } && var=
     1.9 -# This is because config.site overwrite options passed directly in
    1.10 +# This is because config.site overwrites options passed directly in
    1.11  # configure, like ./configure --var=
    1.12  #
    1.13 -# Here, we don't want overwrite default configuration : we want to
    1.14 -# setup configure with default path only if nothing has been given
    1.15 +# Here, we don't want to overwrite the default configuration : we want to
    1.16 +# setup configure with a default path only if nothing has been given
    1.17  # on the configure command-line. This allow contributors to overwrite
    1.18 -# the defaults path filled here in the recipes.
    1.19 +# the default paths filled here by the recipes.
    1.20  #
    1.21 -# Path to the config.site is given to configure using the environnment
    1.22 +# Path to the config.site is given to configure using the environment
    1.23  # variable CONFIG_SITE
    1.24  # tazwok does that work before executing compile rules.
    1.25  #
    1.26 -# If you want to use you're own config.site, you can use :
    1.27 +# If you want to use your own config.site, you can use :
    1.28  # export CONFIG_SITE=path_to_my_config.site
    1.29  # in the compilation_rules of a receipt.
    1.30 -# It can be usefull if you want to share default configuration between
    1.31 +# It can be useful if you want to share a default configuration between
    1.32  # some groups of packages like GNOME or KDE ones.
    1.33  #
    1.34 -# To make tazwok configuration easier, we use variable from
    1.35 -# /etc/tazwok.conf here. Note that only concerns configure options :
    1.36 +# To make tazwok configuration easier, we use variables from
    1.37 +# /etc/tazwok.conf here. Note this only concerns configure options :
    1.38  # make flags (MAKEFLAGS, CFLAGS, CXXFLAGS and DESTDIR) are exported
    1.39 -# to environment variables; options setted here are thoses we can't
    1.40 -# export in environnment variables because it doesn't works.
    1.41 +# to environment variables; options set here are those we can't
    1.42 +# export environnment variables to because they don't work.
    1.43  
    1.44  # Some variable are prefixed by "${prefix}" instead of "${datarootdir}".
    1.45 -# For thoses case we use "${datadir}" because there's configure script
    1.46 -# generally don't know about "${datarootdir}" (too olds). 
    1.47 +# For those cases we use "${datadir}" because the configure script
    1.48 +# generally doesn't know about "${datarootdir}" (too old). 
    1.49  if echo "$localedir" | grep -q \${prefix}; then
    1.50  	localedir=$( echo "$localedir" | sed 's/${prefix}/${datarootdir}/')
    1.51  fi
    1.52 @@ -38,7 +38,7 @@
    1.53  	mandir=$( echo "$mandir" | sed 's/${prefix}/${datarootdir}/')
    1.54  fi
    1.55  
    1.56 -# Use default values if one of theses configure variable is not set.
    1.57 +# Use default values if one of these configure variables is not set.
    1.58  { [ "$prefix" = NONE ] || [ ! "$prefix" ] ; } && prefix=$default_prefix
    1.59  { [ "$datarootdir" = NONE ] || [ ! "$datarootdir" ] ; } && datarootdir=$default_datarootdir
    1.60  { [ "$datadir" = NONE ] || [ ! "$datadir" ] ; } && datadir=$datarootdir
    1.61 @@ -48,7 +48,7 @@
    1.62  { [ "$build" = NONE ] || [ ! "$build" ] ; } && build=$default_build
    1.63  { [ "$host" = NONE ] || [ ! "$host" ] ; } && host=$default_host
    1.64  
    1.65 -# Print information about theses variables.
    1.66 +# Print information about these variables.
    1.67  echo "prefix = $prefix
    1.68  datarootdir = $datarootdir
    1.69  datadir = $datadir
    1.70 @@ -59,5 +59,5 @@
    1.71  host = $host
    1.72  "
    1.73  
    1.74 -# config.site is used by tazwok to check that config.site script has been used.
    1.75 +# config.site is used by tazwok to check that the config.site script has been used.
    1.76  touch /tmp/config.site

     2.1 --- a/examples/tazwok.conf	Mon Mar 07 08:52:51 2011 +0100
     2.2 +++ b/examples/tazwok.conf	Mon Mar 07 08:02:53 2011 +0000
     2.3 @@ -1,9 +1,9 @@
     2.4  # tazwok.conf: Tazwok configuration file.
     2.5  #
     2.6  
     2.7 -# WOK_UPDATE_METHODE can be "tarball" or "hg"
     2.8 +# WOK_UPDATE_METHOD can be "tarball" or "hg"
     2.9  # tarball: download the full tarball and copy it into build-wok.
    2.10 -# hg: download only the new changes, need mercurial installed.
    2.11 +# hg: download only the new changes, needs mercurial installed.
    2.12  WOK_UPDATE_METHOD="hg"
    2.13  
    2.14  TARBALL_WOK="http://hg.slitaz.org/wok/archive/tip.tar.bz2"
    2.15 @@ -23,7 +23,7 @@
    2.16  # http://www.gentoo.org/doc/en/gcc-optimization.xml
    2.17  # http://en.gentoo-wiki.com/wiki/Safe_Cflags
    2.18  #
    2.19 -# Note : -pipe will be automatically disabled if you have less that
    2.20 +# Note : -pipe will be automatically disabled if you have less than
    2.21  # 512MB of free RAM to avoid gcc crashes.
    2.22  #
    2.23  # Default SliTaz flags - wide compatibility & optimized for i386 as it's the
    2.24 @@ -31,11 +31,11 @@
    2.25  #CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
    2.26  # Where ARCH=i386
    2.27  #
    2.28 -# Cook compatible packages partially optimized for you're own hardware :
    2.29 +# Cook compatible packages partially optimized for your own hardware :
    2.30  #CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
    2.31 -# Where ARCH=you're arch
    2.32 +# Where ARCH=your arch
    2.33  #
    2.34 -# Cook packages fully optimized for you're hardware - Warning, compatible only
    2.35 +# Cook packages fully optimized for your hardware - Warning, compatible only
    2.36  # with same hardware and newest of the same family :
    2.37  #CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
    2.38  CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
    2.39 @@ -83,17 +83,17 @@
    2.40  COMPRESSION="lzma"
    2.41  
    2.42  # Slitaz Toolchain : the tools used to compile all other packages.
    2.43 -# Toolchain packages doesn't need to be included as build_depends
    2.44 +# Toolchain packages don't need to be included as build_depends
    2.45  # because they are in the chroot by default. The order in this
    2.46  # variable is important : it's the compile order for the temporary
    2.47  # toolchain which can be used to recook the base chroot, then all
    2.48 -# the wok. Toolchain is compiled this way according the LFS book :
    2.49 +# the wok. Toolchain is compiled this way according to the LFS book :
    2.50  # First - binutils, GCC; at this point they are linked to the host system.
    2.51  # Second - the temp toolchain using the order defined in this variable.
    2.52 -# This toolchain is cross-compiled against a self-depend glibc.
    2.53 +# The toolchain is cross-compiled against a self-depending glibc.
    2.54  # Third - all the wok in normal order, including the toolchain packages.
    2.55  # This cook order is used only if glibc/binutils/gcc/linux-api-headers
    2.56 -# is updated to the next minor version or more (y.x.z -> y.x+1.z).
    2.57 +# are updated to the next minor version or more (y.x.z -> y.x+1.z).
    2.58  SLITAZ_TOOLCHAIN="linux-api-headers
    2.59  glibc
    2.60  binutils
    2.61 @@ -116,7 +116,7 @@
    2.62  automake
    2.63  lzma"
    2.64  
    2.65 -# Slitaz toolchain extra : package which are needed to cook other
    2.66 +# Slitaz toolchain extra : packages which are needed to cook others
    2.67  # but which are not in the core temporary toolchain.
    2.68  # Note : order is not important here.
    2.69  SLITAZ_TOOLCHAIN_EXTRA="tazpkg