diff options
| -rw-r--r-- | doc/calcurse.1.txt | 8 | ||||
| -rw-r--r-- | src/args.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/doc/calcurse.1.txt b/doc/calcurse.1.txt index 4d202c8..27c5aec 100644 --- a/doc/calcurse.1.txt +++ b/doc/calcurse.1.txt @@ -42,7 +42,7 @@ SYNOPSIS -------- -- -*calcurse* [-D 'directory'] [-C 'confdir'] [-c 'calendar-file'] +*calcurse* [-D 'datadir'] [-C 'confdir'] [-c 'calendar-file'] *calcurse* -Q [*--from* 'date'] [*--to* 'date' | *--days* 'number'] @@ -147,12 +147,12 @@ are marked "('also interactively')". absolute path name, it is interpreted relative to the current working directory. The option has precedence over *-D*. -*-C* 'dir', *--conf* 'dir':: +*-C* 'dir', *--confdir* 'dir':: ('also interactively') Specify the configuration directory to use. If not specified, the default directory is *~/.calcurse/*. See <<_files,FILES>> for the interaction with *-D*. -*-D* 'dir', *--directory* 'dir':: +*-D* 'dir', *--datadir* 'dir':: ('also interactively') Specify the (data) directory to use. If not specified, the default directory is *~/.calcurse/*. See section <<_files,FILES>> for the interaction with *-C*. @@ -654,7 +654,7 @@ An alternative calendar file may be specified with the *-c* option. Configuration files ~~~~~~~~~~~~~~~~~~~ -The +conf+ file contains the user configuration and the +keys+ file +The +conf+ file contains the user configuration and the +keys+ file the user-defined key bindings. The +hooks+ directory contains user-supplied scripts, see <<_hooks,Hooks>>. @@ -143,9 +143,9 @@ static void help_arg(void) putchar('\n'); printf("%s\n", _("Miscellaneous:")); printf("%s\n", _(" -c, --calendar <file> The calendar data file to use")); - printf("%s\n", _(" -C, --conf <directory> The configuration directory to use")); + printf("%s\n", _(" -C, --confdir <dir> The configuration directory to use")); printf("%s\n", _(" --daemon Run notification daemon in the background")); - printf("%s\n", _(" -D, --directory <dir> The data directory to use")); + printf("%s\n", _(" -D, --datadir <dir> The data directory to use")); printf("%s\n", _(" -g, --gc Run the garbage collector")); printf("%s\n", _(" -h, --help Show this help text")); printf("%s\n", _(" -i, --import <file> Import iCal data from file")); @@ -436,8 +436,12 @@ int parse_args(int argc, char **argv) struct option longopts[] = { {"appointment", no_argument, NULL, 'a'}, {"calendar", required_argument, NULL, 'c'}, + /* Deprecated */ {"conf", required_argument, NULL, 'C'}, + {"confdir", required_argument, NULL, 'C'}, {"day", required_argument, NULL, 'd'}, + {"datadir", required_argument, NULL, 'D'}, + /* Deprecated */ {"directory", required_argument, NULL, 'D'}, {"filter", no_argument, NULL, 'F'}, {"gc", no_argument, NULL, 'g'}, |