aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual.txt
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-06-27 12:07:02 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2012-06-30 14:34:37 +0200
commit86c465b0e50e1479e819f63c0bac86e7aec236a1 (patch)
tree29012c3da575e004a3c34d56f1eba0771fc7ab33 /doc/manual.txt
parent7a75415a619bd6698f45ec24f696f7b9dbb3752c (diff)
downloadcalcurse-86c465b0e50e1479e819f63c0bac86e7aec236a1.tar.gz
calcurse-86c465b0e50e1479e819f63c0bac86e7aec236a1.zip
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 <calcurse@cryptocrack.de>
Diffstat (limited to 'doc/manual.txt')
-rw-r--r--doc/manual.txt9
1 files changed, 5 insertions, 4 deletions
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 <file>, --calendar <file>`::
- Specify the calendar file to use. The default calendar is
- `~/.calcurse/apts` (see section <<basics_files,calcurse files>>).
+ Specify the calendar file to use. The default calendar is `~/.calcurse/apts`
+ (see section <<basics_files,calcurse files>>). This option has precedence
+ over `-D`.
`-d <date|num>, --day <date|num>`::
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 <dir>, --directory <dir>`::
- 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 <format>`::
Specify a format to control the output of appointments in non-interactive