# HG changeset patch
# User Paul Issott <paul@slitaz.org>
# Date 1256387357 0
# Node ID 16c27ed1f2c91312e72e58a9de9f256ed7ef2f75
# Parent  75125fb176741aa5bf7fae9597d9834453588821
Tiny edits

diff -r 75125fb17674 -r 16c27ed1f2c9 COPYING
--- a/COPYING	Sun Oct 04 15:32:39 2009 +0200
+++ b/COPYING	Sat Oct 24 12:29:17 2009 +0000
@@ -26,12 +26,12 @@
 English
 -------
 
-slitaz-boot-scripts is free software; you can redistribute it and/or modify
+Slitaz-boot-scripts is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
-slitaz-boot-scripts is distributed in the hope that it will be useful, but
+Slitaz-boot-scripts is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
 more details.
diff -r 75125fb17674 -r 16c27ed1f2c9 README
--- a/README	Sun Oct 04 15:32:39 2009 +0200
+++ b/README	Sat Oct 24 12:29:17 2009 +0000
@@ -15,8 +15,8 @@
 English
 -------
 
-This package provide the boot scripts for SliTaz found in /etc/init.d with
-the main config file : /etc/rcS.conf. It also provides the default inittab and
+This package provides the boot scripts for SliTaz found in /etc/init.d with
+the main config file /etc/rcS.conf. It also provides the default inittab and
 the network config file used with network.sh. Please check /etc/init.d/README
 for more infomation.
 
diff -r 75125fb17674 -r 16c27ed1f2c9 bootlog
--- a/bootlog	Sun Oct 04 15:32:39 2009 +0200
+++ b/bootlog	Sat Oct 24 12:29:17 2009 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
-# tazbootlog: Display SliTaz boot log message.
+# tazbootlog: Display SliTaz boot log messages.
 #
 cat /var/log/dmesg.log /var/log/boot.log | sed "s/.\[3g.*\]R//"
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/README
--- a/etc/init.d/README	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/README	Sat Oct 24 12:29:17 2009 +0000
@@ -2,14 +2,14 @@
 ===============================================================================
 
 
-SliTaz doesn't use runlevels, inittab starts /etc/init.d/rcS, which uses the
+SliTaz doesn't use runlevels; inittab starts /etc/init.d/rcS, which uses the
 config file /etc/rcS.conf to run all scripts specified with $RUN_SCRIPTS, and
 then starts all daemons specified with $RUN_DAEMONS. The idea is to centralize
 the main system boot initialization in one configuration file. Init scripts can
 use the rc.functions file (part of the base-files) to call for the status
 function. Daemons can use /etc/daemons.conf to call for default options, in
-this way users/admins dont need to edit the daemon init script, located
-in /etc/init.d directory.
+this way users/admins don't need to edit the daemon init script located
+in the /etc/init.d directory.
 
 
 ===============================================================================
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/bootopts.sh	Sat Oct 24 12:29:17 2009 +0000
@@ -14,9 +14,9 @@
 }
 
 # Default user account without password (uid=1000). In live mode the option
-# user=name can be used, but user must be add before home= to have home dir.
-# This option is not handled by a loop and case like other and without
-# effect on a installed system.
+# user=name can be used, but user must be added before home= to have home dir.
+# This option is not handled by a loop and case like others and has no
+# effect on an installed system.
 if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then
 	if grep -q "user=" /proc/cmdline; then
 		USER=`cat /proc/cmdline | sed 's/.*user=\([^ ]*\).*/\1/'`
@@ -46,7 +46,7 @@
 	else
 		mkdir -p /home/$USER
 	fi
-	# set permissions.
+	# Set permissions.
 	chown -R $USER.$USER /home/$USER
 	# Slim default user.
 	if [ -f /etc/slim.conf ]; then
@@ -82,7 +82,7 @@
 			status ;;
 		home=*)
 			# Check for a specified home partition (home=*) and check for 
