From 7fc7093f6825c52ff2474ee396fe4c26dfba1547 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 26 Feb 2013 16:33:12 -0500
Subject: [PATCH 1/2] Bug #1183

- Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
---
 AUTHORS                | 2 ++
 ChangeLog              | 1 +
 src/columns/Column.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4d93bc1f8..5a85ff4e1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -167,3 +167,5 @@ suggestions:
   trHD
   Benjamin Weber
   alparo
+  Jakub Wilk
+
diff --git a/ChangeLog b/ChangeLog
index d86194fd5..6a4679495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ Bugs
  + Fixed bug #1154, which now allows priorities to be specified in any case.
  + Fixed bug #1178, which included binary libraries in the released source
    package (thanks to Jakub Wilk).
+ + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
  + Improved hyphenation by splitting on commas (even if no whitespace after).
    Leads to better output of, for example, 'task show', where comma-separated
    lists are common.
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index be91e942f..6cd16a29d 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -301,28 +301,28 @@ bool Column::validate (std::string& input)
 // No L10N.
 void Column::measure (const std::string&, unsigned int&, unsigned int&)
 {
-  throw std::string ("Virtual method Column::measure not overriden.");
+  throw std::string ("Virtual method Column::measure not overridden.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // No L10N.
 void Column::measure (Task&, unsigned int&, unsigned int&)
 {
-  throw std::string ("Virtual method Column::measure not overriden.");
+  throw std::string ("Virtual method Column::measure not overridden.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // No L10N.
 void Column::render (std::vector <std::string>&, const std::string&, int, Color&)
 {
-  throw std::string ("Virtual method Column::render not overriden.");
+  throw std::string ("Virtual method Column::render not overridden.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // No L10N.
 void Column::render (std::vector <std::string>&, Task&, int, Color&)
 {
-  throw std::string ("Virtual method Column::render not overriden.");
+  throw std::string ("Virtual method Column::render not overridden.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 7327b0d537c07bdaf550b0286195a8dda0600828 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 26 Feb 2013 16:37:57 -0500
Subject: [PATCH 2/2] Bug #1184

- Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
---
 AUTHORS           | 2 +-
 ChangeLog         | 1 +
 doc/man/task.1.in | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5a85ff4e1..8099eab3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -81,6 +81,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Justin Forest
   Vincent Petithory
   Rainer Müller
+  Jakub Wilk
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -167,5 +168,4 @@ suggestions:
   trHD
   Benjamin Weber
   alparo
-  Jakub Wilk
 
diff --git a/ChangeLog b/ChangeLog
index 6a4679495..8092dc729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@ Bugs
  + Fixed bug #1178, which included binary libraries in the released source
    package (thanks to Jakub Wilk).
  + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
+ + Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
  + Improved hyphenation by splitting on commas (even if no whitespace after).
    Leads to better output of, for example, 'task show', where comma-separated
    lists are common.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 013a88f0f..c79146814 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -983,7 +983,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
 .B task rc:<path-to-alternate-file> ...
 Specifies an alternate configuration file.
 
-.TP TASKRC=/tmp/.taskrc task ..
+.TP
+.B TASKRC=/tmp/.taskrc task ..
 The environment variable overrides the default and the command line
 specification of the .taskrc file.