docs: Doc updates prior to clipmenu 7 release

There are a few things out of whack, like American spelling creeping in,
and a few things that are not really well documented. Before we release
v7 let's make sure this is all reasonably consistent and has good
information.

Author: cdown

README.md

@@ -30,20 +30,25 @@ invoke clipmenu in exactly the same way to get the same effect, like so:
 
     clipmenu -i -fn Terminus:size=8 -nb '#002b36' -nf '#839496' -sb '#073642' -sf '#93a1a1'
 
-For a full list of environment variables that clipmenud can take, please see
-`man clipmenud`.
+By default, clipmenu also adds dmenu-compatible defaults such as `-p` and `-l`.
+If that gets in the way for a custom launcher, set `launcher_pass_dmenu_args` to
+0 in `clipmenu.conf`.
 
-There is also `clipdel` to delete clips, and `clipctl` to enable or disable
-clipboard monitoring.
+For a full list of configuration options (and their environment variable
+equivalents), please see `man clipmenu.conf`.
+
+There is also `clipdel` to delete clips, `clipdelmenu` for interactive deletion,
+and `clipctl` to enable or disable clipboard monitoring.
 
 # Features
 
-The behavior of `clipmenud` can be customized through a config file. As some
+The behaviour of `clipmenud` can be customised through a config file. As some
 examples of things you can change:
 
 * Customising the maximum number of clips stored (default 1000)
 * Disabling clip collection temporarily with `clipctl disable`, reenabling with
   `clipctl enable`
+* Deduplicating repeated clips so only the newest remains
 * Not storing clipboard changes from certain applications, like password
   managers
 * Taking direct ownership of the clipboard

man/clipmenu.1

@@ -7,11 +7,11 @@ clipmenu \- interactive launcher for clipboard entry selection
 .SH DESCRIPTION
 .B clipmenu
 provides an interactive interface for browsing and selecting clipboard entries
-stored by the clipmenud. It launches a menu using a configured launcher
-(e.g., dmenu, rofi, or another custom command) and displays a numbered list of stored
-clips. Once a selection is made, clipmenu calls
+stored by clipmenud. It launches a menu using a configured launcher
+(e.g., dmenu, rofi, or another custom command) and displays a numbered list of
+stored clips. Once a selection is made, clipmenu calls
 .BR clipserve
-to set the chosen clip as the current X11 clipboard.
+to set the chosen clip as the current X11 selections (PRIMARY and CLIPBOARD).
 .SH OPTIONS
 .TP
 .B \-h, \--help

man/clipmenu.conf.5

@@ -3,7 +3,7 @@
 clipmenu.conf \- configuration file for clipmenu applications
 .SH DESCRIPTION
 clipmenu.conf defines the runtime settings for clipmenu applications (including
-clipmenu itself, clipmenud, clipctl, clipdel, and clipserve).
+clipmenu itself, clipmenud, clipctl, clipdel, clipdelmenu, and clipserve).
 .SH FORMAT
 Each non-comment line in clipmenu.conf consists of a key followed by one or
 more whitespace-separated values. Blank lines and lines starting with '#' are
@@ -23,6 +23,10 @@ entries. Default: 100.
 If set to 1, clipmenud processes clipboard selections only once before exiting.
 Default: 0.
 .TP
+.B deduplicate
+If set to 1, clipmenud keeps only the newest copy of duplicate clips instead of
+storing every duplicate entry. Default: 0.
+.TP
 .B own_clipboard
 Determines whether clipmenud should claim ownership of the X11 clipboard. Works
 together with own_selections. Default: 0.
@@ -44,8 +48,8 @@ Specifies the launcher command to use with clipmenu. Alternative choices
 include rofi's dmenu mode or a custom command. Default: "dmenu".
 .TP
 .B launcher_pass_dmenu_args
-When enabled, extra command-line arguments passed to clipmenu are forwarded to
-the launcher. Default: 1.
+When enabled, clipmenu and clipdelmenu add dmenu-compatible defaults (such as
+-p and -l) before any user-provided arguments. Default: 1.
 .TP
 .B touch_on_select
 When an entry is selected via
@@ -61,17 +65,35 @@ incrementally update the clipboard (e.g. progressive text selection in
 browsers). Set to 0 to disable partial merging entirely. Default: 2.
 .TP
 .B cm_dir
-Overrides the default directory for the clip store. This is by default at a
-subdirectory inside XDG_RUNTIME_DIR, TMPDIR, or if both are unset, inside /tmp.
-The path must be absolute.
-A leading ~ expands to $HOME.
+Overrides the default base directory for clipmenu runtime data. The clip store
+is created at a subdirectory named clipmenu.<version>.<uid> inside this
+directory. By default, it uses XDG_RUNTIME_DIR, TMPDIR, or /tmp if neither are
+set. The path must be absolute. A leading ~ expands to $HOME.
 .SH FILE LOCATION
 Typically, clipmenu.conf is located at
 .BR ~/.config/clipmenu/clipmenu.conf
 .
 The file location can be overridden with $CM_CONFIG, which must be an absolute
-path.
-A leading ~ expands to $HOME.
+path. A leading ~ expands to $HOME. If $CM_CONFIG is unset, $XDG_CONFIG_HOME is
+used (falling back to ~/.config).
+.SH ENVIRONMENT
+.TP
+.B CM_CONFIG
+Absolute path (or a path beginning with ~) to the configuration file. This
+takes precedence over $XDG_CONFIG_HOME.
+.TP
+.B XDG_CONFIG_HOME
+Base directory for configuration files. If unset, ~/.config is used.
+.TP
+.B CM_DEBUG
+If set to 1, enable debug logging.
+.TP
+.B Config environment variables
+CM_MAX_CLIPS, CM_MAX_CLIPS_BATCH, CM_ONESHOT, CM_DEDUPLICATE, CM_OWN_CLIPBOARD,
+CM_SELECTIONS, CM_OWN_SELECTIONS, CM_IGNORE_WINDOW, CM_LAUNCHER,
+CM_LAUNCHER_PASS_DMENU_ARGS, and CM_DIR are environment variable equivalents for
+the configuration keys of the same name. These override values from the config
+file and are provided for compatibility with versions prior to 7.
 .SH SEE ALSO
 .BR clipctl (1),
 .BR clipdel (1),

man/clipserve.1

@@ -7,7 +7,7 @@ clipserve \- serve a selected clipboard entry to X11 selections
 .SH DESCRIPTION
 .B clipserve
 serves the clipboard content identified by a hash from the clip store on the
-X11 clipboard.
+X11 selections (PRIMARY and CLIPBOARD).
 
 This program is not usually invoked directly, but is instead called from inside
 other clipmenu applications.
@@ -16,8 +16,8 @@ other clipmenu applications.
 .B \-h, \--help
 Display the help message (invokes the manual page).
 .TP
-clipserve requires exactly one argument, which is the hash of the clipboard
-entry to be served.
+clipserve requires exactly one argument, which is the hexadecimal hash of the
+clipboard entry to be served.
 .SH CONFIGURATION
 See
 .BR clipmenu.conf (5).