From 015e7ee3331ededee37dd68a7e9743b93605b05a Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Thu, 5 Apr 2018 10:31:04 -0300
Subject: [PATCH] Bug 20123: Make the timezone entry empty and uncommented by
 default

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 debian/templates/koha-conf-site.xml.in | 7 ++++---
 etc/koha-conf.xml                      | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 1dc429989b..21348ae6d4 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -345,9 +345,10 @@ __END_SRU_PUBLICSERVER__
      <partner_code>ILLLIBS</partner_code>
  </interlibrary_loans>
 
- <!-- The timezone setting can let you force the timezone for this instance to be something other then the local timezone of the server
- <timezone>Antarctica/South_Pole</timezone>
- -->
+ <!-- The timezone setting can let you force the timezone for this
+      instance to be something other then the local timezone of the
+      server. e.g. Antarctica/South_Pole -->
+ <timezone></timezone>
 
 </config>
 </yazgfs>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 7197e6dce1..5bcd521caf 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -176,9 +176,10 @@ __PAZPAR2_TOGGLE_XML_POST__
      <partner_code>ILLLIBS</partner_code>
  </interlibrary_loans>
 
- <!-- The timezone setting can let you force the timezone for this instance to be something other then the local timezone of the server
- <timezone>Antarctica/South_Pole</timezone>
- -->
+ <!-- The timezone setting can let you force the timezone for this
+      instance to be something other then the local timezone of the
+      server. e.g. Antarctica/South_Pole -->
+ <timezone></timezone>
 
 </config>
 </yazgfs>
-- 
2.39.5