From ad4db314c1c91ad2d2aa0d60e34ac6872aaba165 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Wed, 13 Dec 2017 11:39:13 +0100
Subject: [PATCH] Daylight 'savings' spelling corrections.
---
lib/modules/Calendar.pmod/Timezone.pmod | 2 +-
lib/modules/Calendar.pmod/mkrules.pike | 2 +-
lib/modules/Mysql.pmod/SqlTable.pike | 2 +-
src/builtin.cmod | 2 +-
src/builtin_functions.c | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 6dfa05b70f..08bb8b57ac 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -1412,7 +1412,7 @@ class Runtime_timezone_compiler
}
// ----------------------------------------------------------------
-// Base class for daylight savings and war time rules
+// Base class for daylight-saving and war time rules
// ----------------------------------------------------------------
// ----------------------------------------------------------------
diff --git a/lib/modules/Calendar.pmod/mkrules.pike b/lib/modules/Calendar.pmod/mkrules.pike
index 4ea6341ee8..f9bf9fac0e 100644
--- a/lib/modules/Calendar.pmod/mkrules.pike
+++ b/lib/modules/Calendar.pmod/mkrules.pike
@@ -919,7 +919,7 @@ int main(int ac,array(string) am)
string TZrules_base=
#"// ----------------------------------------------------------------
-// Daylight savings and war time rules
+// Daylight-saving and war time rules
//
// NOTE: this file is generated by mkrules.pike;
// please do not edit manually /Mirar
diff --git a/lib/modules/Mysql.pmod/SqlTable.pike b/lib/modules/Mysql.pmod/SqlTable.pike
index fd889d515b..2535742678 100644
--- a/lib/modules/Mysql.pmod/SqlTable.pike
+++ b/lib/modules/Mysql.pmod/SqlTable.pike
@@ -65,7 +65,7 @@
//! @note
//! The handling of TIMESTAMP columns in MySQL (as of 5.1 at least)
//! through UNIX_TIMESTAMP and FROM_UNIXTIME has one problem if the
-//! active time zone uses daylight savings time:
+//! active time zone uses daylight-saving time:
//!
//! Apparently FROM_UNIXTIME internally formats the integer to a MySQL
//! date/time string, which is then parsed again to set the unix
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 4baa18e2c9..b13ab4c83b 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -372,7 +372,7 @@ PIKECLASS TM
/*! @decl int isdst
*!
- *! True if daylight savings are in effect. If this field is -1
+ *! True if daylight-saving is in effect. If this field is -1
*! (the default) it (and the timezone info) will be updated
*! automatically using the timezone rules.
*/
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 6fa3e71bd5..6f62edefa5 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -5682,9 +5682,9 @@ PMOD_EXPORT void f_gmtime(INT32 args)
*! @member int(0..365) "yday"
*! Day of the year.
*! @member int(0..1) "isdst"
- *! Is daylight savings time.
+ *! Is daylight-saving time active.
*! @member int "timezone"
- *! Offset from UTC, including daylight savings time adjustment.
+ *! Offset from UTC, including daylight-saving time adjustment.
*! @endmapping
*!
*! An error is thrown if the localtime(2) call failed on the system.
@@ -5693,7 +5693,7 @@ PMOD_EXPORT void f_gmtime(INT32 args)
*!
*! @note
*! Prior to Pike 7.5 the field @expr{"timezone"@} was sometimes not
- *! present, and was sometimes not adjusted for daylight savings time.
+ *! present, and was sometimes not adjusted for daylight-saving time.
*!
*! @seealso
*! @[Calendar], @[gmtime()], @[time()], @[ctime()], @[mktime()]
@@ -5976,7 +5976,7 @@ static int my_time_inverse (struct tm *target_tm, time_t *result, time_fn timefn
*! @member int(0..) "year"
*! Year since 1900.
*! @member int(0..1) "isdst"
- *! Is daylight savings time.
+ *! Is daylight-saving time active.
*! @member int "timezone"
*! The timezone offset from UTC in seconds. If left out, the time
*! will be calculated in the local timezone.
--
GitLab