doing 2.1.24 → 2.1.28

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.24
+v2.1.28
 
 === Global Options
 === --config_file arg
@@ -90,11 +90,12 @@ Add a new section to the "doing" file
 ==== Command: <tt>again|resume </tt>
 Repeat last entry as new entry
 
-This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time
+This command is designed to allow multiple time intervals to be created
+           for an entry by duplicating it with a new start (and end, eventually) time
 ===== Options
 ===== -b|--back|--started DATE_STRING
 
-Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]
+Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
 
 [Default Value] None
 
@@ -103,7 +104,7 @@ Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]
 
 Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -112,7 +113,7 @@ Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --in SECTION_NAME
@@ -124,7 +125,7 @@ Add new entry to section (default: same section as repeated entry)
 
 ===== -n|--note TEXT
 
-Add a note
+Include a note
 
 [Default Value] None
 
@@ -138,34 +139,40 @@ Get last entry from a specific section
 
 ===== --search QUERY
 
-Repeat last entry matching search. Surround with
-  slashes for regex (e.g. "/query/"), start with a single quote for exact match ("'query").
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
 
 
+===== -X|--noauto
+Exclude auto tags and default tags
+
+
+
 ===== --ask
 Prompt for note via multi-line input
 
 
 
 ===== -e|--editor
-Edit duplicated entry with vim before adding
+Edit entry with vim
 
 
 
@@ -175,7 +182,7 @@ Select item to resume from a menu of matching entries
 
 
 ===== --not
-Resume items that *don't* match search/tag filters
+Repeat items that *don't* match search/tag filters
 
 
 
@@ -192,19 +199,25 @@ or start with an "@" to move entries matching a tag.
 
 Default with no argument moves items from the "Currently" section to Archive.
 ===== Options
+===== --after DATE_STRING
+
+Archive entries newer than date (natural language).
+
+[Default Value] None
+
+
 ===== --before DATE_STRING
 
-Archive entries older than date
-    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)
+Archive entries older than date (natural language).
 
 [Default Value] None
 
 
 ===== --bool BOOLEAN
 
-Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -213,7 +226,14 @@ Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
+
+
+===== --from DATE_OR_RANGE
+
+Date range (natural language) to archive: `doing archive --from "1/1/21 to 12/31/21"`.
+
+[Default Value] None
 
 
 ===== -k|--keep X
@@ -226,7 +246,8 @@ How many items to keep (ignored if archiving by tag or search)
 
 ===== --search QUERY
 
-Search filter
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
@@ -240,14 +261,15 @@ Move entries to
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -259,7 +281,7 @@ Label moved items with @from(SECTION_NAME)
 
 
 ===== --not
-Show items that *don't* match search string
+Archive items that *don't* match search/tag filters
 
 
 
@@ -331,13 +353,14 @@ Autotag last entry (or entries) not marked @done
 ==== Command: <tt>cancel  COUNT</tt>
 End last X entries with no time tracked
 
-Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doing finish --no-date`
+Adds @done tag without datestamp so no elapsed time is recorded.
+           Alias for `doing finish --no-date`
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -346,7 +369,7 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -s|--section NAME
@@ -358,21 +381,23 @@ Section
 
 ===== --search QUERY
 
-Cancel the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -389,7 +414,7 @@ Select item(s) to cancel from a menu of matching entries
 
 
 ===== --not
-Finish items that *don't* match search/tag filters
+Cancel items that *don't* match search/tag filters
 
 
 
@@ -429,24 +454,52 @@ Show changelogs matching search terms (uses pattern-based searching).
 [Default Value] None
 
 
+===== --sort ORDER
+
+Sort order (asc/desc)
+
+[Default Value] desc
+[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+
+
+===== -C|--changes
+Only output changes, no version numbers, headers, or dates
+
+
+
 ===== -a|--all
 Display all versions
 
 
 
-==== Command: <tt>choose </tt>
-Select a section to display from a menu
+===== -m|--md|--markdown
+Output raw Markdown
+
 
 
 ==== Command: <tt>colors </tt>
 List available color variables for configuration templates and views
 
 
+==== Command: <tt>commands </tt>
+Enable and disable Doing commands
+
+
+===== Commands
+====== Command: <tt>add|enable  COMMAND [COMMAND...]</tt>
+Enable Doing commands
+
+Run without arguments to select commands from a list.
+====== Command: <tt>remove|disable </tt>
+Disable Doing commands
+
+
+[Default Command] add
 ==== Command: <tt>completion </tt>
 Generate shell completion scripts
 
-Generates the necessary scripts to add command line completion to various shells, so typing 'doing' and hitting
-tab will offer completions of subcommands and their options.
+Generates the necessary scripts to add command line completion to various shells,
+so typing 'doing' and hitting tab will offer completions of subcommands and their options.
 ===== Options
 ===== -f|--file PATH
 
@@ -572,7 +625,7 @@ Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm
 
 ===== -b|--back|--started DATE_STRING
 
-Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]
+Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
 
 [Default Value] None
 
@@ -609,6 +662,11 @@ Set completion date to start date plus interval (XX[mhd] or HH:MM).
 [Default Value] None
 
 
+===== -X|--noauto
+Exclude auto tags and default tags
+
+
+
 ===== -a|--archive
 Immediately archive the entry
 
@@ -625,7 +683,7 @@ Include date
 
 
 ===== -e|--editor
-Edit entry with vim (with no arguments, edits the last entry)
+Edit entry with vim
 
 
 
@@ -660,9 +718,9 @@ Backdate completed date to date string [4pm|20m|2h|yesterday noon]
 
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -671,7 +729,7 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -s|--section NAME
@@ -683,7 +741,8 @@ Section
 
 ===== --search QUERY
 
-Finish the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
@@ -697,15 +756,15 @@ Set the completed date to the start date plus XX[hmd]
 
 ===== --tag TAG
 
-Finish the last X entries containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -739,7 +798,7 @@ Finish items that *don't* match search/tag filters
 
 
 ===== -r|--remove
-Remove done tag
+Remove @done tag
 
 
 
@@ -748,6 +807,11 @@ Finish last entry (or entries) not already marked @done
 
 
 
+===== --update
+Overwrite existing @done tag with new date
+
+
+
 ===== -x|--exact
 Force exact search string matching (case sensitive)
 
@@ -762,23 +826,25 @@ To search with regular expressions, single quote the string and surround with sl
 ===== Options
 ===== --after DATE_STRING
 
-Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Search entries newer than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
 
 ===== --before DATE_STRING
 
-Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Search entries older than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
 
-===== --bool arg
+===== --bool BOOLEAN
 
 Combine multiple tags or value queries using AND, OR, or NOT
 
-[Default Value] AND
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -787,7 +853,7 @@ Combine multiple tags or value queries using AND, OR, or NOT
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --config_template TEMPLATE_KEY
@@ -799,12 +865,11 @@ Output using a template from configuration
 
 ===== --from DATE_OR_RANGE
 
-Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing search --from "monday 8am to friday 5pm"`.
+Date range (natural language) to search, or a single day to filter on.
+        To specify a range, use "to": `doing grep --from "monday 8am to friday 5pm"`.
 
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
+        If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+        by time of day.
 
 [Default Value] None
 
@@ -828,7 +893,7 @@ Section
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -913,14 +978,16 @@ Imports entries from other sources. Available plugins: calendar, capturething, d
 ===== Options
 ===== --after DATE_STRING
 
-Import entries newer than date
+Import entries newer than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
 
 ===== --before DATE_STRING
 
-Import entries older than date
+Import entries older than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
@@ -930,14 +997,16 @@ Import entries older than date
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
-===== -f|--from DATE_OR_RANGE
+===== --from DATE_OR_RANGE
+
+Date range (natural language) to import, or a single day to filter on.
+        To specify a range, use "to": `doing import --from "monday 8am to friday 5pm"`.
 
