Merge branch '2.2.0' of tasktools.org:task into 2.2.0

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,3 +168,4 @@ suggestions:
   trHD
   Benjamin Weber
   alparo
+

ChangeLog

@@ -81,6 +81,8 @@ 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).
+ + 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.

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.
 

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.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////