dav-sync add-directory

- +
This command runs an interactive assistant that creates a sync-directory configuration and adds it to the sync.xml file. Before running this command, a repository must be created. See dav add-repository.
Command alias: add-dir
The assistant firstly asks for a unique sync-directory name. This may not match the physical directory name. If you are not sure, which names are already in use, you can get a list of currently present sync-directories with dav-sync list-directories. Then you specifiy the local path, select the dav repository and specify the collection within that repository. You may use environment variables like $HOME within the path name. A call of add-directory may look like this.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/add-repository.html --- a/docs/html/add-repository.html Sun Dec 15 16:54:05 2019 +0100 +++ b/docs/html/add-repository.html Sun Dec 15 17:00:46 2019 +0100 @@ -1,12 +1,20 @@ - - + + - - + + dav add-repository - - + + +
@@ -26,6 +34,7 @@
@@ -35,9 +44,19 @@
@@ -53,11 +72,13 @@
@@ -74,12 +95,12 @@
- +
This command runs an interactive assistant that creates a repository configuration and adds it to the config.xml file.
Command alias: add-repo
The assistant firstly asks for a unique repository name. If you are not sure, which names are already in use, you can get a list of currently present repositories with dav list-repositories. Then you specifiy the base URL and optional authentication information. Please keep in mind, that the password is stored base64 encoded in your configuration. If you do not want this to happen, leave the password blank. dav will ask you for the password when accessing the repository. Beware that you don't use password prompt in background jobs, though. A call of add-repository may look like this.
The assistant firstly asks for a unique repository name. If you are not sure, which names are already in use, you can get a list of currently present repositories with dav list-repositories. Then you specifiy the base URL and optional authentication information. Please keep in mind, that the password is stored base64 encoded in your configuration. If you do not want this to happen, leave the password blank. dav will ask you for the password when accessing the repository. Beware that you don’t use password prompt in background jobs, though. A call of add-repository may look like this.
$ dav add-repository
 Each repository must have an unique name.
 name: myfirstrepo
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/add-tag.html
--- a/docs/html/add-tag.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/add-tag.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync add-tag
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync add-tag
-
+
 dav-sync add-tag [-s <syncdir>] <file> <tag>
 Adds a tag to a SyncDirectory file. The file argument must be a normal file path. If multiple SyncDirectories contain this file, the SyncDirectory must be specified with the -s option.
 Tags must be enabled for the SyncDirectory. See Configuration for details.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/add-user.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/add-user.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,106 @@
+
+
+
+  
+  
+  
+  dav add-user
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav add-user
+
+This command runs an interactive assistant that adds a user to the secret store. The secret store is an encrypted file, that stores user credentials.
+The assistant firstly asks for the secret store master password. After that, you must specify a unique credentials identifier, the user name and password. Optionally it is possible to specify one or more locations (URLs), where these credentials should be used.
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/archive.html
--- a/docs/html/archive.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/archive.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync archive
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,16 +95,19 @@
 
 
 
-
+
 dav-sync archive
-
-dav-sync archive [-cld] [-t <tags>] <directory>
+
+dav-sync archive [-cldSRM] [-t <tags>] <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)
+-d Don’t lock the repository (default)
 -t <tags> Only sync files that match the tag filter expression
+-S Save the previous file version, before replacing it
+-R Upload files, that were deleted on the server since last sync, but still locally available
+-M Upload files, that were modified on the server since last sync
 
 
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/check-config.html
--- a/docs/html/check-config.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/check-config.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav check-config
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav check-config
-
+
 Validates the config.xml file. If the config is ok, it prints Configuration OK. to stdout and returns 0, otherwise it prints an error message to stderr and returns 1.
 Command alias: check
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/check-repositories.html
--- a/docs/html/check-repositories.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/check-repositories.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync check-repositories
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync check-repositories
-
+
 Checks if every repository used by sync-directories is configured and available. This command outputs the status for each repository. It returns zero when all repositories are all available and non-zero otherwise.
 Command alias: check-repos
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/checkin.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/checkin.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,108 @@
+
+
+
+  
+  
+  
+  dav checkin
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav checkin
+
+dav checkin [-pc] <url>
+Changes the state of a resource to checked-in. This will create a new version of the resource. In the checked-in state the resource cannot be modified.
+-p disable file name and path decryption if enabled
+-c enable file name and path decryption
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/checkout.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/checkout.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,108 @@
+
+
+
+  
+  
+  
+  dav checkout
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav checkout
+
+dav checkout [-pc] <url>
+Changes the state of a resource to checked-out to allow modifications to the content and properties.
+-p disable file name and path decryption if enabled
+-c enable file name and path decryption
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/commands.html
--- a/docs/html/commands.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/commands.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Commands
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 Commands
-
+
 Overview
 List resources:
 dav list <url>
@@ -92,7 +113,7 @@
 dav copy <src-url> <dst-url>
 There is also a move operation similar to copy:
 dav move <src-url> <dst-url>
