aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am1
-rw-r--r--doc/reload.txt10
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b561f71..73cd8ce 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -36,6 +36,7 @@ nobase_dist_doc_DATA = \
other.txt \
pipe.txt \
priority.txt \
+ reload.txt \
repeat.txt \
save.txt \
tab.txt \
diff --git a/doc/reload.txt b/doc/reload.txt
new file mode 100644
index 0000000..fc771de
--- /dev/null
+++ b/doc/reload.txt
@@ -0,0 +1,10 @@
+Reload
+======
+
+Reload appointments and todo items.
+
+When there are unsaved modifications, calcurse asks you whether you want to
+discard the modifications, keep the local modifications (and cancel the reload
+action) or merge the modifications with the content of the data files. The
+merge operation launches an external merge tool (defaults to vimdiff(1), can be
+changed by setting the 'MERGETOOL' environment variable).