RubyGems - doing - Versions diffs - 2.1.26 → 2.1.27 - Mend

doing 2.1.26 → 2.1.27

Files changed (151) hide show

checksums.yaml +4 -4
data/.yardoc/checksums +14 -19
data/.yardoc/object_types +0 -0
data/.yardoc/objects/root.dat +0 -0
data/CHANGELOG.md +23 -0
data/Dockerfile +5 -5
data/Dockerfile-2.6 +5 -5
data/Dockerfile-2.7 +5 -4
data/Dockerfile-3.0 +5 -4
data/Gemfile.lock +1 -1
data/README.md +1 -1
data/Rakefile +2 -3
data/bin/commands/add_section.rb +2 -0
data/bin/commands/again.rb +23 -65
data/bin/commands/archive.rb +20 -61
data/bin/commands/cancel.rb +27 -69
data/bin/commands/changes.rb +32 -5
data/bin/commands/colors.rb +4 -2
data/bin/commands/commands.rb +4 -2
data/bin/commands/commands_accepting.rb +62 -11
data/bin/commands/completion.rb +10 -7
data/bin/commands/config.rb +1 -1
data/bin/commands/done.rb +3 -17
data/bin/commands/finish.rb +7 -30
data/bin/commands/flag.rb +15 -51
data/bin/commands/grep.rb +12 -28
data/bin/commands/import.rb +3 -33
data/bin/commands/last.rb +3 -36
data/bin/commands/meanwhile.rb +3 -13
data/bin/commands/note.rb +13 -52
data/bin/commands/now.rb +15 -21
data/bin/commands/on.rb +3 -4
data/bin/commands/recent.rb +3 -4
data/bin/commands/redo.rb +6 -2
data/bin/commands/reset.rb +19 -52
data/bin/commands/rotate.rb +5 -36
data/bin/commands/select.rb +23 -41
data/bin/commands/show.rb +28 -74
data/bin/commands/since.rb +3 -4
data/bin/commands/tag.rb +4 -34
data/bin/commands/tags.rb +5 -32
data/bin/commands/today.rb +3 -4
data/bin/commands/view.rb +36 -73
data/bin/commands/yesterday.rb +4 -5
data/bin/doing +150 -13
data/docs/doc/Array.html +3 -502
data/docs/doc/BooleanTermParser/Clause.html +1 -1
data/docs/doc/BooleanTermParser/Operator.html +1 -1
data/docs/doc/BooleanTermParser/Query.html +1 -1
data/docs/doc/BooleanTermParser/QueryParser.html +1 -1
data/docs/doc/BooleanTermParser/QueryTransformer.html +1 -1
data/docs/doc/BooleanTermParser.html +1 -1
data/docs/doc/Doing/Color.html +62 -56
data/docs/doc/Doing/Completion.html +1 -1
data/docs/doc/Doing/Configuration.html +35 -1
data/docs/doc/Doing/Errors/DoingNoTraceError.html +1 -1
data/docs/doc/Doing/Errors/DoingRuntimeError.html +1 -1
data/docs/doc/Doing/Errors/DoingStandardError.html +1 -1
data/docs/doc/Doing/Errors/EmptyInput.html +1 -1
data/docs/doc/Doing/Errors/NoResults.html +1 -1
data/docs/doc/Doing/Errors/PluginException.html +1 -1
data/docs/doc/Doing/Errors/UserCancelled.html +1 -1
data/docs/doc/Doing/Errors/WrongCommand.html +1 -1
data/docs/doc/Doing/Errors.html +1 -1
data/docs/doc/Doing/Hooks.html +1 -1
data/docs/doc/Doing/Item.html +1 -1
data/docs/doc/Doing/Items.html +2 -2
data/docs/doc/Doing/LogAdapter.html +1 -1
data/docs/doc/Doing/Note.html +2 -2
data/docs/doc/Doing/Pager.html +1 -1
data/docs/doc/Doing/Plugins.html +1 -1
data/docs/doc/Doing/Prompt.html +1 -1
data/docs/doc/Doing/Section.html +1 -1
data/docs/doc/Doing/TemplateString.html +2 -2
data/docs/doc/Doing/Types.html +41 -1
data/docs/doc/Doing/Util/Backup.html +1 -1
data/docs/doc/Doing/Util.html +1 -1
data/docs/doc/Doing/WWID.html +10 -10
data/docs/doc/Doing.html +3 -3
data/docs/doc/FalseClass.html +35 -1
data/docs/doc/GLI/Commands/Help.html +1 -1
data/docs/doc/GLI/Commands/MarkdownDocumentListener.html +1 -1
data/docs/doc/GLI/Commands.html +1 -1
data/docs/doc/GLI.html +1 -1
data/docs/doc/Hash.html +1 -1
data/docs/doc/Object.html +1 -1
data/docs/doc/PhraseParser/Operator.html +1 -1
data/docs/doc/PhraseParser/PhraseClause.html +1 -1
data/docs/doc/PhraseParser/Query.html +1 -1
data/docs/doc/PhraseParser/QueryParser.html +1 -1
data/docs/doc/PhraseParser/QueryTransformer.html +1 -1
data/docs/doc/PhraseParser/TermClause.html +1 -1
data/docs/doc/PhraseParser.html +1 -1
data/docs/doc/Status.html +1 -1
data/docs/doc/String.html +287 -3155
data/docs/doc/Symbol.html +40 -6
data/docs/doc/Time.html +1 -1
data/docs/doc/TrueClass.html +35 -1
data/docs/doc/_index.html +5 -10
data/docs/doc/class_list.html +1 -1
data/docs/doc/file.README.html +2 -2
data/docs/doc/index.html +2 -2
data/docs/doc/method_list.html +278 -678
data/docs/doc/top-level-namespace.html +2 -2
data/doing.rdoc +277 -175
data/lib/completion/_doing.zsh +33 -29
data/lib/completion/doing.bash +30 -19
data/lib/completion/doing.fish +84 -72
data/lib/doing/array/array.rb +4 -0
data/lib/doing/array/nested_hash.rb +17 -0
data/lib/doing/{array.rb → array/tags.rb} +7 -25
data/lib/doing/changelog/change.rb +26 -11
data/lib/doing/changelog/changes.rb +13 -3
data/lib/doing/{array_chronify.rb → chronify/array.rb} +0 -0
data/lib/doing/chronify/chronify.rb +5 -0
data/lib/doing/{numeric_chronify.rb → chronify/numeric.rb} +0 -0
data/lib/doing/{string_chronify.rb → chronify/string.rb} +0 -0
data/lib/doing/colors.rb +115 -54
data/lib/doing/configuration.rb +4 -0
data/lib/doing/good.rb +8 -0
data/lib/doing/help_monkey_patch.rb +6 -5
data/lib/doing/item.rb +5 -5
data/lib/doing/items.rb +2 -2
data/lib/doing/log_adapter.rb +35 -2
data/lib/doing/normalize.rb +188 -0
data/lib/doing/plugins/export/dayone_export.rb +1 -1
data/lib/doing/plugins/export/html_export.rb +1 -1
data/lib/doing/plugins/export/json_export.rb +1 -1
data/lib/doing/plugins/export/markdown_export.rb +1 -1
data/lib/doing/plugins/export/template_export.rb +3 -1
data/lib/doing/prompt.rb +1 -3
data/lib/doing/string/highlight.rb +95 -0
data/lib/doing/string/query.rb +129 -0
data/lib/doing/string/string.rb +12 -0
data/lib/doing/string/tags.rb +164 -0
data/lib/doing/string/transform.rb +168 -0
data/lib/doing/string/truncate.rb +75 -0
data/lib/doing/string/url.rb +82 -0
data/lib/doing/template_string.rb +0 -22
data/lib/doing/types.rb +8 -0
data/lib/doing/util.rb +13 -9
data/lib/doing/version.rb +1 -1
data/lib/doing/wwid.rb +53 -35
data/lib/doing.rb +4 -6
data/lib/examples/plugins/wiki_export/wiki_export.rb +1 -1
data/lib/helpers/threaded_tests.rb +15 -2
data/scripts/deploy.rb +107 -0
data/scripts/runtests.sh +4 -0
metadata +19 -8
data/lib/doing/string.rb +0 -765
data/lib/doing/symbol.rb +0 -28

