doing 2.1.1pre → 2.1.5pre

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.1pre
+v2.1.5pre
 
 === Global Options
 === --config_file arg
@@ -90,14 +90,14 @@ 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.
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -139,13 +139,13 @@ Repeat last entry matching search. Surround with
 
 ===== --tag TAG
 
-Repeat last entry matching tags. Combine multiple tags with a comma.
+Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).
 
 [Default Value] None
 
 
 ===== -e|--editor
-Edit duplicated entry with emacs -nw before adding
+Edit duplicated entry with vim before adding
 
 
 
@@ -182,10 +182,10 @@ Archive entries older than date
 
 ===== --bool BOOLEAN
 
-Tag boolean (AND|OR|NOT)
+Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -220,7 +220,7 @@ Move entries to
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.
+Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.
 
 [Default Value] None
 
@@ -250,7 +250,7 @@ Autotag last entry or filtered entries
 Boolean (AND|OR|NOT) with which to combine multiple tag filters
 
 [Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== -c|--count COUNT
@@ -307,10 +307,10 @@ Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doin
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters
+Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -337,7 +337,7 @@ Cancel the last X entries matching search filter, surround with slashes for rege
 
 ===== --tag TAG
 
-Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2)
+Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -367,6 +367,10 @@ Force exact search string matching (case sensitive)
 
 
 
+==== Command: <tt>changelog|changes </tt>
+List recent changes in Doing
+
+Display a formatted list of changes in recent versions, latest at the top
 ==== Command: <tt>choose </tt>
 Select a section to display from a menu
 
@@ -376,7 +380,8 @@ List available color variables for configuration templates and views
 
 
 ==== 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.
 
 
 ===== Options
@@ -488,7 +493,9 @@ Update default config file, adding any missing keys
 
 [Default Command] edit
 ==== Command: <tt>done|did  ENTRY</tt>
-Add a completed item with @done(date). No argument finishes last entry.
+Use this command to add an entry after you've already finished it. It will be immediately marked as @done.
+You can modify the start and end times of the entry using the --back, --took, and --at flags, making it an easy
+way to add entries in post and maintain accurate (albeit manual) time tracking.
 
 
 ===== Options
@@ -541,7 +548,7 @@ Include date
 
 
 ===== -e|--editor
-Edit entry with emacs -nw (with no arguments, edits the last entry)
+Edit entry with vim (with no arguments, edits the last entry)
 
 
 
@@ -576,10 +583,10 @@ Backdate completed date to date string [4pm|20m|2h|yesterday noon]
 
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters
+Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -614,7 +621,7 @@ 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
+  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -666,7 +673,7 @@ Search for entries
 
 Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched.
 
-To search with regular expressions, single quote the string and surround with slashes: `doing search '/\bm.*?x\b/'`
+To search with regular expressions, single quote the string and surround with slashes: `doing search '/m.*?x/'`
 ===== Options
 ===== --after DATE_STRING
 
@@ -704,7 +711,7 @@ Date range to show, or a single day to filter date on.
 
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -724,6 +731,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Display an interactive menu of results to perform further operations
 
@@ -863,14 +875,15 @@ Force exact search string matching (case sensitive)
 ==== Command: <tt>last </tt>
 Show the last entry, optionally edit
 
-
+Shows the last entry. Using --search and --tag filters, you can view/edit the last entry matching a filter,
+allowing `doing last` to target historical entries.
 ===== Options
 ===== --bool BOOLEAN
 
-Tag boolean
+Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -897,13 +910,18 @@ Search filter, surround with slashes for regex (/query/), start with single quot
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma.
+Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).
 
 [Default Value] None
 
 
