Mercurial > hg > dav / changeset

--- a/dav/sync.c	Thu Aug 03 18:29:00 2017 +0200
+++ b/dav/sync.c	Fri Aug 04 20:03:21 2017 +0200
@@ -1583,7 +1583,7 @@
         }
         if(S_ISDIR(s.st_mode)) {
             if(rmdir(path)) {
-                perror("unlink");
+                perror("rmdir");
             }
         } else {
             if(unlink(path)) {

--- a/dav/version.h	Thu Aug 03 18:29:00 2017 +0200
+++ b/dav/version.h	Fri Aug 04 20:03:21 2017 +0200
@@ -29,7 +29,7 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define DAV_VERSION "1.0.0 RC4"
+#define DAV_VERSION "1.0.0 RC5"
 
 #endif /* VERSION_H */
 

--- a/docs/src/check-repositories.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/check-repositories.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,4 @@
+dav-sync check-repositories
+===========================
+
+Checks if every repository used by sync-directories is configured and available.

--- a/docs/src/davdoc.css	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/davdoc.css	Fri Aug 04 20:03:21 2017 +0200
@@ -2,7 +2,7 @@
     font-family: sans-serif;
 }
 
-div.header {
+.header {
     padding-top: 0.3em;
     padding-bottom: 0.5em;
     margin-bottom: 2em;
@@ -11,31 +11,31 @@
     border-bottom-color: #2E2E2E;
 }
 
-div.header span {
+.header span {
     font-size: 2em;
     font-weight: bold;
     margin-left: 1em;
 }
 
-div.header img {
+.header img {
     float: right;
 }
 
-div.sidebar {
+.sidebar {
     float: left;
     width: 15em;
 }
 
-div.nav {
+.nav {
     color: black;
     background-color: #d2d2d2;
     margin-bottom: 1em;
     padding-bottom: 0.1em;
 }
 
-div.nav h3 {
+.nav h3 {
     color: white;
-    background-color: #1a3300;
+    background-color: #008080;
     font-size: 1.2em;
     padding-top: 0.2em;
     padding-bottom: 0.2em;
@@ -43,13 +43,27 @@
     margin-top: 0;
 }
 
-div.nav ul {
+.nav ul {
     margin-top: 0;
     padding-top: 0;
     font-size: 0.95em;
 }
 
-div.content {
+.nav a:link {
+	text-decoration: none;
+	color: black;
+}
+
+.nav a:visited {
+	text-decoration: none;
+	color: black;
+}
+
+.nav a:hover {
+	color: #e68a00;
+}
+
+.content {
     margin-left: 16em;
     padding: 0;
     font-family: serif;
@@ -57,9 +71,9 @@
     min-width: 16em;
 }
 
-div.content h1 {
+.content h1 {
     color: white;
-    background-color: #1a3300;
+    background-color: #008080;
     font-size: 1.2em;
     padding-top: 0.2em;
     padding-bottom: 0.2em;
@@ -68,11 +82,11 @@
     margin-top: 0;
 }
 
-div.content h2 {
+.content h2 {
     font-size: 1.2em;
 }
 
-div.content h3 {
+.content h3 {
     font-size: 1.05em;
 }
 

--- a/docs/src/delete-conflicts.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/delete-conflicts.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,6 @@
+dav-sync delete-conflicts
+==========================
+
+**`delete-conflicts <directory>`**
+
+Deletes all files that are marked as a conflict. This will always delete files and does not move them to the trash directory.

--- a/docs/src/empty-trash.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/empty-trash.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,6 @@
+dav-sync empty-trash
+====================
+
+**`empty-trash <directory>`**
+
+Removes all files from the trash directory for a given sync-directory.

--- a/docs/src/encryption.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/encryption.md	Fri Aug 04 20:03:21 2017 +0200
@@ -5,7 +5,7 @@
 
 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 random but the name used by the client is stored encrypted in WebDAV properties. This means, an attacker can see the directory structure and the file length, but can't see which files have the same name.
 
-To enable encryption a key must be configured in `$HOME/.dav/config.xml`. A key must have an 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.
+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:
 

--- a/docs/src/resolve-conflicts.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/resolve-conflicts.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,7 @@
+dav-sync resolve-conflicts
+==========================
+
+**`resolve-conflicts <directory>`**
+
+Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command.
+

--- a/docs/src/trash-info.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/trash-info.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,6 @@
+dav-sync trash-info
+===================
+
+**`trash-info <directory>`**
+
+Shows the trash directory path for a sync-directory, the number of files in there and the space consumption.