-These are the most common commands. There are also more commands, e.g. for webdav locking or manipulating webdav properties. See the left menu for a complete list.
+These are the most common commands. There are also more commands, e.g. for webdav locking or manipulating webdav properties. See the left menu for a complete list.
 Common options
 -N disable any authentication prompt. If authentication is required, dav will abort.
 -i disable TLS certificate verification
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/configuration.html
--- a/docs/html/configuration.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/configuration.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Configuration
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,10 +95,10 @@
 
 
 
-
+
 Configuration
-
-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 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>, <namespace>
 repository
 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.
@@ -99,6 +120,10 @@
 A base64 encoded password used for authentication.
 Type: base64 string

 Example: <password>MTIzNDU2Nzg=</password>
+stored-user
+Credentials id used for authentication. The credentials must be stored in the secret store.
+Type: string

+Example: <stored-user>alice</stored-user>
 default-key
 Identifer of the key used by default for encryption. There must be a configured key with this name.
 Type: string

@@ -127,7 +152,7 @@
 
Path to a file containing certificates to verify the TLS connection to the server.
 Type: string

 Example: <cert>/etc/certs/cabundle.pem</cert>
-Note: This element does the same as curl's --cacert option.
+Note: This element does the same as curl’s --cacert option.
 verification
 This element can disable TLS certificate verification.
 Type: boolean

diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/copy.html
--- a/docs/html/copy.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/copy.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav copy
-  
-  
+  
+  
+  
 
 
 

@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav copy
-
+
 dav copy [-pcO] [-L <lock>] <url1> <url2>
 Creates a duplicate of the resource identified by url1 at the location url2. All resource properties are copied. Currently url1 and url2 must be the same host.
 If url1 is a collection, all children are copied.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/date.html
--- a/docs/html/date.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/date.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav date
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav date
-
+
 dav date [url]
 The purpose of this command is to get the current date from a server and print it to stdout (HTTP date format). This in useful in combination with the -u option for the list and get command.
 The url can be any http url. If no url is specified, the local time is used.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/delete-conflicts.html
--- a/docs/html/delete-conflicts.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/delete-conflicts.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync delete-conflicts
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync delete-conflicts
-
+
 dav-sync delete-conflicts <directory>
 Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/edit-user.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/edit-user.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,105 @@
+
+
+
+  
+  
+  
+  dav edit-user
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav edit-user
+
+Interactive command for editing secret store credentials.
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/empty-trash.html
--- a/docs/html/empty-trash.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/empty-trash.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync empty-trash
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync empty-trash
-
+
 dav-sync empty-trash <directory>
 Removes all files from the trash directory of the given sync-directory.
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/encryption.html
--- a/docs/html/encryption.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/encryption.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Encryption
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,11 +95,11 @@
 
 
 
-
+
 Encryption
-
+
 The davutils programs have an integrated client-side encryption feature, that allows you to encrypt and decrypt on the fly with AES256 or AES128. To use this feature, the server must support WebDAV dead properties.
-The tools support both, encryption of the resource content and encryption of the resource name. Each resource is encrypted separately. With activated name encryption, the actual resource name is disguised by a random name but the name used by the client is stored encrypted as a WebDAV property. This means, an attacker can see the directory structure and the file length, but can't guess the file names and in particular which files have the same name.
+The tools support both, encryption of the resource content and encryption of the resource name. Each resource is encrypted separately. With activated name encryption, the actual resource name is disguised by a random name but the name used by the client is stored encrypted as a WebDAV property. This means, an attacker can see the directory structure and the file length, but can’t guess the file names and in particular which files have the same name.
 To enable encryption a key must be configured in $HOME/.dav/config.xml. A key must have a unique name. To access encrypted resources, all clients must configure the same key with the same name. Currently a key can only be loaded from a file and not generated from a password.
 A configuration for a key looks like:
 <key>
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/export.html
--- a/docs/html/export.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/export.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav export
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav export
-
+
 dav export [-pc] [-o <file>] [-u <date>] <url>
 Downloads a resource or a collection with all child resources, and writes the contents to an archive file. The Output is written to stdout, unless the -o option is used.
 Currently the only available archive format is the ustar format.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/get-property.html
--- a/docs/html/get-property.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/get-property.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav get-property
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav get-property
-
+
 dav get-property [-pcx] [-n <uri>] <url> <property>
 Gets a specific resource property. Every WebDAV property has a name and an XML namespace. A namespace can be specified with the -n option or with a prefixed name. The prefix and property name are separated by a : as usual.
 If the -x option is specified, a valid xml document containing the value is printed on stdout.
@@ -84,7 +105,7 @@
 Example: D:creationdate
 D is the prefix, creationdate is the name.
 There are only two available prefixes by default:
-
+
 D for the DAV: namespace
 idav for http://davutils.org/
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/get.html
--- a/docs/html/get.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/get.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav get
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,17 +95,18 @@
 
 
 
-
+
 dav get
