From 2e80ab98d72d7752f0aabc02eae1ffc8ab49be85 Mon Sep 17 00:00:00 2001
From: Gabriel Craciunescu <crazy@frugalware.org>
Date: Mon, 30 Oct 2017 18:49:03 +0100
Subject: [PATCH 1/2] locale.conf: explain what all the settings are about

---
 src/modules/locale/locale.conf | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/modules/locale/locale.conf b/src/modules/locale/locale.conf
index 824c8abeb..fd8e2ba04 100644
--- a/src/modules/locale/locale.conf
+++ b/src/modules/locale/locale.conf
@@ -1,7 +1,28 @@
 ---
+# This settings are used to set your default system time zone.
+# Time zones are usually located under /usr/share/zoneinfo and
+# provided by the 'tzdata' package of your Distribution.
+#
+# Distributions using systemd can list available
+# time zones by using the timedatectl command.
+#    timedatectl list-timezones
 region:                     "America"
 zone:                       "New_York"
 
-# GeoIP settings. Leave commented out to disable GeoIP.
-#localeGenPath:             "/etc/locale.gen"
+
+# System locales are detected in the following order:
+#
+# /usr/share/i18n/SUPPORTED
+#  localeGenPath ( when set )
+#   /etc/locale.gen
+#    'locale -a' output
+# Enable only when your Distribution is using an
+# custom path for locale.gen
+#localeGenPath:             "PATH_TO/locale.gen"
+
+# GeoIP based Language settings:
+# GeoIP need an working Internet connecion.
+# This can be managed from welcome.conf by adding
+# internet to the list of required conditions.
+# Leave commented out to disable GeoIP.
 #geoipUrl:                  "freegeoip.net"

From fc53438be973591a433bdaf48442ed3e5f0d08bb Mon Sep 17 00:00:00 2001
From: Gabriel Craciunescu <crazy@frugalware.org>
Date: Mon, 30 Oct 2017 19:21:51 +0100
Subject: [PATCH 2/2] locale.conf: fix localeGenPath comment

---
 src/modules/locale/locale.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/locale/locale.conf b/src/modules/locale/locale.conf
index fd8e2ba04..fdff51721 100644
--- a/src/modules/locale/locale.conf
+++ b/src/modules/locale/locale.conf
@@ -13,8 +13,7 @@ zone:                       "New_York"
 # System locales are detected in the following order:
 #
 # /usr/share/i18n/SUPPORTED
-#  localeGenPath ( when set )
-#   /etc/locale.gen
+#  localeGenPath (defaults to /etc/locale.gen if not set)
 #    'locale -a' output
 # Enable only when your Distribution is using an
 # custom path for locale.gen