changeset
adds documentation for new features
Tue, 03 Oct 2017 16:59:39 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 03 Oct 2017 16:59:39 +0200
- changeset 320
- 12ed560c926c
- parent 319
- 2433b5969d44
- child 321
- eb8885a87866
adds documentation for new features
--- a/docs/html/add-directory.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/add-directory.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/add-repository.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/add-repository.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/archive.html Tue Oct 03 16:59:39 2017 +0200 @@ -0,0 +1,81 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title>dav-sync archive</title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <a href="./index.html"><span>DavUtils documentation</span></a> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<div id="header"> +<h1 class="title">dav-sync archive</h1> +</div> +<p><strong><code>dav-sync archive [-cld] <directory></code></strong></p> +<p>Uploads all new and modified files to the server. The command is similar to the push command, however it does not delete files on the server.</p> +<p>If conflict detection is not disabled, all files that are also modified on the server will be skipped.</p> +<p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites files on the server</p> +<p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>archive</code> completed, the repository is unlocked</p> +<p><strong><code>-d</code></strong> Don't lock the repository (default)</p> +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/check-config.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/check-config.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/check-repositories.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/check-repositories.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/commands.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/commands.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/configuration.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/configuration.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li> @@ -68,7 +70,7 @@ <h1 class="title">Configuration</h1> </div> <p>The main configuration file for <em>dav</em> is <code>$HOME/.dav/config.xml</code> and is used for configuring repositories, proxies and encryption keys. This configuration is also used by <em>dav-sync</em>. The file is created automaticaly if it doesn't exist.</p> -<p>The <em>config.xml</em> file is an XML file with <code><configuration></code> as root element. The <code><configuration></code> element can have the following child elements: <code><repository></code>, <code><http-proxy></code>, <code><https-proxy></code>, <code><key></code></p> +<p>The <em>config.xml</em> file is an XML file with <code><configuration></code> as root element. The <code><configuration></code> element can have the following child elements: <code><repository></code>, <code><http-proxy></code>, <code><https-proxy></code>, <code><key></code>, <code><namespace></code></p> <h2 id="repository">repository</h2> <p>This element is used to configure a repository. A repository must have a unique name to identify the repository and a url pointing to the root collection for this repository.</p> <p>Required child elements: <code><name></code>, <code><url></code><br /> @@ -169,6 +171,9 @@ <p>A comma separated list of all hosts that should not be accessed through the proxy.</p> <p>Type: string<br /> Example: <code><no>host1, host2, host3</no></code></p> +<h2 id="namespace">namespace</h2> +<p>Configures an XML-namespace with prefix and uri. The prefix can be used with commands like <code>get-property</code>. The element must have the <code>prefix</code> and the <code>uri</code> attribute.</p> +<p>Type: no value Example: <code><namespace prefix="e" uri="http://example.com/" /></code></p> <h2 id="example-1-minimal-repository-configuration">Example 1: minimal repository configuration</h2> <p>A minimal configuration for a repository. If no user and/or password are configured, dav prompts for authentication informations if required.</p> <pre><code><configuration>
--- a/docs/html/copy.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/copy.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/date.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/date.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/delete-conflicts.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/delete-conflicts.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/empty-trash.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/empty-trash.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/encryption.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/encryption.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/get-property.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/get-property.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li> @@ -76,7 +78,7 @@ <li><code>D</code> for the <code>DAV:</code> namespace</li> <li><code>idav</code> for <code>http://davutils.org/</code></li> </ol> -<p>To use another namespace, use the <code>-n</code> option.</p> +<p>To use another namespace, use the <code>-n</code> option or configure a namespace in the <a href="./configuration.html">config.xml</a> file.</p> <p>If the property name has no prefix, and no namespace is specified, the default namespace <code>DAV:</code> is used.</p> <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p> <p><strong><code>-c</code></strong> enable file name and path decryption</p>
--- a/docs/html/get.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/get.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/getting-started.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/getting-started.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/info.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/info.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/introduction.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/introduction.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/list-directories.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/list-directories.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/list-repositories.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/list-repositories.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/list.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/list.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li> @@ -67,7 +69,7 @@ <div id="header"> <h1 class="title">dav list</h1> </div> -<p><strong><code>dav list [-altepcR] [-u <date>] <url></code></strong></p> +<p><strong><code>dav list [-altdepcR] [-u <date>] <url></code></strong></p> <p>Lists child resources of the specified collection. Without any option it shows only the direct children and hides files beginning with a dot. The behavior is quite similar to that of the unix tool <code>ls</code>.</p> <h2 id="options">Options</h2> <p><strong><code>-a</code></strong> don't hide files whose names begin with a dot <code>.</code></p> @@ -84,6 +86,7 @@ <p>The third column is the date of the last modification. The <code>strftime</code> format is <code>%b %d %H:%M</code> if the year is the current year. Otherwise the format is <code>%b %d %Y</code>.</p> <p>The last column is the resource name. If the <code>-R</code> option is specified, the resource path is shown.</p> <p><strong><code>-t</code></strong> this options only works in combination with <code>-l</code> and it adds the resource content type to the output (after the flags)</p> +<p><strong><code>-d</code></strong> order resources by their lastmodified date</p> <p><strong><code>-e</code></strong> similar to <code>-l</code>, but with 6 flag fields. Currently only the first 4 fields are used. The last two are reserved for future use.</p> <ol style="list-style-type: decimal"> <li>Field: <code>d---</code> indicates a collection</li>
--- a/docs/html/lock.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/lock.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li> @@ -72,6 +74,7 @@ <p>If the resource is successfully locked, a lock token for this resource is printed to stdout. This lock token should be saved somewhere to unlock the resource eventually.</p> <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p> <p><strong><code>-c</code></strong> enable file name and path decryption</p> +<p><strong><code>-T <seconds></code></strong> specify the lock token timeout in seconds</p> <h3 id="example-1-lock-resource-and-use-the-lock-token">Example 1: lock resource and use the lock token</h3> <pre><code>$ dav lock myserv/resource opaquelocktoken:0454905e-f2ff-45c4-a3d7-5c4e4db5ce37
--- a/docs/html/mkdir.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/mkdir.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/move.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/move.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/pull.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/pull.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/push.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/push.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/put.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/put.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/remove-property.html Tue Oct 03 16:59:39 2017 +0200 @@ -0,0 +1,81 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title>dav remove-property</title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <a href="./index.html"><span>DavUtils documentation</span></a> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<div id="header"> +<h1 class="title">dav remove-property</h1> +</div> +<p><strong><code>dav remove-property [-pc] [-n <uri>] <url> <property></code></strong></p> +<p>Deletes a specific resource property.</p> +<p><em>property</em> is a property name with or without prefix (see <a href="./get-property.html">get-property</a> for details).</p> +<p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p> +<p><strong><code>-c</code></strong> enable file name and path decryption</p> +<p><strong><code>-n <uri></code></strong> specify property namespace</p> +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/remove.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/remove.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/resolve-conflicts.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/resolve-conflicts.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/set-property.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/set-property.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/sync-check-config.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/sync-check-config.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/sync-commands.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/sync-commands.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/sync-configuration.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/sync-configuration.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li> @@ -72,7 +74,7 @@ <h2 id="directory">directory</h2> <p>This element configures a sync-directory. A sync-directory must have a unique name, a (local) path, repository and a database.</p> <p>Required elements: <code><name></code>, <code><repository></code>, <code><path></code>, <code><database></code><br /> -Optional elements: <code><collection></code>, <code><trash></code>, <code><max-retry></code>, <code><backup-on-pull></code>, <code><lock-pull></code>, <code><lock-push></code>, <code><filter></code></p> +Optional elements: <code><collection></code>, <code><trash></code>, <code><max-retry></code>, <code><backup-on-pull></code>, <code><lock-pull></code>, <code><lock-push></code>, <code><lock-timeout></code>, <code><filter></code></p> <h3 id="name">name</h3> <p>Unique sync-directory identifer. This identifer is used in combination with all <em>dav-sync</em> commands.</p> <p>Type: string<br /> @@ -120,6 +122,11 @@ <p>Type: boolean<br /> Default: false<br /> Example: <code><lock-push>true</lock-push></code></p> +<h3 id="lock-timeout">lock-timeout</h3> +<p>Specifies the lock timeout in seconds. If the lock-timeout is 0, the client doesn't request a specific timeout and the server's default value is used. If the lock-timeout is -1, a infinite timeout is requested.</p> +<p>Type: integer<br /> +Default: 0<br /> +Example: <code><lock-timeout>50</lock-timeout></code></p> <h3 id="filter">filter</h3> <p>With the filter element, include and exclude filters can be specified, to control which files are synchronized. The <em>pull</em> and <em>push</em> command apply these filters to file paths. At first it is checked if a file is matching any include filter. If so only files matching not an exclude filter are further processed.</p> <p>Note: The file path is relative to the directory path (and WebDAV collection) but always starts with an path separator.</p>
--- a/docs/html/trash-info.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/trash-info.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/html/unlock.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/html/unlock.html Tue Oct 03 16:59:39 2017 +0200 @@ -28,6 +28,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -48,6 +49,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/src/Makefile Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/Makefile Tue Oct 03 16:59:39 2017 +0200 @@ -40,6 +40,7 @@ SRC += move.md SRC += get-property.md SRC += set-property.md +SRC += remove-property.md SRC += lock.md SRC += unlock.md SRC += info.md @@ -53,6 +54,7 @@ SRC += sync-commands.md SRC += pull.md SRC += push.md +SRC += archive.md SRC += resolve-conflicts.md SRC += delete-conflicts.md SRC += trash-info.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/archive.md Tue Oct 03 16:59:39 2017 +0200 @@ -0,0 +1,16 @@ +--- +title: 'dav-sync archive' +--- + +**`dav-sync archive [-cld] <directory>`** + +Uploads all new and modified files to the server. The command is similar to the push command, however it does not delete files on the server. + +If conflict detection is not disabled, all files that are also modified on the server will be skipped. + +**`-c`** Disable conflict detection. This always overwrites files on the server + +**`-l`** Lock the repository before accessing it. After `archive` completed, the repository is unlocked + +**`-d`** Don't lock the repository (default) +
--- a/docs/src/configuration.md Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/configuration.md Tue Oct 03 16:59:39 2017 +0200 @@ -4,7 +4,7 @@ The main configuration file for *dav* is `$HOME/.dav/config.xml` and is used for configuring repositories, proxies and encryption keys. This configuration is also used by *dav-sync*. The file is created automaticaly if it doesn't exist. -The *config.xml* file is an XML file with `<configuration>` as root element. The `<configuration>` element can have the following child elements: `<repository>`, `<http-proxy>`, `<https-proxy>`, `<key>` +The *config.xml* file is an XML file with `<configuration>` as root element. The `<configuration>` element can have the following child elements: `<repository>`, `<http-proxy>`, `<https-proxy>`, `<key>`, `<namespace>` ## repository @@ -177,6 +177,13 @@ Type: string \ Example: `<no>host1, host2, host3</no>` +## namespace + +Configures an XML-namespace with prefix and uri. The prefix can be used with commands like `get-property`. The element must have the `prefix` and the `uri` attribute. + +Type: no value +Example: `<namespace prefix="e" uri="http://example.com/" />` + ## Example 1: minimal repository configuration A minimal configuration for a repository. If no user and/or password are configured, dav prompts for authentication informations if required.
--- a/docs/src/get-property.md Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/get-property.md Tue Oct 03 16:59:39 2017 +0200 @@ -15,7 +15,7 @@ 1. `D` for the `DAV:` namespace 2. `idav` for `http://davutils.org/` -To use another namespace, use the `-n` option. +To use another namespace, use the `-n` option or configure a namespace in the [config.xml][1] file. If the property name has no prefix, and no namespace is specified, the default namespace `DAV:` is used. @@ -26,3 +26,5 @@ **`-n <uri>`** specify property namespace **Note:** Properties are never encrypted. + +[1]: ./configuration.html
--- a/docs/src/header.html Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/header.html Tue Oct 03 16:59:39 2017 +0200 @@ -17,6 +17,7 @@ <li><a href="move.html">move</a></li> <li><a href="get-property.html">get-property</a></li> <li><a href="set-property.html">set-property</a></li> + <li><a href="remove-property.html">remove-property</a></li> <li><a href="lock.html">lock</a></li> <li><a href="unlock.html">unlock</a></li> <li><a href="info.html">info</a></li> @@ -37,6 +38,7 @@ <ul> <li><a href="pull.html">pull</a></li> <li><a href="push.html">push</a></li> + <li><a href="archive.html">archive</a></li> <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> <li><a href="delete-conflicts.html">delete-conflicts</a></li> <li><a href="trash-info.html">trash-info</a></li>
--- a/docs/src/list.md Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/list.md Tue Oct 03 16:59:39 2017 +0200 @@ -2,7 +2,7 @@ title: 'dav list' --- -**`dav list [-altepcR] [-u <date>] <url>`** +**`dav list [-altdepcR] [-u <date>] <url>`** Lists child resources of the specified collection. Without any option it shows only the direct children and hides files beginning with a dot. @@ -36,6 +36,8 @@ **`-t`** this options only works in combination with `-l` and it adds the resource content type to the output (after the flags) +**`-d`** order resources by their lastmodified date + **`-e`** similar to `-l`, but with 6 flag fields. Currently only the first 4 fields are used. The last two are reserved for future use. 1. Field: `d---` indicates a collection
--- a/docs/src/lock.md Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/lock.md Tue Oct 03 16:59:39 2017 +0200 @@ -12,6 +12,8 @@ **`-c`** enable file name and path decryption +**`-T <seconds>`** specify the lock token timeout in seconds + ### Example 1: lock resource and use the lock token $ dav lock myserv/resource
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/remove-property.md Tue Oct 03 16:59:39 2017 +0200 @@ -0,0 +1,18 @@ +--- +title: 'dav remove-property' +--- + +**`dav remove-property [-pc] [-n <uri>] <url> <property>`** + +Deletes a specific resource property. + +*property* is a property name with or without prefix (see [get-property][1] for details). + +[1]: ./get-property.html + +**`-p`** disable file name and path decryption if enabled + +**`-c`** enable file name and path decryption + +**`-n <uri>`** specify property namespace +
--- a/docs/src/sync-configuration.md Tue Oct 03 14:59:35 2017 +0200 +++ b/docs/src/sync-configuration.md Tue Oct 03 16:59:39 2017 +0200 @@ -11,7 +11,7 @@ This element configures a sync-directory. A sync-directory must have a unique name, a (local) path, repository and a database. Required elements: `<name>`, `<repository>`, `<path>`, `<database>` \ -Optional elements: `<collection>`, `<trash>`, `<max-retry>`, `<backup-on-pull>`, `<lock-pull>`, `<lock-push>`, `<filter>` +Optional elements: `<collection>`, `<trash>`, `<max-retry>`, `<backup-on-pull>`, `<lock-pull>`, `<lock-push>`, `<lock-timeout>`, `<filter>` ### name @@ -92,6 +92,14 @@ Default: false \ Example: `<lock-push>true</lock-push>` +### lock-timeout + +Specifies the lock timeout in seconds. If the lock-timeout is 0, the client doesn't request a specific timeout and the server's default value is used. If the lock-timeout is -1, a infinite timeout is requested. + +Type: integer \ +Default: 0 \ +Example: `<lock-timeout>50</lock-timeout>` + ### filter With the filter element, include and exclude filters can be specified, to control which files are synchronized. The *pull* and *push* command apply these filters to file paths. At first it is checked if a file is matching any include filter. If so only files matching not an exclude filter are further processed.