-
-dav get [-pcRK] [-o <file>] [-u <date>] <url>
-Downloads a resource. This command also downloads collections and its child resources when the -R option is used. When downloading a single resource, the default local file name is the resource name. When downloading collections, it does not create a local directory with the collection's name and places its children in there, but it downloads the children directly to the current working directory.
+
+dav get [-pcRK] [-o <file>] [-u <date>] [-V <version>] <url>
+Downloads a resource. This command also downloads collections and its child resources when the -R option is used. When downloading a single resource, the default local file name is the resource name. When downloading collections, it does not create a local directory with the collection’s name and places its children in there, but it downloads the children directly to the current working directory.
 -p disable file name and content decryption. You get exactly what is stored on the server.
 -c enable file name and content decryption
 -R download a collection
--K download only files that don't exist locally
+-K download only files that don’t exist locally
 -o <file> specify the local output file. A - indicates stdout
 -u <date> download only files which are modified since the specified date. Uses the HTTP date format
+-V <version> downloads a specific version of the resource. Available versions can be listed with the list-versions command
 
 
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/getting-started.html
--- a/docs/html/getting-started.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/getting-started.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Getting started
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 Getting started
-
+
 Test
 After successful installation you can test dav with your WebDAV server.
 dav list http://example.com/webdav/
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/import.html
--- a/docs/html/import.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/import.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav import
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav import
-
+
 dav import [-pc] [-k <key>] [-L <lock>] <url> <file>
 Uploads the content of an archive file to a collection. If the url points to a non-existing collection, the collection is created.
 Currently the only available archive format is the ustar format. You can use tools like tar or the dav export command to create such archives.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/info.html
--- a/docs/html/info.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/info.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav info
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav info
-
+
 dav info [-pc] <url>
 Prints some information and lists all properties for the resource specified by url.
 Example 1: info of a collection
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/introduction.html
--- a/docs/html/introduction.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/introduction.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Introduction to dav-sync
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 Introduction to dav-sync
-
+
 The dav-sync program can synchronize a local directory with a WebDAV collection.
 First Steps
 To use dav-sync it is required to configure a repository in config.xml and the directory in sync.xml.
@@ -114,7 +135,7 @@
 Every sync-directory has a database xml file that contains the etag and last modified date of each file. The etag is used to detect changes on the server and the last modified date is used to detect local changes. The database file is usually located in $HOME/.dav/ and if you want to reset a sync-directory, you can delete the database. After that, pull/push (with disabled conflict detection) will download/upload all files.
 Conflict detection
 The pull and push commands detect if a file has changed remotely and locally. This is a conflict that must be resolved manually.
-When pull detects a conflict it renames the local file to orig-$number.$name where $number is an integer, usually 0 if no other conflict file with the name exists and $name is the file's name. After the file is renamed the new file from the server is downloadet. The user should merge the files manually then or just delete one or keep both. After that run resolve-conflicts to remove all conflict entries from the database otherwise push will ignore any file in a conflict state. There is also the delete-conflicts command that deletes all conflict files.
+When pull detects a conflict it renames the local file to orig-$number.$name where $number is an integer, usually 0 if no other conflict file with the name exists and $name is the file’s name. After the file is renamed the new file from the server is downloadet. The user should merge the files manually then or just delete one or keep both. After that run resolve-conflicts to remove all conflict entries from the database otherwise push will ignore any file in a conflict state. There is also the delete-conflicts command that deletes all conflict files.
 When push detects that a file is modified locally and on the server, it just skips this file. Run the pull command to get the new file from the server and resolve the conflict like described above.
 Trash
 For high data safety, a trash directory can be configured. If this is done, dav-sync will not delete files, but move them to the trash directory. Also the pull command can move files to the trash directory before overwriting them.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-conflicts.html
--- a/docs/html/list-conflicts.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/list-conflicts.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync list-conflicts
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,12 +95,12 @@
 
 
 
-
+
 dav-sync list-conflicts
-
+
 dav-sync list-conflicts [-v] <directory>
 Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file.
-For each conflict a backup file with the pattern orig.N.filename has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don't need to do anything more and dav-sync will remove the conflict from the database automatically. You can also use the delete-conflicts command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the resolve-conflicts command to forcefully clear the conflict database.
+For each conflict a backup file with the pattern orig.N.filename has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don’t need to do anything more and dav-sync will remove the conflict from the database automatically. You can also use the delete-conflicts command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the resolve-conflicts command to forcefully clear the conflict database.
 
 
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-directories.html
--- a/docs/html/list-directories.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/list-directories.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync list-directories
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync list-directories
-
+
 This command lists all configured sync-directories.
 Command alias: list-dirs
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-repositories.html
--- a/docs/html/list-repositories.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/list-repositories.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav list-repositories
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav list-repositories
-
+
 This command lists all configured repositories.
 Command alias: list-repos
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-tags.html
--- a/docs/html/list-tags.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/list-tags.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync add-tag
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync add-tag
-
+
 dav-sync list-tags [-s <syncdir>] <file>
 Lists all file tags.
 Tags must be enabled for the SyncDirectory. See Configuration for details.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-users.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/list-users.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,105 @@