data/doing.rdoc CHANGED Viewed

@@ -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.26
+v2.1.27
 === 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 /opt/homebrew/bin/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,11 +454,21 @@ Show changelogs matching search terms (uses pattern-based searching).
 [Default Value] None
+===== -C|--changes
+Only output changes, no version numbers, headers, or dates
 ===== -a|--all
 Display all versions
+===== -m|--md|--markdown
+Output raw Markdown
 ==== Command: <tt>colors </tt>
 List available color variables for configuration templates and views
@@ -455,8 +490,8 @@ Disable Doing commands
 ==== 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
@@ -582,7 +617,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
@@ -619,6 +654,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
@@ -635,7 +675,7 @@ Include date
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim (with no arguments, edits the last entry)
+Edit entry with vim
@@ -670,9 +710,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)?)?)$)
@@ -681,7 +721,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
@@ -693,7 +733,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
@@ -707,15 +748,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -749,7 +790,7 @@ Finish items that *don't* match search/tag filters
 ===== -r|--remove
-Remove done tag
+Remove @done tag
@@ -758,6 +799,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)
@@ -772,23 +818,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)?)?)$)
@@ -797,7 +845,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
@@ -809,12 +857,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
@@ -838,7 +885,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
@@ -867,7 +914,7 @@ Show elapsed time on entries without @done tag
 ===== -e|--editor