-			# user home dir. Note: home=usb is a shoter and easier way to
+			# user home dir. Note: home=usb is a shorter and easier way to
 			# have home=/dev/sda1.
 			DEVICE=${opt#home=}
 			[ "$DEVICE" = "usb" ] && DEVICE=sda1
@@ -94,7 +94,7 @@
 			USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
 			DEVID=$DEVICE
 			if [ -x /sbin/blkid ]; then
-				# Can be label, uuid or devname. DEVID give us first: /dev/name.
+				# Can be a label, uuid or devname. DEVID gives us first: /dev/name.
 				DEVID=`/sbin/blkid | grep $DEVICE | cut -d: -f1`
 				DEVID=${DEVID##*/}
 			fi
@@ -125,7 +125,7 @@
 				rm -rf /tmp/$USER-files
 			fi
 			# Install all packages in /home/boot/packages. In live CD and 
-			# USB mode the option home= mount the device on /home, so we 
+			# USB mode the option home= mounts the device on /home, so we 
 			# already have a boot directory with the Kernel and rootfs.
 			if [ -d "/home/boot/packages" ]; then
 				for pkg in /home/boot/packages/*.tazpkg
@@ -158,7 +158,7 @@
 				fi
 			done ;;
 		mount-packages)
-			# Mount and install packages-XXX.iso (usefull without Internet 
+			# Mount and install packages-XXX.iso (useful without Internet 
 			# connection).
 			PKGSIGN="LABEL=\"packages-$(cat /etc/slitaz-release)\" TYPE=\"iso9660\""
 			PKGDEV=$(blkid | grep "$PKGSIGN" | cut -d: -f1)
@@ -172,7 +172,7 @@
 			fi ;;
 		wm=*)
 			# Check for a Window Manager (for a flavor, default WM can be changed
-			# with boot option or with an addfile in /etc/X11/wm.default.
+			# with boot options or with an addfile in /etc/X11/wm.default.
 			WM=${opt#wm=}
 			mkdir -p /etc/X11
 			case $WM in
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/hwconf.sh
--- a/etc/init.d/hwconf.sh	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/hwconf.sh	Sat Oct 24 12:29:17 2009 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # /etc/init.d/hwconf.sh - SliTaz hardware configuration.
 #
-# This script configure the sound card and screen. Tazhw is used earlier
+# This script configures the sound card and screen. Tazhw is used earlier
 # at boot time to autoconfigure PCI and USB devices.
 #
 . /etc/init.d/rc.functions
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/i18n.sh
--- a/etc/init.d/i18n.sh	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/i18n.sh	Sat Oct 24 12:29:17 2009 +0000
@@ -1,12 +1,12 @@
 #!/bin/sh
-# /etc/init.d/i18n.sh - Internationalization initialisation.
+# /etc/init.d/i18n.sh - Internationalization initialization.
 #
-# This script configure SliTaz default keymap, locale, timezone.
+# This script configures SliTaz default keymap, locale, timezone.
 #
 . /etc/init.d/rc.functions
 
 # Locale config.
-echo "Cheking if /etc/locale.conf exist... "
+echo "Checking if /etc/locale.conf exists... "
 if [ -s "/etc/locale.conf" ]; then
 	echo -n "Locale configuration file exists... "
 	status
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/network.sh	Sat Oct 24 12:29:17 2009 +0000
@@ -40,7 +40,7 @@
 }
 
 Start() {
-	# For wifi. Users just have to enable it throught yes and usually
+	# For wifi. Users just have to enable it through yes and usually
 	# essid any will work and interface is autodetected.
 	if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then
 		if [ ! -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then
@@ -67,7 +67,7 @@
 	priority=5
 }
 EOF
-				echo "starting wpa_supplicant, for WPA-PSK"
+				echo "Starting wpa_supplicant for WPA-PSK"
 				wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE
 				;;
 			any|ANY) cat > /tmp/wpa.conf <<EOF
@@ -82,13 +82,13 @@
 	priority=5
 }
 EOF
-				echo "starting wpa_supplicant for any key type"
+				echo "Starting wpa_supplicant for any key type"
 				wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE
 				;;
 		esac
 		rm -f /tmp/wpa.conf
 		[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
-		echo -n "configuring $WIFI_INTERFACE..."
+		echo -n "Configuring $WIFI_INTERFACE..."
 		ifconfig $WIFI_INTERFACE up
 		if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then
 			iwconfig $WIFI_INTERFACE txpower on
@@ -119,7 +119,7 @@
 }
 
 
-# looking for arguments:
+# Looking for arguments:
 if [ -z "$1" ]; then
 	Boot
 	Start
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/init.d/rcS
--- a/etc/init.d/rcS	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/init.d/rcS	Sat Oct 24 12:29:17 2009 +0000
@@ -97,9 +97,9 @@
 status
 
 # Fast boot into X for HD install or custom Live system. We need 
-# keymap settings since Xvesa dump the console mapping and a correct
+# keymap settings since Xvesa dumps the console mapping and a correct
 # slim configuration for screen resolution. DBUS and HAL must also start
-# befor X session (manual login or autologin) to have devices in PCmanFM.
+# before X session (manual login or autologin) to have devices in PCmanFM.
 if [ "$FAST_BOOT_X" = "yes" ]; then
 	/etc/init.d/i18n.sh
 	/etc/init.d/dbus start
@@ -196,11 +196,11 @@
 	done
 fi
 
-# Be quiet on configuration to avoid message overwriting ncurses dialog
+# Be quiet on configuration to avoid messages overwriting ncurses dialog
 echo "0 0 0 0" > /proc/sys/kernel/printk
 
 # Detect PCI and USB devices with Tazhw from slitaz-tools. We load
-# kernel module only at first boot or in LiveCD mode.
+# kernel modules only at first boot or in LiveCD mode.
 if [ ! -s /var/lib/detected-modules ]; then
 	/sbin/tazhw init
 fi
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/network.conf
--- a/etc/network.conf	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/network.conf	Sat Oct 24 12:29:17 2009 +0000
@@ -13,14 +13,14 @@
 # Enable/disable static IP at boot time.
 STATIC="no"
 
-# Set IP address, and netmask for a static IP.
+# Set IP address and netmask for a static IP.
 IP="192.168.0.6"
 NETMASK="255.255.255.0"
 
 # Set route gateway for a static IP.
 GATEWAY="192.168.0.1"
 
-# Set DNS server. for a static IP.
+# Set DNS server for a static IP.
 DNS_SERVER="192.168.0.1"
 
 # Wifi connection.
diff -r 75125fb17674 -r 16c27ed1f2c9 etc/rcS.conf
--- a/etc/rcS.conf	Sun Oct 04 15:32:39 2009 +0200
+++ b/etc/rcS.conf	Sat Oct 24 12:29:17 2009 +0000
@@ -2,7 +2,7 @@
 # Config file used by /etc/init.d/rcS
 #
 
-# Use udev to populate /dev and handles hotplug events.
+# Use udev to populate /dev and handle hotplug events.
 UDEV="yes"
 
 # Clean up the system removing all tmp and pid files.
@@ -31,7 +31,7 @@
 
 # Initialization scripts to run at boot time. Boot order is important,
 # bootopts.sh (boot options) must start first, hwconf after network (tazx
-# need an active connexion to install Xorg) then you are free to choose.
+# needs an active connection to install Xorg), then you are free to choose.
 # Note that the local.sh script exists to let you quickly add some local startup
 # commands.
 RUN_SCRIPTS="bootopts.sh network.sh i18n.sh hwconf.sh local.sh"