+
+
+
+  
+  
+  
+  dav list-users
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav list-users
+
+The command lists all credentials that are saved in the secret store.
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-versions.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/list-versions.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,108 @@
+
+
+
+  
+  
+  
+  dav list-versions
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav list-versions
+
+dav list-versions [-pc] <url>
+Lists all versions of a version-controlled resource.
+-p disable file name and path decryption if enabled
+-c enable file name and path decryption
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list.html
--- a/docs/html/list.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/list.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav list
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,18 +95,18 @@
 
 
 
-
+
 dav list
-
+
 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. The behavior is quite similar to that of the unix tool ls.
 Options
--a don't hide files whose names begin with a dot .
+-a don’t hide files whose names begin with a dot .
 -l show additional information for resources
 Example:
 --     4.2 KiB  Oct 11  2015  somefile
 The first column contains to fields for flags.
-
+
 Field: d- indicates a collection
 Field: -c indicates an encrypted resource
 
@@ -96,7 +117,7 @@
 -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.
-
+
 Field: d--- indicates a collection
 Field: -c-- indicates an encrypted resource
 Field: --l- indicates a locked resource
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/lock.html
--- a/docs/html/lock.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/lock.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav lock
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav lock
-
+
 dav lock [-pc] <url>
 Creates a lock on the resource specified by the url. The lock is an exclusive write lock with infinite depth.
 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.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/mkdir.html
--- a/docs/html/mkdir.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/mkdir.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav mkdir
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav mkdir
-
+
 dav mkdir [-pc] [-k <key>] [-L <lock>] <url>
 Creates a collection. All intermediate collections are also created as necessary.
 -p disable file name encryption and decryption
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/move.html
--- a/docs/html/move.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/move.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav move
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav move
-
+
 dav move [-pcO] [-L <lock>] <url> <url>
 Moves the resource identified by url1 to the location url2. Currently url1 and url2 must be on the same host.
 If url2 already exists, the command aborts, unless the -O option is specified.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/pull.html
--- a/docs/html/pull.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/pull.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync pull
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,16 +95,16 @@
 
 
 
-
+
 dav-sync pull
-
+
 dav-sync pull [-cldr] [-t <tags>] <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.
 When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.
 -c Disable conflict detection. This always overwrites locally modified files
 -l Lock the repository before accessing it. After pull completed, the repository is unlocked
--d Don't lock the repository (default)
+-d Don’t lock the repository (default)
 -t <tags> Only sync files that match the tag filter expression
 -r Delete files not matching the tag filter
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/push.html
--- a/docs/html/push.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/push.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync push
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,17 +95,20 @@
 
 
 
-
+
 dav-sync push
-
-dav-sync push [-cldr] [-t <tags>] <directory>
+
+dav-sync push [-cldrSRM] [-t <tags>] <directory>
 Pushes all local changes to the server. This uploads all locally modified files and deletes all locally deleted 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 push completed, the repository is unlocked
--d Don't lock the repository (default)
+-d Don’t lock the repository (default)
 -t <tags> Only sync files that match the tag filter expression
 -r Remove resources not matching the tag filter
+-S Save the previous file version, before replacing it
+-R Upload files, that were deleted on the server since last sync, but still locally available
+-M Upload files, that were modified on the server since last sync
 
 
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/put.html
--- a/docs/html/put.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/put.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav put
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,11 +95,11 @@
 
 
 
-
+
 dav put
-
+
 dav put [-pcR] [-k <key>] [-L <lock>] <url> <file>
-Uploads a file or a directory. When uploading a file while the url points to an existing collection, a resource inside this collection with the file's name is created. When the url points to a non-existing resource, the resource is created.
+Uploads a file or a directory. When uploading a file while the url points to an existing collection, a resource inside this collection with the file’s name is created. When the url points to a non-existing resource, the resource is created.
 When uploading a directory, you need to specify the -R option. It uploads all files in the directory to the specified url, but it does not create a collection for the directory itself. You may use dav mkdir to create this collection beforehand.
 -p disable file name encryption and decryption
 -c enable file name and content encryption
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/remove-property.html
--- a/docs/html/remove-property.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/remove-property.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav remove-property
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 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 for details).
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/remove-repository.html
--- a/docs/html/remove-repository.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/remove-repository.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav remove-repository
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav remove-repository
-
+
 dav remove-repository <reponame>
 This command removes a repository from the config.xml file.
 Command alias: remove-repo, rm-repo
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/remove-tag.html
--- a/docs/html/remove-tag.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/remove-tag.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync add-tag
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync add-tag
-
+
 dav-sync remove-tag [-s <syncdir>] <file> <tag>
 Removes a tag from a SyncDirectory file.
 Tags must be enabled for the SyncDirectory. See Configuration for details.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/remove-user.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/remove-user.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,105 @@
+
+
+
+  
+  
+  
+  dav remove-user
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav remove-user
+
+Interactive command for removing secret store credentials.
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/remove.html
--- a/docs/html/remove.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/remove.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav remove
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav remove
-
+
 dav remove [-pc] [-L <lock>] <url>
 Removes a resource. When removing a collection, all child resources are also removed.
 -p disable file name and path decryption if enabled
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/rename.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/rename.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,111 @@
+
+
+
+  
+  
+  
+  dav rename
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav rename
+
+rename [-pcO] [-L <lock>] <url> <name>
+Changes the name of a resource to name.
+In case of unencrypted resources, this will do a MOVE-Request. On encrypted resources, this command will do a PROPPATCH-Request, changing the crypto-name property.
+-p disable file name and path decryption for url
+-c enable file name and path decryption for url
+-O overwrite the destination resource
+-L <lock> use a lock token. See dav lock
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/repository-url.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/repository-url.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,108 @@
+
+
+
+  
+  
+  
+  dav repository-url
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav repository-url
+
+Prints the url of an repository.
+dav repository-url [-p] <name>
+-p don’t include user and password in the url
+Command alias: repo-url
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/resolve-conflicts.html
--- a/docs/html/resolve-conflicts.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/resolve-conflicts.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync resolve-conflicts
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync resolve-conflicts
-
+
 dav-sync resolve-conflicts <directory>
 Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that you have resolved the conflicts. Usually you will not need this command.
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/restore.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/restore.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,112 @@
+
+
+
+  
+  
+  
+  dav-sync restore
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav-sync restore
+
+dav-sync restore [-ldRM] [-V <version>] [-s <directory>] [file...]
+Restores local files by downloading them from the server. The file argument can be a local absolute or relative file path.
+If no files are specified, a sync directory must be specified with the -s option.
+-l Lock the repository before accessing it. After restore completed, the repository is unlocked
+-d Don’t lock the repository (default)
+-R Restore only files, that were locally removed
+-M Restore only files, that were locally modified
+-V <version> Restore a specific file version. version must be the version name listed by dav-sync list-versions
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/set-property.html
--- a/docs/html/set-property.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/set-property.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav set-property
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav set-property
-
+
 dav set-property [-pc] [-L <lock>] [-n <uri>] <url> <property> [value]
 Sets a resource property to the specified value.
 property is a property name with or without prefix (see get-property for details).
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/set-tags.html
--- a/docs/html/set-tags.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/set-tags.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync add-tag
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync add-tag
-
+
 dav-sync set-tags [-s <syncdir>] <file> [tags]
 Sets all tags for a SyncDirectory file. The file argument must be a normal file path. If multiple SyncDirectories contain this file, the SyncDirectory must be specified with the -s option.
 If no tags are specified, all tags are removed from this file.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/sync-check-config.html
--- a/docs/html/sync-check-config.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/sync-check-config.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync check-config
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync check-config
-
+
 Validates the sync.xml file. If the configuration is OK, it prints Configuration OK. to stdout and returns 0, otherwise it prints an error message to stderr and returns 1.
 Command alias: check
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/sync-commands.html
--- a/docs/html/sync-commands.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/sync-commands.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Commands
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 Commands
-
+
 All commands expect a <directory> argument, which is the identifer of a local directory that should be synchronized. The directory must be configured in sync.xml. See Configuration.
 Common Commands
 Get resources from the server, which are modified since last sync:
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/sync-configuration.html
--- a/docs/html/sync-configuration.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/sync-configuration.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   Configuration
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,15 +95,15 @@
 
 
 
-
+
 Configuration
-
+
 The file $HOME/.dav/sync.xml is used for configuring sync-directories.
 The sync.xml file is an XML file with <configuration> as root element. This element can only have <directory> elements as children.
 directory
 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>, <lock-timeout>, <filter>
+Optional elements: <collection>, <trash>, <max-retry>, <backup-on-pull>, <lock-pull>, <lock-push>, <lock-timeout>, <filter>, <metadata>, <versioning>, <splitconfig>, <symlink-intern>, <symlink-extern>, <tagconfig>, <allow-cmd>
 name
 Unique sync-directory identifer. This identifer is used in combination with all dav-sync commands.
 Type: string

@@ -106,10 +127,19 @@
 
Type: string

 Default: /

 Example: <collection>/myfiles</collection>
+hashing
+Enables file hashing. The hash will be used for checking if files are modified and should be synchronized.
+Type: boolean

+Default: false

+Example: <hashing>true</hashing>
 trash
 Path to the trash directory for this sync-directory. Files that should be deleted will be moved to this directory. The value must be an absolute path or relative to the sync-directory path.
 Type: string

 Example: <trash>.trash</trash>
+push-strategy
+Controls the strategy push uses for deciding which files should be pushed. Possible values are: metadata and hash.
+Type: pushstrategy enum

+Default: metadata Example: <push-strategy>hash</push-strategy>
 max-retry
 This integer value controls how many attempts of downloading/uploading a file in case of an error are made.
 Type: integer

@@ -131,10 +161,37 @@
 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.
+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>
+metadata
+Controls which file metadata should be synchronized. Possible values are: mtime, mode, xattr and all. If this element is not specified, no metadata will be synchronized.
+Type: list of metadata

+Example: <metadata>mtime mode</metadata>
+versioning
+Enables resource versioning for the commands push and archive.
+Possible attributes: type, always
+The attribute type sets the versioning method type. Possible values are simple and deltav. With simple versioning, resources are moved to a version history collection before the new content is uploaded. With deltav, the DeltaV methods checkout and checkin are used to store versions. The default value of the type attribute is simple.
+The boolean attribute always specifies if new versions should be always created. The default value is false.
+Optional elements: <history> Example: <versioning type="simple" always="true" />
+history
+Specifies the history collection path for simple versioning. The path is interpreted relatively to the root of the sync directory.
+Type: string

+Default: /.dav-version-history Example:
+<versioning type="simple">
+    <history>/.backup/</history>
+</versioning>
+symlink-intern
+Configures the handling of symlinks, which have a target inside the sync directory. Possible values are: sync, follow and ignore.
+Type: symlink enum

+Default: follow

+Example: <symlink-intern>sync</symlink-intern>
+symlink-extern
+Configures the handling of symlinks, which have a target outside the sync directory. Possible values are: follow and ignore. Unlike internal symlinks, external symlinks cannot be synced.
+Type: symlink enum

+Default: follow

+Example: <symlink-extern>ignore</symlink-extern>
 tagconfig
 Configures the local store for resource tags. If this element is specified, resource tags are stored locally.
 Optional elements: local-store, detect-changes, xattr-name, on-conflict
@@ -159,6 +216,34 @@
 Type: onconflict enum

 Default: no_conflict

 Example: <on-conflict>merge</on-conflict>
+splitconfig
+Parent element for all <split> elements.
+split
+Configures if and how files should be splitted into multiple parts on push.
+The blocksize element configures the size of each part.
+The elements filter and minsize specify, in which case the files should be splitted.
+Required elements: <blocksize>

+Optional elements: <filter>, <minsize>
+Example:
+<splitconfig>
+    <!-- split all files with .vmdk file extension that are bigger than 100mb -->
+    <split>
+        <blocksize>10m</blocksize>
+        <filter>
+            <include>\.vmdk$</include>
+        </filter>
+        <minsize>100m</minsize>
+    </split>
+</splitconfig>
+blocksize
+Specifies the size of each file part.
+Type: size

+Example: <blocksize>100k</blocksize>
+minsize
+Specifies the minimal size a file must have for enabling file splitting.
+Type: size

+Default: 0

+Example: <minsize>100m</minsize>
 filter
 With the filter element, include and exclude filters can be specified, to control which files are synchronized. The pull, push and archive 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.
 It is also possible to filter resources by tags. Tags can dynamically be applied to individual files. The tag filter elements contains a tag filter expression. Only files that match the filter expression are synchronized.
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/sync-list-versions.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/sync-list-versions.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,120 @@
+
+
+
+  
+  
+  
+  dav-sync list-versions
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav-sync list-versions
+
+dav-sync list-versions [-s <syncdir>] <file>
+Lists all available versions of a SyncDirectory file. Example:
+$ dav-sync list-versions test.txt
+name: 1576420562-69ba29c77659c2db
+lastmodified: Sun, 15 Dec 2019 10:39:30 GMT
+url: https://example.com/webdav/.history/157/1576420562-69ba29c77659c2db
+
+name: 1576420572-b6a1862b0b1c04e6
+lastmodified: Sun, 15 Dec 2019 11:12:28 GMT
+url: https://example.com/webdav/.history/157/1576420572-b6a1862b0b1c04e6
+
+name: 1576420613-8b1260a7a6943580
+lastmodified: Sun, 15 Dec 2019 15:33:06 GMT
+url: https://example.com/webdav/.history/157/1576420613-8b1260a7a6943580
+The name of a version can be used to restore a previous file version with the dav-sync restore command.
+-s <syncdir> SyncDirectory for this file
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/trash-info.html
--- a/docs/html/trash-info.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/trash-info.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav-sync trash-info
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav-sync trash-info
-
+
 dav-sync trash-info <directory>
 Shows the trash directory path for a sync-directory, the number of files currently in trash and the space they consume.
 
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/uncheckout.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/uncheckout.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,108 @@
+
+
+
+  
+  
+  
+  dav uncheckout
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav uncheckout
+
+dav uncheckout [-pc] <url>
+Cancels all modification of the resource and sets the state to checked-in without creating a new version.
+-p disable file name and path decryption if enabled
+-c enable file name and path decryption
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/unlock.html
--- a/docs/html/unlock.html	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/html/unlock.html	Sun Dec 15 17:00:46 2019 +0100
@@ -1,12 +1,20 @@
-
-
+
+
 
-  
-  
+  
   
+  
   dav unlock
-  
-  
+  
+  
+  
 
 
 
@@ -26,6 +34,7 @@
 						remove
 						copy
 						move
+						rename
 						export
 						import
 						get-property
@@ -35,9 +44,19 @@
 						unlock
 						info
 						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
 						add-repository
 						remove-repository
 						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
 						check-config
 					
 				Configuration
@@ -53,11 +72,13 @@
 						pull
 						push
 						archive
-                                                list-conflicts
+						restore
+						list-conflicts
 						resolve-conflicts
 						delete-conflicts
 						trash-info
 						empty-trash
+						list-versions
 						add-tag
 						remove-tag
 						set-tags
@@ -74,9 +95,9 @@
 
 
 
-
+
 dav unlock
-
+
 dav unlock [-pc] [-L <lock>] <url>
 Unlocks the specified url with a lock token. If no lock token is specified with the -L option, it read from stdin.
 -p disable file name and path decryption if enabled
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/versioncontrol.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/versioncontrol.html	Sun Dec 15 17:00:46 2019 +0100
@@ -0,0 +1,109 @@
+
+
+
+  
+  
+  
+  dav versioncontrol
+  
+  
+  
+
+
+
+	DavUtils documentation
+
+
+	
+		dav
+			
+				Getting started
+				Commands
+					
+						list
+						get
+						put
+						mkdir
+						remove
+						copy
+						move
+						rename
+						export
+						import
+						get-property
+						set-property
+						remove-property
+						lock
+						unlock
+						info
+						date
+						versioncontrol
+						list-versions
+						checkout
+						checkin
+						uncheckout
+						add-repository
+						remove-repository
+						list-repositories
+						repository-url
+						add-user
+						remove-user
+						edit-user
+						list-users
+						check-config
+					
+				Configuration
+				Encryption
+			
+	
+	
+		dav-sync
+			
+				Introduction
+				Commands
+					
+						pull
+						push
+						archive
+						restore
+						list-conflicts
+						resolve-conflicts
+						delete-conflicts
+						trash-info
+						empty-trash
+						list-versions
+						add-tag
+						remove-tag
+						set-tags
+						list-tags
+						add-directory
+						list-directories
+						check-config
+						check-repositories
+					
+				Configuration
+			
+	
+
+
+
+
+
+dav versioncontrol
+
+dav versioncontrol [-pc] <url>
+Puts the resource, specified by url, under version control. This is required in order to use other versioning commands with this resource.
+To use this command, the server must support DeltaV.
+-p disable file name and path decryption if enabled
+-c enable file name and path decryption
+
+
+
+
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/man/dav-sync.1.man
--- a/docs/man/dav-sync.1.man	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/man/dav-sync.1.man	Sun Dec 15 17:00:46 2019 +0100
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 1.19.2.4
+.\" Automatically generated by Pandoc 2.2.1
 .\"
-.TH "DAV\-SYNC" "1" "July 1, 2018" "Version 1.2" "DavUtils User Manuals"
+.TH "DAV\-SYNC" "1" "December 15, 2019" "Version 1.3" "DavUtils User Manuals"
 .hy
 .SH NAME
 .PP
@@ -9,7 +9,7 @@
 .SH SYNOPSIS
 .PP
 \f[B]dav\-sync\f[] \f[I]command\f[] [\f[I]options\f[]]
-\f[I]arguments\f[]...
+\f[I]arguments\f[]\&...
 .SH DESCRIPTION
 .PP
 TODO
@@ -25,7 +25,7 @@
 .RS
 .RE
 .TP
-.B push [\f[B]\-cldr\f[]] [\f[B]\-t\f[] \f[I]tags\f[]] \f[I]directory\f[]
+.B push [\f[B]\-cldrSRM\f[]] [\f[B]\-t\f[] \f[I]tags\f[]] \f[I]directory\f[]
 Pushes all local changes to the server.
 This uploads all locally modified files and deletes all locally deleted
 files on the server.
@@ -34,13 +34,20 @@
 .RS
 .RE
 .TP
-.B archive [\f[B]\-cld\f[]] [\f[B]\-t\f[] \f[I]tags\f[]] \f[I]directory\f[]
+.B archive [\f[B]\-cldSRM\f[]] [\f[B]\-t\f[] \f[I]tags\f[]] \f[I]directory\f[]
 Uploads all new and modified files to the server.
 The command is similar to the push command (with the same conflict
 behavior), however it does not delete files on the server.
 .RS
 .RE
 .TP
+.B restore [\f[B]\-ldRM\f[]] [\f[B]\-V\f[] *version] [\f[B]\-s\f[] \f[I]directory\f[]] [\f[I]file\&...\f[]]
+Restores local files by downloading them from the server.
+The \f[I]file\f[] argument can be a local absolute or relative file
+path.
+.RS
+.RE
+.TP
 .B list\-conflicts [\f[B]\-v\f[]] \f[I]directory\f[]
 Lists all conflicting files.
 If verbose output is enabled, the output also shows the number of
@@ -73,6 +80,11 @@
 .RS
 .RE
 .TP
+.B list\-versions [\f[B]\-s\f[] \f[I]syncdir\f[]] \f[I]file\f[]
+Lists all available file versions.
+.RS
+.RE
+.TP
 .B empty\-trash \f[I]directory\f[]
 Removes all files from the trash of the given \f[I]directory\f[].
 .RS
@@ -142,7 +154,7 @@
 .RE
 .TP
 .B \-d
-Don\[aq]t lock the repository.
+Don't lock the repository.
 .RS
 .RE
 .TP
diff -r 2e3a24b9896a -r 8b88efcbf56f docs/man/dav.1.man
--- a/docs/man/dav.1.man	Sun Dec 15 16:54:05 2019 +0100
+++ b/docs/man/dav.1.man	Sun Dec 15 17:00:46 2019 +0100
@@ -1,13 +1,13 @@
-.\" Automatically generated by Pandoc 1.16.0.2
+.\" Automatically generated by Pandoc 2.2.1
 .\"
-.TH "DAV" "1" "July 1, 2018" "Version 1.2" "DavUtils User Manuals"
+.TH "DAV" "1" "December 15, 2019" "Version 1.3" "DavUtils User Manuals"
 .hy
 .SH NAME
 .PP
 \f[B]dav\f[] \- command line WebDAV client
 .SH SYNOPSIS
 .PP
-\f[B]dav\f[] \f[I]command\f[] [\f[I]options\f[]] \f[I]arguments\f[]...
+\f[B]dav\f[] \f[I]command\f[] [\f[I]options\f[]] \f[I]arguments\f[]\&...
 .SH DESCRIPTION
 .PP
 TODO
@@ -18,7 +18,7 @@
 .RS
 .RE
 .TP
-.B get [\f[B]\-pcRK\f[]] [\f[B]\-o\f[] \f[I]file\f[]] [\f[B]\-u\f[] \f[I]date\f[]] \f[I]url\f[]
+.B get [\f[B]\-pcRK\f[]] [\f[B]\-o\f[] \f[I]file\f[]] [\f[B]\-u\f[] \f[I]date\f[]] [\f[B]\-V\f[] \f[I]version\f[]] \f[I]url\f[]
 Downloads a resource from \f[I]url\f[].
 .RS
 .RE
@@ -49,6 +49,12 @@
 .RS
 .RE
 .TP
+.B rename [\f[B]\-pcO\f[]] [\f[B]\-L\f[] \f[I]lock\f[]] \f[I]srcurl\f[] \f[I]name\f[]
+Changes the name of a resource or collection at \f[I]srcurl\f[] to
+\f[I]name\f[].
+.RS
+.RE
+.TP
 .B export [\f[B]\-pc\f[]] [\f[B]\-o\f[] \f[I]file\f[]] [\f[B]\-u\f[] \f[I]date\f[]] \f[I]url\f[]
 Exports a resource or collection to a \f[B]tar(5)\f[] archive.
 By default the data is written to \f[I]stdout\f[], but you may specify a
@@ -121,6 +127,37 @@
 in sync.
 .RS
 .RE
+.TP
+.B versioncontrol [\f[B]\-pc\f[]] \f[I]url\f[]
+Puts the resource, specified by url, under version control.
+This is required in order to use other versioning commands with this
+resource.
+.RS
+.RE
+.TP
+.B list\-versions [\f[B]\-pc\f[]] \f[I]url\f[]
+Lists all versions of a version\-controlled resource.
+.RS
+.RE
+.TP
+.B checkout [\f[B]\-pc\f[]] \f[I]url\f[]
+Changes the state of a resource to checked\-out to allow modifications
+to the content and properties.
+.RS
+.RE
+.TP
+.B checkin [\f[B]\-pc\f[]] \f[I]url\f[]
+Changes the state of a resource to checked\-in.
+This will create a new version of the resource.
+In the checked\-in state the resource cannot be modified.
+.RS
+.RE
+.TP
+.B uncheckout [\f[B]\-pc\f[]] \f[I]url\f[]
+Cancels all modification of the resource and sets the state to
+checked\-in without creating a new version.
+.RS
+.RE
 .SH CONFIGURATION COMMANDS
 .TP
 .B add\-repository
@@ -144,6 +181,31 @@
 Validates the \f[B]$HOME/.dav/config.xml\f[] configuration file.
 .RS
 .RE
+.TP
+.B repository\-url [\f[B]\-p\f[]] \f[I]repository\f[]
+Prints the repository url.
+.RS
+.RE
+.TP
+.B add\-user
+Adds a user to the secret store.
+.RS
+.RE
+.TP
+.B remove\-user
+Removes a user from the secret store.
+.RS
+.RE
+.TP
+.B edit\-user
+Interactive command for modifying users stored in the secret store.
+.RS
+.RE
+.TP
+.B list\-users
+Lists all users stored in the secret store.
+.RS
+.RE
 .SH GENERAL OPTIONS
 .PP
 The following options can be used with all commands.
@@ -216,7 +278,7 @@
 .TP
 .B \-o \f[I]file\f[]
 Write output to \f[I]file\f[].
-Use \[aq]\-\[aq] for stdout.
+Use `\-' for stdout.
 .RS
 .RE
 .TP
@@ -226,7 +288,7 @@
 .RE
 .TP
 .B \-p
-Don\[aq]t encrypt or decrypt files.
+Don't encrypt or decrypt files.
 .RS
 .RE
 .TP
@@ -250,6 +312,12 @@
 .RS
 .RE
 .TP
+.B \-V \f[I]version\f[]
+downloads a specific version of the resource.
+Available versions can be listed with the list\-versions command
+.RS
+.RE
+.TP
 .B \-x
 XML property content.
 .RS