From 86c465b0e50e1479e819f63c0bac86e7aec236a1 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 27 Jun 2012 12:07:02 +0200 Subject: Allow passing both "-D" and "-c" This is particularly useful if one wants to use configuration and key bindings from a specific directory, while using an appointment file from somewhere else. "-c" has precedence over "-D". Also update the usage message, man page and documentation. Signed-off-by: Lukas Fleischer --- doc/manual.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/manual.txt') diff --git a/doc/manual.txt b/doc/manual.txt index 2ff8a9a..9f2791a 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -181,8 +181,9 @@ long options are supported): from which to read the appointments can be specified using the `-c` flag. `-c , --calendar `:: - Specify the calendar file to use. The default calendar is - `~/.calcurse/apts` (see section <>). + Specify the calendar file to use. The default calendar is `~/.calcurse/apts` + (see section <>). This option has precedence + over `-D`. `-d , --day `:: Print the appointments for the given date or for the given number of @@ -206,8 +207,8 @@ Note: as for the `-a` flag, the calendar from which to read the appointments can be specified using the `-c` flag. `-D , --directory `:: - Specify the data directory to use. This option is incompatible with -c. - If not specified, the default directory is `~/.calcurse/`. + Specify the data directory to use. If not specified, the default directory is + `~/.calcurse/`. `--format-apt `:: Specify a format to control the output of appointments in non-interactive -- cgit v1.2.3-54-g00ecf