diff --git a/doc/holidays/holidays.en-US b/doc/holidays/holidays.en-US index d3f4a5d5..5d767efc 100644 --- a/doc/holidays/holidays.en-US +++ b/doc/holidays/holidays.en-US @@ -1,4 +1,4 @@ -# Holiday data provided by Holidata.net +# Holiday data provided by holidata.net # Generated 2016-11-06T08:20:37 define holidays: diff --git a/doc/holidays/refresh b/doc/holidays/refresh index aa2d5fc7..09960077 100755 --- a/doc/holidays/refresh +++ b/doc/holidays/refresh @@ -53,7 +53,7 @@ def update_locales(locales, regions, years): for locale in locales: with open("holidays.%s" % locale, "w") as fh: - fh.write('# Holiday data provided by Holidata.net\n') + fh.write('# Holiday data provided by holidata.net\n') fh.write('# Generated ' + time.strftime('%Y-%m-%dT%H:%M:%S') + '\n\n') fh.write('define holidays:\n') fh.write(' ' + locale + ':\n') @@ -79,7 +79,7 @@ def update_locales(locales, regions, years): except HTTPError as e: if e.code == 404: - print("Holidata.net does not have data for %s, for %d." % (locale, year)) + print("holidata.net does not have data for %s, for %d." % (locale, year)) else: print(e.code, e.read()) diff --git a/doc/report.summary.txt b/doc/report.summary.txt index 72398c79..fc1dfdcf 100644 --- a/doc/report.summary.txt +++ b/doc/report.summary.txt @@ -36,7 +36,7 @@ W17 2016-04-29 Fri Research, C17, Dept Meeting, Planning 7:59 Total 31:11 -(total by tag: Reasearch) +(total by tag: Research) Tags Wk Date Day Start End Time Sub --------------- --- ---------- --- ----- ----- ----- ----- diff --git a/src/Database.cpp b/src/Database.cpp index 81ba6a04..bf7bf936 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -159,7 +159,7 @@ void Database::deleteInterval (const Interval& interval) //////////////////////////////////////////////////////////////////////////////// // The algorithm to modify an interval is first to find and remove it from the // Datafile, then add it back to the right Datafile. This is because -// modifїcation may involve changing the start date, which could mean the +// modification may involve changing the start date, which could mean the // Interval belongs in a different file. void Database::modifyInterval (const Interval& from, const Interval& to) { @@ -171,7 +171,7 @@ void Database::modifyInterval (const Interval& from, const Interval& to) //////////////////////////////////////////////////////////////////////////////// // The _txn member is a reference count, allowing multiple nested transactions. -// This accomodates the Database::modifyInterval call, that in turn calls +// This accommodates the Database::modifyInterval call, that in turn calls // ::addInterval and ::deleteInterval. void Database::undoTxnStart () { diff --git a/src/Exclusion.cpp b/src/Exclusion.cpp index 2ee02be9..e4b4c087 100644 --- a/src/Exclusion.cpp +++ b/src/Exclusion.cpp @@ -135,7 +135,7 @@ std::vector Exclusion::ranges (const Range& range) const Datetime end = start; ++end; - // Now that 'start' and 'end' respresent the correct day, compose a set + // Now that 'start' and 'end' represent the correct day, compose a set // of Range objects for each time block. for (unsigned int block = 2; block < _tokens.size (); ++block) { diff --git a/src/init.cpp b/src/init.cpp index e282b542..3a256eaa 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -259,7 +259,7 @@ int dispatchCommand ( std::string command = cli.getCommand (); if (command != "") { - // These signatures are æxpected to be all different, therefore no + // These signatures are expected to be all different, therefore no // command to fn mapping. if (command == "cancel") status = CmdCancel ( rules, database ); else if (command == "config") status = CmdConfig (cli, rules, database ); diff --git a/test/bash_tap_ti.sh b/test/bash_tap_ti.sh index 2f41f97e..ac7b0710 100644 --- a/test/bash_tap_ti.sh +++ b/test/bash_tap_ti.sh @@ -26,8 +26,8 @@ function setup_cfg { function find_timew_binary { # $bashtap_org_pwd is set in bash_tap.sh. It is the directory the parent script is - # run from. Check for the tiemw binary relative to that directory. - # Do not use the system "tiemw" if no local one is found, error out instead. + # run from. Check for the timew binary relative to that directory. + # Do not use the system "timew" if no local one is found, error out instead. for t in "${bashtap_org_pwd}/timew" "${bashtap_org_pwd}/src/timew" "${bashtap_org_pwd}/../timew" "${bashtap_org_pwd}/../src/timew" "${bashtap_org_pwd}/../build/src/timew"; do if [ -f "$t" ] && [ -x "$t" ]; then t_abs=$(bashtap_get_absolute_path "$t") diff --git a/test/data.t.cpp b/test/data.t.cpp index 3ac2d4f5..4aa2102a 100644 --- a/test/data.t.cpp +++ b/test/data.t.cpp @@ -142,7 +142,7 @@ int main (int, char**) // exc [---) [---) [---) // output [-----) [---) [... test_flatten (t, - "[6] (inc) - (1 overlapping exc, 2 enclused exc) = (3 inc)", + "[6] (inc) - (1 overlapping exc, 2 enclosed exc) = (3 inc)", "inc 20160523T100000Z # foo", {{Datetime ("20160523T080000Z"), Datetime ("20160523T120000Z")}, {Datetime ("20160523T160000Z"), Datetime ("20160523T170000Z")}, @@ -272,7 +272,7 @@ int main (int, char**) t.ok (r1.end == Datetime ("20160502T000000"), "getFullDay 2016-05-01T20:31:23 -> end 2016-05-02T00:00:00"); // std::vector subtractRanges (const Range&, const std::vector &, const std::vector &); - // Subtract three non-overlapping ranges from a full day, yielding two resultant rangeṡ. + // Subtract three non-overlapping ranges from a full day, yielding two resultant ranges. Range limit (Datetime ("20160101T000000"), Datetime ("20160101T235959")); std::vector exclusions = {{Datetime ("20160101T000000"), Datetime ("20160101T080000")}, {Datetime ("20160101T120000"), Datetime ("20160101T130000")}, diff --git a/test/problems b/test/problems index 3e739422..e87e0c7e 100755 --- a/test/problems +++ b/test/problems @@ -143,5 +143,5 @@ if __name__ == "__main__": print(color(expected_str, "yellow")) print_category(expected) - # If we encoutered any failures, return non-zero code + # If we encountered any failures, return non-zero code sys.exit(1 if int(error_int) or int(unexpected_int) else 0)