-Edit matching entries with /opt/homebrew/bin/vim
+Edit matching entries with vim
@@ -923,14 +970,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
@@ -940,14 +989,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
@@ -968,7 +1019,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
@@ -1020,9 +1072,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)?)?)$)
@@ -1031,7 +1083,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
@@ -1050,14 +1102,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
@@ -1071,7 +1124,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 +1142,7 @@ Show elapsed time if entry is not tagged @done
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim
+Edit entry with vim
@@ -1098,7 +1152,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
@@ -1132,7 +1186,7 @@ Prompt for note via multi-line input
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim
+Edit entry with vim
@@ -1143,9 +1197,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)?)?)$)
@@ -1162,7 +1216,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
@@ -1174,22 +1228,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1211,7 +1266,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
@@ -1247,7 +1302,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
@@ -1259,6 +1314,11 @@ Section
 [Default Value] None
+===== -X|--noauto
+Exclude auto tags and default tags
 ===== -a|--archive
 Archive previous @meanwhile entry
@@ -1270,7 +1330,7 @@ Prompt for note via multi-line input
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim
+Edit entry with vim
@@ -1285,9 +1345,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)?)?)$)
@@ -1296,7 +1356,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
@@ -1308,21 +1368,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 +1396,7 @@ Prompt for note via multi-line input
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim
+Edit entry with vim
@@ -1344,7 +1406,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
@@ -1367,11 +1429,11 @@ A parenthetical at the end of the entry will be converted to a note.
 Run without arguments to create a new entry interactively.
-Run with --editor to create a new entry using /opt/homebrew/bin/vim.
+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
@@ -1398,13 +1460,18 @@ Section
 [Default Value] None
+===== -X|--noauto
+Exclude auto tags and default tags
 ===== --ask
 Prompt for note via multi-line input
 ===== -e|--editor
-Edit entry with /opt/homebrew/bin/vim
+Edit entry with vim
@@ -1446,7 +1513,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
@@ -1475,7 +1542,7 @@ Show time totals at the end of output
 Open the "doing" file in an editor
 `doing open` defaults to using the editors->doing_file setting
-in /Users/ttscoff/.config/doing/config.yml (/opt/homebrew/bin/vim).
+in /Users/ttscoff/.config/doing/config.yml (TaskPaper).
 ===== Options
 ===== -a|--app APP_NAME
@@ -1544,7 +1611,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
@@ -1574,6 +1641,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
@@ -1583,9 +1667,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)?)?)$)
@@ -1594,7 +1678,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
@@ -1606,21 +1690,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1668,9 +1754,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)?)?)$)
@@ -1679,7 +1765,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
@@ -1699,28 +1785,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
@@ -1758,14 +1846,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
@@ -1775,17 +1865,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
@@ -1806,7 +1895,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
@@ -1827,7 +1917,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
@@ -1841,7 +1932,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -1853,7 +1945,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.
@@ -1888,7 +1981,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
@@ -1926,24 +2020,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
@@ -1959,7 +2055,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
@@ -1971,12 +2067,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
@@ -1998,14 +2093,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
@@ -2023,7 +2119,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
@@ -2035,7 +2131,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2062,7 +2159,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
@@ -2118,7 +2215,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
@@ -2162,9 +2259,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)?)?)$)
@@ -2181,7 +2278,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
@@ -2200,15 +2297,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
@@ -2222,7 +2319,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2294,7 +2392,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)?)?)$)
@@ -2303,7 +2401,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
@@ -2323,8 +2421,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
@@ -2339,14 +2437,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2368,7 +2467,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
@@ -2462,7 +2561,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
@@ -2527,7 +2626,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
@@ -2539,19 +2639,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
@@ -2567,17 +2668,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
@@ -2598,14 +2698,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
@@ -2623,12 +2724,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+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$)
@@ -2655,7 +2757,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
@@ -2813,7 +2915,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