From d7ed452d699f19504a861caff187b72709afcd78 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Sun, 11 Nov 2018 15:30:17 -0500
Subject: [PATCH] GUACAMOLE-422: Update comments on timezone settings.

---
 src/protocols/rdp/rdp_settings.c |  5 ++++-
 src/protocols/ssh/settings.c     | 11 ++++++-----
 src/protocols/ssh/settings.h     |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 21114d44..f37c156e 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -358,7 +358,10 @@ enum RDP_ARGS_IDX {
     IDX_PRECONNECTION_BLOB,
 
     /**
-     * The timezone to pass through to the RDP connection.
+     * The timezone to pass through to the RDP connection, in IANA format, which
+     * will be translated into Windows formats.  See the following page for
+     * information and list of valid values:
+     * https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
      */
     IDX_TIMEZONE,
 
diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index 820da51e..962524ce 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -249,11 +249,12 @@ enum SSH_ARGS_IDX {
     IDX_LOCALE,
      
     /**
-     * The timezone that is passed from the client system to the
-     * remote server, or null if not specified.  If set, and allowed
-     * by the remote SSH server, the TZ environment variable will be
-     * set on the remote session, causing the session to be localized
-     * to the specified timezone.
+     * The timezone that is to be passed to the remote system, via the
+     * TZ environment variable.  By default, no timezone is forwarded
+     * and the timezone of the remote system will be used.  This
+     * setting will only work if the SSH server allows the TZ variable
+     * to be set.  Timezones should be in standard IANA format, see:
+     * https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
      */
     IDX_TIMEZONE,
 
diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h
index e4d99e14..baa634ad 100644
--- a/src/protocols/ssh/settings.h
+++ b/src/protocols/ssh/settings.h
@@ -253,6 +253,7 @@ typedef struct guac_ssh_settings {
      * environment variable.
      */
     char* locale;
+
     /** 
      * The client timezone to pass to the remote system.
      */