-Date range to import. Date range argument should be quoted. Date specifications can be natural language.
-    To specify a range, use "to" or "through": `--from "monday to friday"` or `--from 10/1 to 10/31`.
-    Has no effect unless the import plugin has implemented date range filtering.
+        If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+        by time of day.
 
 [Default Value] None
 
@@ -958,7 +1027,8 @@ Target section
 
 ===== --search QUERY
 
-Only import items matching search. Surround with slashes for regex (/query/), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
@@ -1010,9 +1080,9 @@ allowing `doing last` to target historical entries.
 ===== Options
 ===== --bool BOOLEAN
 
-Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -1021,7 +1091,7 @@ Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --config_template TEMPLATE_KEY
@@ -1040,14 +1110,15 @@ Specify a section
 
 ===== --search QUERY
 
-Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
@@ -1061,7 +1132,8 @@ Override output format with a template string containing %placeholders
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1088,7 +1160,7 @@ Highlight search matches in output. Only affects command line output
 
 
 ===== --not
-Show items that *don't* match search string or tag filter
+Show items that *don't* match search/tag filters
 
 
 
@@ -1133,9 +1205,9 @@ Mark last entry as flagged
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -1152,7 +1224,7 @@ How many recent entries to tag (0 for all)
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -s|--section SECTION_NAME
@@ -1164,22 +1236,23 @@ Section
 
 ===== --search QUERY
 
-Flag the last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Flag the last entry containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1201,7 +1274,7 @@ Select item(s) to flag from a menu of matching entries
 
 
 ===== --not
-Flag items that *don't* match search/tag/date filters
+Flag items that *don't* match search/tag filters
 
 
 
@@ -1237,7 +1310,7 @@ Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
 
 ===== -n|--note TEXT
 
-Note
+Include a note
 
 [Default Value] None
 
@@ -1249,6 +1322,11 @@ Section
 [Default Value] None
 
 
+===== -X|--noauto
+Exclude auto tags and default tags
+
+
+
 ===== -a|--archive
 Archive previous @meanwhile entry
 
@@ -1275,9 +1353,9 @@ If -r is provided with no other arguments, the last note is removed.
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -1286,7 +1364,7 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -s|--section NAME
@@ -1298,21 +1376,23 @@ Section
 
 ===== --search QUERY
 
-Add/remove note from last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Add/remove note from last entry matching tag. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1334,7 +1414,7 @@ Select item for new note from a menu of matching entries
 
 
 ===== --not
-Add note to item that *doesn't* match search/tag filters
+Note items that *don't* match search/tag filters
 
 
 
@@ -1361,7 +1441,15 @@ Run with --editor to create a new entry using vim.
 ===== Options
 ===== -b|--back|--started DATE_STRING
 
-Backdate start time [4pm|20m|2h|"yesterday noon"]
+Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
+
+[Default Value] None
+
+
+===== --from TIME_RANGE
+
+Set a start and optionally end time as a date range ("from 1pm to 2:30pm").
+        If an end time is provided, a dated @done tag will be added
 
 [Default Value] None
 
@@ -1380,6 +1468,11 @@ Section
 [Default Value] None
 
 
+===== -X|--noauto
+Exclude auto tags and default tags
+
+
+
 ===== --ask
 Prompt for note via multi-line input
 
@@ -1428,7 +1521,7 @@ Section
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -1526,7 +1619,7 @@ Section
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -1556,6 +1649,23 @@ Show intervals with totals at the end of output
 
 
 
+==== Command: <tt>redo  COUNT</tt>
+Redo an undo command
+
+Shortcut for `doing undo -r`, reverses the last undo command. Specify a count to redo multiple undos
+===== Options
+===== -f|--file PATH
+
+Specify alternate doing file
+
+[Default Value] None
+
+
+===== -i|--[no-]interactive
+Select from an interactive menu
+
+
+
 ==== Command: <tt>reset|begin  [DATE_STRING]</tt>
 Reset the start time of an entry
 
