Update README after clap update

tweag · Jan 4, 2024 · 5d7c4ae · 5d7c4ae
1 parent 3aa683f
commit 5d7c4ae
Showing 1 changed file with 33 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -180,22 +180,19 @@ Commands:
 Options:
   -C, --configuration <CONFIGURATION>
           Configuration file
-
+          
           [env: TOPIARY_CONFIG_FILE]
 
       --configuration-collation <CONFIGURATION_COLLATION>
           Configuration collation mode
-
+          
           [env: TOPIARY_CONFIG_COLLATION]
           [default: merge]
 
           Possible values:
-          - merge:    When multiple sources of configuration are available, matching items are
-            updated from the higher priority source, with collections merged as the union of sets
-          - revise:   When multiple sources of configuration are available, matching items
-            (including collections) are superseded from the higher priority source
-          - override: When multiple sources of configuration are available, the highest priority
-            source is taken. All values from lower priority sources are discarded
+          - merge:    When multiple sources of configuration are available, matching items are updated from the higher priority source, with collections merged as the union of sets
+          - revise:   When multiple sources of configuration are available, matching items (including collections) are superseded from the higher priority source
+          - override: When multiple sources of configuration are available, the highest priority source is taken. All values from lower priority sources are discarded
 
   -v, --verbose...
           Logging verbosity (increased per occurrence)
@@ -220,9 +217,8 @@ Usage: topiary format [OPTIONS] <--language <LANGUAGE>|FILES>
 Arguments:
   [FILES]...
           Input files and directories (omit to read from stdin)
-
-          Language detection and query selection is automatic, mapped from file extensions defined
-          in the Topiary configuration.
+          
+          Language detection and query selection is automatic, mapped from file extensions defined in the Topiary configuration.
 
 Options:
   -t, --tolerate-parsing-errors
@@ -232,31 +228,26 @@ Options:
           Do not check that formatting twice gives the same output
 
   -l, --language <LANGUAGE>
-          Topiary supported language (for formatting stdin)
-
-          [possible values: json, nickel, ocaml, ocaml-interface, ocamllex, toml]
+          Topiary language identifier (for formatting stdin)
 
   -q, --query <QUERY>
           Topiary query file override (when formatting stdin)
 
   -C, --configuration <CONFIGURATION>
           Configuration file
-
+          
           [env: TOPIARY_CONFIG_FILE]
 
       --configuration-collation <CONFIGURATION_COLLATION>
           Configuration collation mode
-
+          
           [env: TOPIARY_CONFIG_COLLATION]
           [default: merge]
 
           Possible values:
-          - merge:    When multiple sources of configuration are available, matching items are
-            updated from the higher priority source, with collections merged as the union of sets
-          - revise:   When multiple sources of configuration are available, matching items
-            (including collections) are superseded from the higher priority source
-          - override: When multiple sources of configuration are available, the highest priority
-            source is taken. All values from lower priority sources are discarded
+          - merge:    When multiple sources of configuration are available, matching items are updated from the higher priority source, with collections merged as the union of sets
+          - revise:   When multiple sources of configuration are available, matching items (including collections) are superseded from the higher priority source
+          - override: When multiple sources of configuration are available, the highest priority source is taken. All values from lower priority sources are discarded
 
   -v, --verbose...
           Logging verbosity (increased per occurrence)
@@ -285,46 +276,40 @@ Usage: topiary visualise [OPTIONS] <--language <LANGUAGE>|FILE>
 Arguments:
   [FILE]
           Input file (omit to read from stdin)
-
-          Language detection and query selection is automatic, mapped from file extensions defined
-          in the Topiary configuration.
+          
+          Language detection and query selection is automatic, mapped from file extensions defined in the Topiary configuration.
 
 Options:
   -f, --format <FORMAT>
           Visualisation format
-
+          
           [default: dot]
 
           Possible values:
           - dot:  GraphViz DOT serialisation
           - json: JSON serialisation
 
   -l, --language <LANGUAGE>
-          Topiary supported language (for formatting stdin)
-
-          [possible values: json, nickel, ocaml, ocaml-interface, ocamllex, toml]
+          Topiary language identifier (for formatting stdin)
 
   -q, --query <QUERY>
           Topiary query file override (when formatting stdin)
 
   -C, --configuration <CONFIGURATION>
           Configuration file
-
+          
           [env: TOPIARY_CONFIG_FILE]
 
       --configuration-collation <CONFIGURATION_COLLATION>
           Configuration collation mode
-
+          
           [env: TOPIARY_CONFIG_COLLATION]
           [default: merge]
 
           Possible values:
-          - merge:    When multiple sources of configuration are available, matching items are
-            updated from the higher priority source, with collections merged as the union of sets
-          - revise:   When multiple sources of configuration are available, matching items
-            (including collections) are superseded from the higher priority source
-          - override: When multiple sources of configuration are available, the highest priority
-            source is taken. All values from lower priority sources are discarded
+          - merge:    When multiple sources of configuration are available, matching items are updated from the higher priority source, with collections merged as the union of sets
+          - revise:   When multiple sources of configuration are available, matching items (including collections) are superseded from the higher priority source
+          - override: When multiple sources of configuration are available, the highest priority source is taken. All values from lower priority sources are discarded
 
   -v, --verbose...
           Logging verbosity (increased per occurrence)
@@ -354,22 +339,19 @@ Usage: topiary config [OPTIONS]
 Options:
   -C, --configuration <CONFIGURATION>
           Configuration file
-
+          
           [env: TOPIARY_CONFIG_FILE]
 
       --configuration-collation <CONFIGURATION_COLLATION>
           Configuration collation mode
-
+          
           [env: TOPIARY_CONFIG_COLLATION]
           [default: merge]
 
           Possible values:
-          - merge:    When multiple sources of configuration are available, matching items are
-            updated from the higher priority source, with collections merged as the union of sets
-          - revise:   When multiple sources of configuration are available, matching items
-            (including collections) are superseded from the higher priority source
-          - override: When multiple sources of configuration are available, the highest priority
-            source is taken. All values from lower priority sources are discarded
+          - merge:    When multiple sources of configuration are available, matching items are updated from the higher priority source, with collections merged as the union of sets
+          - revise:   When multiple sources of configuration are available, matching items (including collections) are superseded from the higher priority source
+          - override: When multiple sources of configuration are available, the highest priority source is taken. All values from lower priority sources are discarded
 
   -v, --verbose...
           Logging verbosity (increased per occurrence)
@@ -400,28 +382,25 @@ Usage: topiary completion [OPTIONS] [SHELL]
 Arguments:
   [SHELL]
           Shell (omit to detect from the environment)
-
+          
           [possible values: bash, elvish, fish, powershell, zsh]
 
 Options:
   -C, --configuration <CONFIGURATION>
           Configuration file
-
+          
           [env: TOPIARY_CONFIG_FILE]
 
       --configuration-collation <CONFIGURATION_COLLATION>
           Configuration collation mode
-
+          
           [env: TOPIARY_CONFIG_COLLATION]
           [default: merge]
 
           Possible values:
-          - merge:    When multiple sources of configuration are available, matching items are
-            updated from the higher priority source, with collections merged as the union of sets
-          - revise:   When multiple sources of configuration are available, matching items
-            (including collections) are superseded from the higher priority source
-          - override: When multiple sources of configuration are available, the highest priority
-            source is taken. All values from lower priority sources are discarded
+          - merge:    When multiple sources of configuration are available, matching items are updated from the higher priority source, with collections merged as the union of sets
+          - revise:   When multiple sources of configuration are available, matching items (including collections) are superseded from the higher priority source
+          - override: When multiple sources of configuration are available, the highest priority source is taken. All values from lower priority sources are discarded
 
   -v, --verbose...
           Logging verbosity (increased per occurrence)