+===== --[no-]duration
+Show elapsed time if entry is not tagged @done
+
+
+
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -937,7 +955,7 @@ Note
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -948,10 +966,10 @@ Mark last entry as flagged
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean (AND|OR|NOT) with which to combine multiple tag filters
+Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== -c|--count COUNT
@@ -987,7 +1005,7 @@ Flag the last entry matching search filter, surround with slashes for regex (e.g
 ===== --tag TAG
 
 Flag the last entry containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool
+  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -1030,7 +1048,10 @@ Force exact search string matching (case sensitive)
 ==== Command: <tt>meanwhile  ENTRY</tt>
 Finish any running @meanwhile tasks and optionally create a new one
 
-
+The @meanwhile tag allows you to have long-running entries that encompass smaller entries.
+This command makes it easy to start and stop these overarching entries. Just run `doing meanwhile Starting work on this
+big project` to start a @meanwhile entry, add other entries as you work on the project, then use `doing meanwhile` by
+itself to mark the entry as @done.
 ===== Options
 ===== -b|--back DATE_STRING
 
@@ -1059,7 +1080,7 @@ Archive previous @meanwhile entry
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1074,10 +1095,10 @@ 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
+Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -1104,13 +1125,13 @@ Add/remove note from last entry matching search filter, surround with slashes fo
 
 ===== --tag TAG
 
-Add/remove note from last entry matching tag
+Add/remove note from last entry matching tag. Wildcards allowed (*, ?).
 
 [Default Value] None
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1141,7 +1162,7 @@ Record what you're starting now, or backdate the start time using natural langua
 
 A parenthetical at the end of the entry will be converted to a note.
 
-Run with no argument to create a new entry using emacs -nw.
+Run with no argument to create a new entry using vim.
 ===== Options
 ===== -b|--back|--started DATE_STRING
 
@@ -1165,7 +1186,7 @@ Section
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1183,7 +1204,7 @@ it will create a range.
 ===== Options
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -1203,6 +1224,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -1216,7 +1242,8 @@ Show time totals at the end of output
 ==== Command: <tt>open </tt>
 Open the "doing" file in an editor
 
-`doing open` defaults to using the editor_app setting in /Users/ttscoff/.config/doing/config.yml (not set).
+`doing open` defaults to using the editors->doing_file setting
+in /Users/ttscoff/.config/doing/config.yml (TaskPaper).
 ===== Options
 ===== -a|--app APP_NAME
 
@@ -1281,6 +1308,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -1296,17 +1328,19 @@ Show intervals with totals at the end of output
 
 
 
-==== Command: <tt>reset|begin </tt>
+==== Command: <tt>reset|begin  DATE_STRING</tt>
 Reset the start time of an entry
 
-
+Update the start time of the last entry or the last entry matching a tag/search filter.
+If no argument is provided, the start time will be reset to the current time.
+If a date string is provided as an argument, the start time will be set to the parsed result.
 ===== Options
 ===== --bool BOOLEAN
 
 Boolean (AND|OR|NOT) with which to combine multiple tag filters
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -1333,7 +1367,7 @@ Reset last entry matching search filter, surround with slashes for regex (e.g. "
 
 ===== --tag TAG
 
-Reset last entry matching tag
+Reset last entry matching tag. Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -1361,7 +1395,9 @@ Force exact search string matching (case sensitive)
 ==== Command: <tt>rotate </tt>
 Move entries to archive file
 
-
+As your doing file grows, commands can get slow. Given that your historical data (and your archive section)
+probably aren't providing any useful insights a year later, use this command to "rotate" old entries out to an archive
+file. You'll still have access to all historical data, but it won't be slowing down daily operation.
 ===== Options
 ===== --before DATE_STRING
 
@@ -1373,10 +1409,10 @@ Rotate entries older than date
 
 ===== --bool BOOLEAN
 
-Tag boolean (AND|OR|NOT)
+Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --case TYPE
@@ -1411,7 +1447,7 @@ Search filter
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.
+Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.
 
 [Default Value] None
 
@@ -1444,6 +1480,14 @@ List all entries and select with typeahead fuzzy matching.
 Multiple selections are allowed, hit tab to add the highlighted entry to the
 selection, and use ctrl-a to select all visible items. Return processes the
 selected entries.
+
+Search in the menu by typing:
+
+sbtrkt  fuzzy-match   Items that match sbtrkt
+
+'wild   exact-match (quoted)  Items that include wild
+
+!fire   inverse-exact-match   Items that do not include fire
 ===== Options
 ===== --after DATE_STRING
 
@@ -1488,7 +1532,7 @@ Move selected items to section
 
 ===== -o|--output FORMAT
 
-Output entries to format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output entries to format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -1585,7 +1629,11 @@ Force exact search string matching (case sensitive)
 List all entries
 
 The argument can be a section name, @tag(s) or both.
-  "pick" or "choose" as an argument will offer a section menu.
+  "pick" or "choose" as an argument will offer a section menu. Run with `--menu` to get a menu of available tags.
+
+  Show tags by passing @tagname arguments. Multiple tags can be combined, and you can specify the boolean used to
+  combine them with `--bool (AND|OR|NOT)`. You can also use @+tagname to require a tag to match, or @-tagname to ignore
+  entries containing tagname. +/- operators require `--bool PATTERN` (which is the default).
 ===== Options
 ===== -a|--age AGE
 
@@ -1603,10 +1651,10 @@ Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all d
 
 ===== -b|--bool BOOLEAN
 
-Tag boolean (AND,OR,NOT)
+Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.
 
-[Default Value] OR
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --before DATE_STRING
@@ -1621,6 +1669,7 @@ Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all d
 Max count to show
 
 [Default Value] 0
+[Must Match] (?-mix:^\d+$)
 
 
 ===== --case TYPE
@@ -1645,7 +1694,7 @@ Date range to show, or a single day to filter date on.
 
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -1667,7 +1716,7 @@ Search filter, surround with slashes for regex (/query/), start with single quot
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.
+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.
 
 [Default Value] None
 
@@ -1688,11 +1737,21 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time))
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
 
 
+===== -m|--menu
+Select section or tag to display from a menu
+
+
+
 ===== --not
 Show items that *don't* match search/tag/date filters
 
