tweaked the default rc.conf a bit

Many env vars in rc.conf can stay unset in most cases, make this clear
by keeping them empty by default and recommend keeping them like that if
possible.

Signed-off-by: Tom Gundersen <teg@jklm.no>

2 files changed, 29 insertions, 28 deletions

diff --git a/rc.conf b/rc.conf
index d91dff7..414c535 100644
--- a/rc.conf
+++ b/rc.conf
@@ -6,10 +6,6 @@
 # LOCALIZATION
 # -----------------------------------------------------------------------
 #
-# 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
 #   in the hardware clock being left untouched (useful for virtualization)
 #   Note: Using "localtime" is discouraged, using "" makes hwclock fall back
@@ -19,15 +15,19 @@
 # KEYMAP: keymaps are found in /usr/share/kbd/keymaps
 # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US)
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
+# 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.
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.UTF-8"
-DAEMON_LOCALE="no"
 HARDWARECLOCK="UTC"
 TIMEZONE="Canada/Pacific"
-KEYMAP="us"
+KEYMAP=
 CONSOLEFONT=
 CONSOLEMAP=
+LOCALE=
+DAEMON_LOCALE="no"
 USECOLOR="yes"
 
 # -----------------------------------------------------------------------
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index e28e9ad..56a163f 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -22,38 +22,28 @@ hardware, networking and daemons.
 
 Localization[[L]]
 -----------------
-*LOCALE*::
-	This sets your system language, which will be used by all i18n-friendly applications and utilities.
-	See `locale -a` (or locale.gen) for available options. 	LANG in /etc/locale.conf takes precedence.
-	Default: "en_US.UTF-8"
-
-*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.
-	Default: "no"
+*TIMEZONE*::
+	Specifies your time zone. Possible time zones are the relative path to a zoneinfo file starting
+	from the directory /usr/share/zoneinfo. For example, a German timezone would be Europe/Berlin,
+	which refers to the file /usr/share/zoneinfo/Europe/Berlin.
+	Note: if unset, the value in /etc/localtime is used unchanged
+	Default: "Canada/Pacific"
 
 *HARDWARECLOCK*::
 	How to interpret/update the hardware clock. (used by hwclock)
 	Options:
-	    - "": fall back to the value in /var/lib/hwclock/adjfile.
-	    - "UTC": most robust, allows operating systems to abstract local time and ease DST. (recommended)
+	    - empty: fall back to the value in /var/lib/hwclock/adjfile, which defaults to UTC. (recommended)
+	    - "UTC": most robust, allows operating systems to abstract local time and ease DST.
 	    - "localtime": apply timezone (and DST) in hardwareclock: discouraged.
 	      Choose this if you dualboot with an OS which cannot handle UTC BIOS times correctly, like Windows.
 	    - any other value will result in the hardware clock being left untouched (useful for virtualization)
-	Default: "UTC"
-
-*TIMEZONE*::
-	Specifies your time zone. Possible time zones are the relative path to a zoneinfo file starting
-	from the directory /usr/share/zoneinfo. For example, a German timezone would be Europe/Berlin,
-	which refers to the file /usr/share/zoneinfo/Europe/Berlin.
-	Note: if unset, the value in /etc/localtime is used unchanged
-	Default: "Canada/Pacific"
+	Default: empty
 
 *KEYMAP*::
 	Defines the keymap to load with the loadkeys program on bootup.
 	Possible keymaps are found in /usr/share/kbd/keymaps. Please note that this
-	setting is only valid for your TTYs, not any graphical window managers or X!
-	Defalut: "us"
+	setting is only valid for your TTYs, not any graphical window managers or X.
+	Defalut: empty
 
 *CONSOLEFONT*::
 	Defines the console font to load with the setfont program on bootup.
@@ -69,6 +59,17 @@ Localization[[L]]
 	as it only affects the output of Linux console applications.
 	Default: empty
 
+*LOCALE*::
+	This sets your system language, which will be used by all i18n-friendly applications and utilities.
+	See `locale -a` (or locale.gen) for available options. 	LANG in /etc/locale.conf takes precedence.
+	If unset, it falls back to the C locale.
+	Default: empty
+
+*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.
+	Default: "no"
+
 *USECOLOR*::
 	use ANSI color sequences in startup messages
 	Default: "yes"