- Softened the wording in an error message.
- Added WARNING commends to the Config sample.
This commit is contained in:
Paul Beckingham 2010-10-07 23:38:34 -04:00
parent 42521fea8b
commit 533bbedd81
2 changed files with 4 additions and 2 deletions

View file

@ -233,6 +233,9 @@ std::string Config::defaults =
"shell.prompt=task> # Prompt used by the shell command\n"
"\n"
"# Merge options\n"
"#\n"
"# WARNING: Please read the documentation (man task-sync) before proceeding with these\n"
"# synchronization features. Improperly used, data can be lost!\n"
"merge.autopush=ask # Push database to remote origin after merge: yes, no, ask\n"
"#merge.default.uri=user@host.xz:.task/ # URI for merge\n"
"#pull.default.uri=rsync://host.xz/task-backup/ # URI for pull\n"