Merge branch 'master' of git://projects.archlinux.org/initscripts2011.10.3

Conflicts:
	PKGBUILD

1 files changed, 7 insertions, 3 deletions

diff --git a/rc.conf b/rc.conf
index 418f607..f27222b 100644
--- a/rc.conf
+++ b/rc.conf
@@ -7,6 +7,7 @@
 # -----------------------------------------------------------------------
 #
 # LOCALE: available languages can be listed with the 'locale -a' command
+#   LANG in /etc/locale.conf takes precedence
 # DAEMON_LOCALE: If set to 'yes', use $LOCALE as the locale during daemon
 # startup and during the boot process. If set to 'no', the C locale is used.
 # HARDWARECLOCK: set to "", "UTC" or "localtime", any other value will result
@@ -113,7 +114,10 @@ NETWORK_PERSIST="no"
 #   - prefix a daemon with a ! to disable it
 #   - prefix a daemon with a @ to start it up in the background
 #
-# If something other takes care of your hardware clock (ntpd, dual-boot...)
-# you should disable 'hwclock' here.
+# If you are sure nothing else touches your hardware clock (such as ntpd or
+# a dual-boot), you might want to enable 'hwclock'. Note that this will only
+# make a difference if the hwclock program has been calibrated correctly.
 #
-DAEMONS=(hwclock syslog-ng network netfs crond)
+# If you use a network filesystem you should enable 'netfs'.
+#
+DAEMONS=(syslog-ng network crond)