@@ -1726,7 +1785,7 @@ and "2d" would be interpreted as "two days ago."
 ===== Options
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -1746,6 +1805,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -1775,10 +1839,10 @@ 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
+Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.
 
-[Default Value] AND
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== -c|--count COUNT
@@ -1821,7 +1885,7 @@ Tag entries matching search filter, surround with slashes for regex (e.g. "/quer
 ===== --tag TAG
 
 Tag the last X entries containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool
+  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -1871,6 +1935,85 @@ Force exact search string matching (case sensitive)
 
 
 
+==== Command: <tt>tags </tt>
+List all tags in the current Doing file
+
+
+===== Options
+===== --bool BOOLEAN
+
+Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.
+
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
+
+
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
+===== -o|--order ORDER
+
+Sort order (asc/desc)
+
+[Default Value] asc
+[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+
+
+===== -s|--section SECTION_NAME
+
+Section
+
+[Default Value] All
+
+
+===== --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").
+
+[Default Value] None
+
+
+===== --sort SORT_ORDER
+
+Sort by name or count
+
+[Default Value] name
+[Must Match] (?-mix:^(?:n(?:ame)?|c(?:ount)?)$)
+
+
+===== --tag TAG
+
+Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).
+
+[Default Value] None
+
+
+===== -c|--[no-]counts
+Show count of occurrences
+
+
+
+===== -i|--interactive
+Select items to scan from a menu of matching entries
+
+
+
+===== --not
+Get tags from items that *don't* match search/tag filters
+
+
+
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>template  TYPE</tt>
 Output HTML, CSS, and Markdown (ERB) templates for customization
 
@@ -1894,7 +2037,8 @@ This command is coming from /Users/ttscoff/.config/doing/commands/test.rb
 ==== Command: <tt>today </tt>
 List entries from today
 
-
+List entries from the current day. Use --before, --after, and
+--from to specify time ranges.
 ===== Options
 ===== --after TIME_STRING
 
@@ -1919,7 +2063,7 @@ Time range to show `doing today --from "12pm to 4pm"`
 
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -1939,6 +2083,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -1949,10 +2098,13 @@ Show time totals at the end of output
 
 
 
-==== Command: <tt>undo </tt>
-Undo the last change to the Doing file
+==== Command: <tt>undo  COUNT</tt>
+Undo the last X changes to the Doing file
 
+Reverts the last X commands that altered the doing file.
+All changes performed by a single command are undone at once.
 
+Specify a number to jump back multiple revisions, or use --select for an interactive menu.
 ===== Options
 ===== -f|--file PATH
 
@@ -1961,10 +2113,28 @@ Specify alternate doing file
 [Default Value] None
 
 
+===== -p|--prune COUNT
+
+Remove old backups, retaining X files
+
+[Default Value] None
+
+
+===== -i|--interactive
+Select from recent backups
+
+
+
+===== -r|--[no-]redo
+Redo last undo. Note: you cannot undo a redo.
+
+
+
 ==== Command: <tt>view  VIEW_NAME</tt>
 Display a user-created view
 
-Command line options override view configuration
+Views are defined in your configuration (use `doing config` to edit).
+Command line options override view configuration.
 ===== Options
 ===== --after DATE_STRING
 
@@ -1975,10 +2145,10 @@ View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all d
 
 ===== -b|--bool BOOLEAN
 
-Tag boolean (AND,OR,NOT)
+Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.
 
-[Default Value] OR
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Default Value] PATTERN
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --before DATE_STRING
@@ -2018,7 +2188,7 @@ Date range to show, or a single day to filter date on.
 
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -2039,7 +2209,7 @@ Search filter, surround with slashes for regex (/query/), start with single quot
 
 ===== --tag TAG
 
-Tag filter, combine multiple tags with a comma.
+Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).
 
 [Default Value] None
 
@@ -2065,6 +2235,11 @@ Include colors in output
 
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -2122,7 +2297,7 @@ Include entries newer than date
 Tag boolean (AND,OR,NOT)
 
 [Default Value] OR
-[Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
+[Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
 
 
 ===== --before DATE_STRING
@@ -2168,7 +2343,8 @@ Only show items with recorded time intervals
 
 
 ==== Command: <tt>yesterday </tt>
-List entries from yesterday
+Show only entries with start times within the previous 24 hour period. Use --before, --after, and --from to limit to
+time spans within the day.
 
 
 ===== Options
@@ -2195,7 +2371,7 @@ Time range to show, e.g. `doing yesterday --from "1am to 8am"`
 
 ===== -o|--output FORMAT
 
-Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
+Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|markdown|say|taskpaper|template|timeline|wiki)
 
 [Default Value] None
 
@@ -2223,6 +2399,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks