Mercurial > hg > dav / file diff

--- 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.