Improve usage docs

Separate out language detection, add intro sentence, clarify options
docs.

manual/src/SUMMARY.md

@@ -8,6 +8,7 @@
   - [Mercurial](./mercurial.md)
   - [Fossil](./fossil.md)
 - [Languages Supported](./languages_supported.md)
+  - [Language Detection](./language_detection.md)
 - [Internals: Parsing](./parsing.md)
 - [Internals: Diffing](./diffing.md)
   - [Tricky Cases](./tricky_cases.md)

manual/src/language_detection.md

@@ -0,0 +1,30 @@
+# Language Detection
+
+Difftastic guesses the language used based on the file extension, file
+name, and the contents of the first few lines.
+
+To see the languages available, and the associated file names, use the
+`--list-languages` option.
+
+```bash
+$ difft --list-languages
+...
+XML
+ *.ant *.csproj *.plist *.resx *.svg *.ui *.vbproj *.xaml *.xml *.xsd *.xsl *.xslt *.zcml App.config nuget.config packages.config .classpath .cproject .project
+YAML
+ *.yaml *.yml
+Zig
+ *.zig
+```
+
+You can override language detection for specific file globs using the
+`--override` option.
+
+```bash
+$ difft --override=GLOB:NAME FIRST-FILE SECOND-FILE
+
+# For example, treating .h files as C rather than C++:
+$ difft --override=*.h:c sample_files/preprocesor_1.h sample_files/preprocesor_2.h
+```
+
+See `difft --help` for more examples of `--override` usage.

manual/src/usage.md

@@ -1,5 +1,10 @@
 # Usage
 
+This page describes how to use the `difft` binary directly. See also
+the [Git](./git.html), [Mercurial](./mercurial.html) and
+[Fossil](./fossil.html) pages for instructions on how to configure
+them to use difftastic.
+
 ## File Arguments
 
 ### Diffing Files
@@ -52,38 +57,29 @@ $ difft FILE-WITH-CONFLICTS
 $ difft sample_files/conflicts.el
 ```
 
-## Language Detection
+## Configuration Options
 
-Difftastic guesses the language used based on the file extension, file
+Every difftastic option can be set with a command line argument or an
-name, and the contents of the first lines. To see the languages
+environment variable. For example, `DFT_BACKGROUND=light` is equivalent to
-available, and the associated file names, use the `--list-languages`
+`--background=light`.
-option.
 
-```
+Environment variables are often useful when using VCS tools like git,
-$ difft --list-languages
+because they invoke the `difft` binary directly.
-```
 
-You can override language detection for specific file globs using the
+For a full list of configuration options, see `--help`.
-`--override` option.
-
-```bash
-$ difft --override=GLOB:NAME FIRST-FILE SECOND-FILE
 
-# For example, treating .h files as C rather than C++:
-$ difft --override=*.h:c sample_files/preprocesor_1.h sample_files/preprocesor_2.h
 ```
-
+$ difft --help
-## Options
+...
-
+OPTIONS:
-Difftastic includes a range of configuration CLI options, see `difft
+        --background <BACKGROUND>
---help` for the full list.
+            Set the background brightness. Difftastic will prefer brighter colours on dark backgrounds.
-
+
-Difftastic can also be configured with environment variables. These
+            [env: DFT_BACKGROUND=]
-are also visible in `--help`.
+            [default: dark]
-
+            [possible values: dark, light]
-For example, `DFT_BACKGROUND=light` is equivalent to
+...
-`--background=light`. This is useful when using VCS tools like git,
+```
-where you are not invoking the `difft` binary directly.
 
 ## Exit Codes