diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/calcurse.1.txt | 11 | ||||
| -rw-r--r-- | doc/manual.txt | 26 |
2 files changed, 20 insertions, 17 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 diff --git a/doc/manual.txt b/doc/manual.txt index 2ff8a9a..7f8ac93 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 @@ -1291,20 +1292,23 @@ So here is a list of contributing persons I would like to thank : * Joel for its calendar script which inspired `calcurse` calendar view -* Michael Schulz and Chris M. for the german translation of `calcurse` and its - manual +* Jeremy Roon for the Dutch translation -* Jose Lopez for the spanish translation of `calcurse` and its manual +* Frédéric Culot, Toucouch, Erik Saule, Stéphane Aulery + and Baptiste Jonglez for the French translation -* Neil Williams for the english translation +* Michael Schulz, Chris M., Benjamin Moeller and Lukas Fleischer for the German + translation -* Leandro Noferini for the italian translation +* Rafael Ferreira for the Portuguese (Brazil) translation + +* Aleksey Mechonoshin for the Russian translation + +* Jose Lopez for the Spanish translation * Tony for its patch which helped improving the recur_item_inday() function, and for implementing the date format configuration options -* Jeremy Roon for the dutch translation - * Erik Saule for its patch implementing the `-N`, `-s`, `-S`, `-r` and `-D` flags |