diff -r 3070d72f54af -r 0e36bb75a732 docs/html/pull.html --- a/docs/html/pull.html Sat Aug 05 13:35:27 2017 +0200 +++ b/docs/html/pull.html Sun Aug 06 14:41:20 2017 +0200 @@ -4,7 +4,7 @@ - + dav-sync pull @@ -64,7 +64,9 @@
-

dav-sync pull

+

pull [-cld] <directory>

Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added.

When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.