From ca6bfeb2f2d94b7778e3f6e1f638035cb1da7009 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 23 Oct 2010 15:02:28 -0400 Subject: [PATCH] Documentation - Corrected use of "reportdateformat" in taskrc.5 to "dateformat.report". - Corrected duplicate comment in Config.cpp defaults. --- doc/man/taskrc.5 | 8 ++++---- src/Config.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/man/taskrc.5 b/doc/man/taskrc.5 index 1afc284e1..a4e9876cd 100644 --- a/doc/man/taskrc.5 +++ b/doc/man/taskrc.5 @@ -335,8 +335,8 @@ the 'history' report, for example, or 'export'. .B report.X.dateformat=m/d/Y This is a string of characters that define how taskwarrior formats date values. The precedence order for the configuration variable is report.X.dateformat then -reportdateformat then dateformat. While report.X.dateformat only formats the -due date in reports, reportdateformat formats the due date both in reports +dateformat.report then dateformat. While report.X.dateformat only formats the +due date in reports, dateformat.report formats the due date both in reports and "task info". If both of these are not set then dateformat will be applied to the due date. Entered dates as well as all other displayed dates in reports are formatted according to dateformat. @@ -392,7 +392,7 @@ M-D-Y would use for input and output 07-24-2009 .RE .RS -Examples for other values of reportdateformat: +Examples for other values of dateformat.report: .RE .RS @@ -850,7 +850,7 @@ criteria are displayed in the generated report. .TP .B report.X.dateformat This adds a dateformat to the report X that will be used by the "due date" -column. If it is not set then reportdateformat and dateformat will be used in +column. If it is not set then dateformat.report and dateformat will be used in this order. See the .B DATES section for details on the sequence placeholders. diff --git a/src/Config.cpp b/src/Config.cpp index f8b8a29ae..9be68ff93 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -85,7 +85,7 @@ std::string Config::defaults = "dateformat=m/d/Y # Preferred input and display date format\n" "dateformat.holiday=YMD # Preferred input date format for holidays\n" "dateformat.report=m/d/Y # Preferred display date format for reports\n" - "dateformat.annotation=m/d/Y # Preferred display date format for reports\n" + "dateformat.annotation=m/d/Y # Preferred display date format for annotations\n" "weekstart=Sunday # Sunday or Monday only\n" "displayweeknumber=yes # Show week numbers on calendar\n" "due=7 # Task is considered due in 7 days\n"