@@ -1565,9 +1675,9 @@ If a date string is provided as an argument, the start time will be set to the p
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -1576,7 +1686,7 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -s|--section NAME
@@ -1588,21 +1698,23 @@ Limit search to section
 
 ===== --search QUERY
 
-Reset last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Reset last entry matching tag. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1650,9 +1762,9 @@ Rotate entries older than date
 
 ===== --bool BOOLEAN
 
-Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -1661,7 +1773,7 @@ Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -k|--keep X
@@ -1681,28 +1793,30 @@ Section to rotate
 
 ===== --search QUERY
 
-Search filter
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
 
 
 ===== --not
-Rotate items that *don't* match search string or tag filter
+Rotate items that *don't* match search/tag filters
 
 
 
@@ -1740,14 +1854,16 @@ sbtrkt  fuzzy-match   Items that match s*b*t*r*k*t
 ===== Options
 ===== --after DATE_STRING
 
-Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Select entries newer than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
 
 ===== --before DATE_STRING
 
-Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Select entries older than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
@@ -1757,17 +1873,16 @@ Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00)
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --from DATE_OR_RANGE
 
-Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing select --from "monday 8am to friday 5pm"`.
+Date range (natural language) to select, or a single day to filter on.
+        To specify a range, use "to": `doing select --from "monday 8am to friday 5pm"`.
 
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
+        If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+        by time of day.
 
 [Default Value] None
 
@@ -1788,7 +1903,8 @@ Output entries to format (csv|dayone|dayone-days|dayone-entries|doing|html|json|
 
 ===== -q|--query QUERY
 
-Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "'search"
+Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote,
+          e.g. `--query "'search"
 
 [Default Value] None
 
@@ -1809,7 +1925,8 @@ Save selected entries to file using --output format
 
 ===== --search QUERY
 
-Select from entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
@@ -1823,7 +1940,8 @@ Tag selected entries
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+          May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1835,7 +1953,8 @@ Archive selected items
 
 
 ===== --again|--resume
-Copy selection as a new entry with current time and no @done tag. Only works with single selections. Can be combined with --editor.
+Copy selection as a new entry with current time and no @done tag.
+          Only works with single selections. Can be combined with --editor.
 
 
 
@@ -1870,7 +1989,8 @@ Perform action without confirmation
 
 
 ===== --[no-]menu
-Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches
+Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically.
+          Test with `--output doing` to preview matches
 
 
 
@@ -1908,24 +2028,26 @@ Age (oldest|newest)
 
 ===== --after DATE_STRING
 
-Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Show entries newer than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
 
-===== -b|--bool BOOLEAN
+===== --before DATE_STRING
 
-Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans
+Show entries older than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
-[Default Value] PATTERN
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
+[Default Value] None
 
 
-===== --before DATE_STRING
+===== --bool BOOLEAN
 
-Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] None
+[Default Value] pattern
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== -c|--count MAX
@@ -1941,7 +2063,7 @@ Max count to show
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --config_template TEMPLATE_KEY
@@ -1953,12 +2075,11 @@ Output using a template from configuration
 
 ===== --from DATE_OR_RANGE
 
-Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing show --from "monday 8am to friday 5pm"`.
+Date range (natural language) to show, or a single day to filter on.
+        To specify a range, use "to": `doing show --from "monday 8am to friday 5pm"`.
 
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
+        If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+        by time of day.
 
 [Default Value] None
 
@@ -1980,14 +2101,15 @@ Sort order (asc/desc)
 
 ===== --search QUERY
 
-Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
@@ -2005,7 +2127,7 @@ Tag sort direction (asc|desc)
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time))
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -2017,7 +2139,8 @@ Override output format with a template string containing %placeholders
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2044,7 +2167,7 @@ Select section or tag to display from a menu
 
 
 ===== --not
-Show items that *don't* match search/tag/date filters
+Show items that *don't* match search/tag filters
 
 
 
@@ -2100,7 +2223,7 @@ Section
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -2144,9 +2267,9 @@ Add (or remove) tags from the last entry, or from multiple entries
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -2163,7 +2286,7 @@ How many recent entries to tag (0 for all)
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --rename ORIG_TAG
@@ -2182,15 +2305,15 @@ Section
 
 ===== --search QUERY
 
-Tag entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Tag the last X entries containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
@@ -2204,7 +2327,8 @@ Include a value, e.g. @tag(value)
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2276,7 +2400,7 @@ List all tags in the current Doing file
 
 Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] PATTERN
+[Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
@@ -2285,7 +2409,7 @@ Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== -o|--order ORDER
@@ -2305,8 +2429,8 @@ Section
 
 ===== --search QUERY
 
-Get tags for items matching search. Surround with
-  slashes for regex (e.g. "/query/"), start with a single quote for exact match ("'query").
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
@@ -2321,14 +2445,15 @@ Sort by name or count
 
 ===== --tag TAG
 
-Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2350,7 +2475,7 @@ Output in a single line with @ symbols. Ignored if --counts is specified.
 
 
 ===== --not
-Get tags from items that *don't* match search/tag filters
+Show items that *don't* match search/tag filters
 
 
 
@@ -2444,7 +2569,7 @@ Specify a section
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING
@@ -2509,7 +2634,8 @@ Command line options override view configuration.
 ===== Options
 ===== --after DATE_STRING
 
-View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Show entries newer than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
 [Default Value] None
 
@@ -2521,19 +2647,20 @@ Age (oldest|newest)
 [Default Value] newest
 
 
-===== -b|--bool BOOLEAN
+===== --before DATE_STRING
 
-Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans
+Show entries older than date (natural language). If this is only a time (8am, 1:30pm, 15:00), all
+              dates will be included, but entries will be filtered by time of day
 
-[Default Value] PATTERN
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
+[Default Value] None
 
 
-===== --before DATE_STRING
+===== --bool BOOLEAN
 
-View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
 
-[Default Value] None
+[Default Value] pattern
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== -c|--count COUNT
@@ -2549,17 +2676,16 @@ Count to display
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
 
 [Default Value] smart
-[Must Match] (?-mix:^[csi])
+[Must Match] (?i-mx:^[cis].*?$)
 
 
 ===== --from DATE_OR_RANGE
 
-Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing view --from "monday 8am to friday 5pm" view_name`.
+Date range (natural language) to show, or a single day to filter on.
+        To specify a range, use "to": `doing view --from "monday 8am to friday 5pm"`.
 
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
+        If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+        by time of day.
 
 [Default Value] None
 
@@ -2580,14 +2706,15 @@ Section
 
 ===== --search QUERY
 
-Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("'query")
+Filter entries using a search query, surround with slashes for regex (e.g. "/query.*/"),
+            start with single quote for exact match ("'query")
 
 [Default Value] None
 
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)
+Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
 
 [Default Value] None
 
@@ -2605,12 +2732,13 @@ Tag sort direction (asc|desc)
 Sort tags by (name|time)
 
 [Default Value] None
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --val QUERY
 
-Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool
+Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool
 
 [Default Value] None
 [Must Match] (?-mix:^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2637,7 +2765,7 @@ Select from a menu of matching entries to perform additional operations
 
 
 ===== --not
-Show items that *don't* match search string
+Show items that *don't* match search/tag filters
 
 
 
@@ -2795,7 +2923,7 @@ Tag sort direction (asc|desc)
 Sort tags by (name|time)
 
 [Default Value] name
-[Must Match] (?i-mx:^(?:name|time)$)
+[Must Match] (?i-mx:^(?:n(?:ame)?|t(?:ime)?)$)
 
 
 ===== --template TEMPLATE_STRING