summaryrefslogtreecommitdiff
path: root/doc/calcurse.1.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/calcurse.1.txt
parent7a75415a619bd6698f45ec24f696f7b9dbb3752c (diff)
downloadcalcurse-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/calcurse.1.txt')
-rw-r--r--doc/calcurse.1.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/calcurse.1.txt b/doc/calcurse.1.txt
index 6768088..2383e95 100644
--- a/doc/calcurse.1.txt
+++ b/doc/calcurse.1.txt
@@ -42,7 +42,7 @@ Synopsis
--------
[verse]
-*calcurse* [*-h*|*-v*] [*-an*] [*-t*[num]] [*-c*<file> | *-D*<dir>]
+*calcurse* [*-h*|*-v*] [*-an*] [*-t*[num]] [*-c*<file>] [*-D*<dir>]
[*-i*<file>] [*-x*[format]] [*-d* <date>|<num>]
[*-s*[date]] [*-r*[range]] [*-S* <regex>] [*--status*]
@@ -65,9 +65,8 @@ The following 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 'FILES' below). This option is incompatible
- with -*D*.
+ Specify the calendar file to use. The default calendar is *~/.calcurse/apts*
+ (see section 'FILES' below). 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
@@ -100,8 +99,8 @@ menu. Four formats are available:
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