--- a/docs/html/pull.html Sat Aug 05 11:33:17 2017 +0200 +++ b/docs/html/pull.html Sat Aug 05 13:35:27 2017 +0200 @@ -67,11 +67,11 @@ <h1 id="dav-sync-pull">dav-sync pull</h1> <p><strong><code>pull [-cld] <directory></code></strong></p> <p>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.</p> -<p>When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.</p> -<p>When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.</p> -<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides locally modified files</p> +<p>When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.</p> +<p>When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.</p> +<p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites locally modified files</p> <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>pull</code> completed, the repository is unlocked</p> -<p><strong><code>-d</code></strong> Don't lock the repository</p> +<p><strong><code>-d</code></strong> Don't lock the repository (default)</p> </div> <!-- end content --> </body>