Mercurial > hg > dav / changeset

--- a/docs/html/copy.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/copy.html	Sat Aug 05 13:35:27 2017 +0200
@@ -72,7 +72,7 @@
 <p>The command uses a single WebDAV COPY request to duplicate the resources. You may use file name and path decryption to copy and encrypted resource. Please note that the copy will always be located at <em>url2</em>, so the top most collection name will not be disguised. See <a href="./encryption.html">encryption</a> for more details on how encryption works.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption for <em>url1</em></p>
 <p><strong><code>-c</code></strong> enable file name and path decryption for <em>url1</em></p>
-<p><strong><code>-O</code></strong> override the destination resource</p>
+<p><strong><code>-O</code></strong> overwrite the destination resource</p>
 <p><strong><code>-L &lt;lock&gt;</code></strong> use a lock token. See <a href="./lock.html">dav lock</a></p>
 <p><strong>Command alias:</strong> cp</p>
 </div>

--- a/docs/html/date.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/date.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,7 +66,7 @@
 <div class="content">
 <h1 id="dav-date">dav date</h1>
 <p><strong><code>date [url]</code></strong></p>
-<p>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 <code>-U</code> option for the <code>list</code> and <code>get</code> command.</p>
+<p>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 <strong><code>-u</code></strong> option for the <code>list</code> and <code>get</code> command.</p>
 <p>The <em>url</em> can be any http url. If no <em>url</em> is specified, the local time is used.</p>
 <h3 id="example-incremental-dav-get">Example: incremental dav get</h3>
 <p>It is possible to download only resources, which are modified since a specified date. The <em>date</em> command allows you to easily store the date of the last <em>get</em>.</p>
@@ -74,7 +74,7 @@
 ...
 $ dav date myserv &gt; last_get</code></pre>
 <p>After some resources are changed on the server, you can download only the modified files.</p>
-<pre><code>$ dav get -R -U `cat last_get` myserv/col/</code></pre>
+<pre><code>$ dav get -R -u `cat last_get` myserv/col/</code></pre>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/get-property.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/get-property.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,15 +66,15 @@
 <div class="content">
 <h1 id="dav-get-property">dav get-property</h1>
 <p><strong><code>get-property [-pc] [-n &lt;uri&gt;] &lt;url&gt; &lt;property&gt;</code></strong></p>
-<p>Gets a specified resource property. Every WebDAV property has a name and an XMl namespace. A namespace can be specified with the <code>-n</code> option or with a prefixed name. A prefix and property name are separated by an <strong>:</strong></p>
+<p>Gets a specific resource property. Every WebDAV property has a name and an XML namespace. A namespace can be specified with the <code>-n</code> option or with a prefixed name. The prefix and property name are separated by a <strong>:</strong> as usual.</p>
 <p>Example: <code>D:creationdate</code></p>
 <p><code>D</code> is the prefix, <code>creationdate</code> is the name.</p>
-<p>There are only two available prefixes:</p>
+<p>There are only two available prefixes by default:</p>
 <ol style="list-style-type: decimal">
 <li><code>D</code> for the <code>DAV:</code> namespace</li>
 <li><code>idav</code> for <code>http://davutils.org/</code></li>
 </ol>
-<p>To use an other namespace, use the <code>-n</code> option.</p>
+<p>To use another namespace, use the <code>-n</code> option.</p>
 <p>If the property name has no prefix, and no namespace is specified, the default namespace <code>DAV:</code> is used.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>

--- a/docs/html/get.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/get.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,12 +66,12 @@
 <div class="content">
 <h1 id="dav-get">dav get</h1>
 <p><strong><code>get [-pcR] [-o &lt;file&gt;] [-u &lt;date&gt;] &lt;url&gt;</code></strong></p>
-<p>Downloads a resource. It can also download collections and its child resources. 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 it children in there, but it downloads the children directly to the current working directory.</p>
+<p>Downloads a resource. This command also downloads collections and its child resources when the <strong><code>-R</code></strong> option is used. When downloading a single resource, the default local file name is the resource name. When downloading collections, it does <strong>not</strong> 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>
 <p><strong><code>-p</code></strong> disable file name and content decryption. You get exactly what is stored on the server.</p>
 <p><strong><code>-c</code></strong> enable file name and content decryption</p>
 <p><strong><code>-R</code></strong> download a collection</p>
 <p><strong><code>-o &lt;file&gt;</code></strong> specify the local output file. A <strong>-</strong> indicates stdout</p>
-<p><strong><code>-u &lt;date&gt;</code></strong> download only files which are modified since the specified date. Uses the http date format</p>
+<p><strong><code>-u &lt;date&gt;</code></strong> download only files which are modified since the specified date. Uses the HTTP date format</p>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/getting-started.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/getting-started.html	Sat Aug 05 13:35:27 2017 +0200
@@ -68,9 +68,9 @@
 <h3 id="test">Test</h3>
 <p>After successful installation you can test dav with your WebDAV server.</p>
 <pre><code>dav list http://example.com/webdav/</code></pre>
-<p>This lists all child resources of the specified collection. If you are unfamiliar to WebDAV terminology this means basically listing all files in a directory, similar to the ls unix tool. Infact you can also write dav ls instead of dav list and there is also a -l option like ls has one.</p>
+<p>This lists all child resources of the specified collection. If you are unfamiliar to WebDAV terminology this means basically listing all files in a directory, similar to the ls unix tool. Actually you can also write <code>dav ls</code> instead of <code>dav list</code> and there is also an <code>-l</code> option similarly to the unix tool <code>ls</code>.</p>
 <h3 id="create-a-repository">Create a repository</h3>
-<p>All dav commands are expecting a url argument, but it may be a bit cumbersome to type a full url every time. But you can configure a repository in the dav configuration file ($HOME/.dav/config.xml) with the servers url, optional authentication information and other options. After that you can access a webdav server just with the repository name and an optional path.</p>
+<p>All dav commands are expecting an url argument, but it may be a bit cumbersome to type a full url every time. But you can configure a repository in the dav configuration file ($HOME/.dav/config.xml) with the servers url, optional authentication information and other options. Afterwards you can access a webdav server just with the repository name and an optional path.</p>
 <p>So when you have created a repository with the name myserv and the url http://example.com/webdav/, you can just type</p>
 <pre><code>dav list myserv</code></pre>
 <p>You can add a path to the repository name to access an other url</p>

--- a/docs/html/info.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/info.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,9 +66,9 @@
 <div class="content">
 <h1 id="dav-info">dav info</h1>
 <p><strong><code>info [-pc] &lt;url&gt;</code></strong></p>
-<p>Prints some information and lists all properties for the resource specified by url.</p>
+<p>Prints some information and lists all properties for the resource specified by <em>url</em>.</p>
 <h3 id="example-1-info-of-a-collection">Example 1: info of a collection</h3>
-<p>In this example <em>myserv</em> is a configured repository with the base url <em>https://example.com/webdav/</em>. Because <em>col</em> is not encrypted, the <em>url</em> is just the <em>path</em> appended to base url.</p>
+<p>In this example <em>myserv</em> is a configured repository with the base url <em>https://example.com/webdav/</em>. Because the collection is not encrypted, the <em>url</em> in the info output is just the <em>path</em> appended to the base url.</p>
 <pre><code>$ dav info myserv/col/
 name: col
 path: /col
@@ -82,7 +82,7 @@
   getlastmodified: Wed, 14 Jun 2017 09:32:43 GMT
   supportedlock:</code></pre>
 <h3 id="example-2-encrypted-resource">Example 2: encrypted resource</h3>
-<p>With encrypted resources, the <em>path</em> and <em>url</em> are different. The real resource name is random, but the name used by <em>dav</em> is stored in the <em>crypto-name</em> property.</p>
+<p>With encrypted resources, the <em>url</em> in the info output looks different. The real resource name may be disguised, but the name used by <em>dav</em> is stored encrypted and base64 encoded in the <em>crypto-name</em> property. Read the <a href="./encryption.html">encryption</a> documentation to learn more about the davutils encryption feature.</p>
 <pre><code>$ dav info -c myserv/crres
 name: crres
 path: /crres

--- a/docs/html/list.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/list.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,9 +66,9 @@
 <div class="content">
 <h1 id="dav-list">dav list</h1>
 <p><strong><code>dav list [-altepcR] [-u &lt;date&gt;] &lt;url&gt;</code></strong></p>
-<p>Lists child resources of the specified collection. Without any options it shows only the direct children and hides files beginning with a dot.</p>
+<p>Lists child resources of the specified collection. Without any option it shows only the direct children and hides files beginning with a dot. The behavior is quite similar to that of the unix tool <code>ls</code>.</p>
 <h2 id="options">Options</h2>
-<p><strong><code>-a</code></strong> don't hide files whose names begins with a dot <code>.</code></p>
+<p><strong><code>-a</code></strong> don't hide files whose names begin with a dot <code>.</code></p>
 <p><strong><code>-l</code></strong> show additional information for resources</p>
 <p>Example:</p>
 <pre><code>--     4.2 KiB  Oct 11  2015  somefile</code></pre>
@@ -77,20 +77,23 @@
 <li>Field: <code>d-</code> indicates a collection</li>
 <li>Field: <code>-c</code> indicates an encrypted resource</li>
 </ol>
-<p>Also encrypted collections are possible, but only the collection name is encrypted, the content may be unencrypted.</p>
+<p>Encrypted collections are also possible, but only the collection name is encrypted, the content may be unencrypted.</p>
 <p>The second column in the <code>list -l</code> output is the resource size. The number has always a suffix (bytes, KiB, MiB, GiB, TiB). To get the exact content-length in bytes you can use the <a href="./info.html">dav info</a> command.</p>
-<p>The third column is the date of the last modification. The <code>strftime</code> format is <code>%b %d %H:%M</code> if the year is the same. Otherwise the format is <code>%b %d  %Y</code>.</p>
+<p>The third column is the date of the last modification. The <code>strftime</code> format is <code>%b %d %H:%M</code> if the year is the current year. Otherwise the format is <code>%b %d  %Y</code>.</p>
 <p>The last column is the resource name. If the <code>-R</code> option is specified, the resource path is shown.</p>
 <p><strong><code>-t</code></strong> this options only works in combination with <code>-l</code> and it adds the resource content type to the output (after the flags)</p>
 <p><strong><code>-e</code></strong> similar to <code>-l</code>, but with 6 flag fields. Currently only the first 4 fields are used. The last two are reserved for future use.</p>
-<ol start="3" style="list-style-type: decimal">
-<li>Field: <strong>l</strong> indicates a locked resource</li>
-<li>Field: <strong>x</strong> indicates a executable resource (executable property with http://apache.org/dav/props/ namespace)</li>
+<ol style="list-style-type: decimal">
+<li>Field: <code>d---</code> indicates a collection</li>
+<li>Field: <code>-c--</code> indicates an encrypted resource</li>
+<li>Field: <code>--l-</code> indicates a locked resource</li>
+<li>Field: <code>---x</code> indicates an executable resource (executable property with http://apache.org/dav/props/ namespace)</li>
 </ol>
+<p>All combinations of these four flags are possible.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>
 <p><strong><code>-R</code></strong> recursively show all resources in the collection and all child collections</p>
-<p><strong><code>-u &lt;date&gt;</code></strong> show only resources with a lastmodified date after the specified date. Uses the http date format</p>
+<p><strong><code>-u &lt;date&gt;</code></strong> show only resources with a <code>lastmodified</code> date after the specified date. Uses the HTTP date format.</p>
 <p><strong>Command alias:</strong> ls</p>
 </div>
 <!-- end content -->

--- a/docs/html/lock.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/lock.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,8 +66,8 @@
 <div class="content">
 <h1 id="dav-lock">dav lock</h1>
 <p><strong><code>lock [-pc] &lt;url&gt;</code></strong></p>
-<p>Creates a lock on the resource specified by the url. The lock is an exclusive write lock with infinity depth.</p>
-<p>If the resource is successfully locked, a lock token for this resource is printed on stdout. This lock token should be saved somewhere to unlock the resource eventually.</p>
+<p>Creates a lock on the resource specified by the <em>url</em>. The lock is an exclusive write lock with infinite depth.</p>
+<p>If the resource is successfully locked, a lock token for this resource is printed to stdout. This lock token should be saved somewhere to unlock the resource eventually.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>
 <h3 id="example-1-lock-resource-and-use-the-lock-token">Example 1: lock resource and use the lock token</h3>

--- a/docs/html/mkdir.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/mkdir.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,9 +66,9 @@
 <div class="content">
 <h1 id="dav-mkdir">dav mkdir</h1>
 <p><strong><code>mkdir [-pc] [-k &lt;key&gt;] [-L &lt;lock&gt;] &lt;url&gt;</code></strong></p>
-<p>Creates a collection. All intermediate collections are created.</p>
+<p>Creates a collection. All intermediate collections are also created as necessary.</p>
 <p><strong><code>-p</code></strong> disable file name encryption and decryption</p>
-<p><strong><code>-c</code></strong> enables file file name and content encryption</p>
+<p><strong><code>-c</code></strong> enable file file name and content encryption</p>
 <p><strong><code>-k &lt;key&gt;</code></strong> use the specified key for encryption. The key must be configured in the config.xml file</p>
 <p><strong><code>-L &lt;lock&gt;</code></strong> use a lock token</p>
 <p><strong>Command alias:</strong> mkcol</p>

--- a/docs/html/move.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/move.html	Sat Aug 05 13:35:27 2017 +0200
@@ -68,10 +68,10 @@
 <p><strong><code>move [-pcO] [-L &lt;lock&gt;] &lt;url&gt; &lt;url&gt;</code></strong></p>
 <p>Moves the resource identified by <em>url1</em> to the location <em>url2</em>. Currently <em>url1</em> and <em>url2</em> must be on the same host.</p>
 <p>If <em>url2</em> already exists, the command aborts, unless the <code>-O</code> option is specified.</p>
-<p>The command uses a single WebDAV MOVE request to move the resources. It does not handle the dav encryption functionality, which means it does not modify <em>url2</em> if encryption is enabled.</p>
-<p><strong><code>-p</code></strong> disable file name and path decryption if enabled. This applies only to <em>url1</em></p>
-<p><strong><code>-c</code></strong> enable file name and path decryption This applies only to <em>url1</em></p>
-<p><strong><code>-O</code></strong> override the destination resource</p>
+<p>The command uses a single WebDAV MOVE request to move the resources. You may use file name and path decryption to copy and encrypted resource. Please note that the target location will be exactly <em>url2</em>, so the top most collection name will not be disguised. See [encryption][2] for more details on how encryption works.</p>
+<p><strong><code>-p</code></strong> disable file name and path decryption for <em>url1</em></p>
+<p><strong><code>-c</code></strong> enable file name and path decryption for <em>url1</em></p>
+<p><strong><code>-O</code></strong> overwrite the destination resource</p>
 <p><strong><code>-L &lt;lock&gt;</code></strong> use a lock token. See <a href="./lock.html">dav lock</a></p>
 <p><strong>Command alias:</strong> mv</p>
 </div>

--- a/docs/html/pull.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/pull.html	Sat Aug 05 13:35:27 2017 +0200
@@ -67,11 +67,11 @@
 <h1 id="dav-sync-pull">dav-sync pull</h1>
 <p><strong><code>pull [-cld] &lt;directory&gt;</code></strong></p>
 <p>Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added.</p>
-<p>When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.</p>
-<p>When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.</p>
-<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides locally modified files</p>
+<p>When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.</p>
+<p>When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.</p>
+<p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites locally modified files</p>
 <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>pull</code> completed, the repository is unlocked</p>
-<p><strong><code>-d</code></strong> Don't lock the repository</p>
+<p><strong><code>-d</code></strong> Don't lock the repository (default)</p>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/push.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/push.html	Sat Aug 05 13:35:27 2017 +0200
@@ -68,9 +68,9 @@
 <p><strong><code>push [-cld] &lt;directory&gt;</code></strong></p>
 <p>Pushes all local changes to the server. This uploads all locally modified files and deletes all locally deleted files on the server.</p>
 <p>If conflict detection is not disabled, all files that are also modified on the server will be skipped.</p>
-<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides files on the server</p>
+<p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites files on the server</p>
 <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>push</code> completed, the repository is unlocked</p>
-<p><strong><code>-d</code></strong> Don't lock the repository</p>
+<p><strong><code>-d</code></strong> Don't lock the repository (default)</p>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/put.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/put.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,8 +66,8 @@
 <div class="content">
 <h1 id="dav-put">dav put</h1>
 <p><strong><code>put [-pcR] [-k &lt;key&gt;] [-L &lt;lock&gt;] &lt;url&gt; &lt;file&gt;</code></strong></p>
-<p>Uploads a file or a directory. When uploading a file and 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.</p>
-<p>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.</p>
+<p>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.</p>
+<p>When uploading a directory, you need to specify the <strong><code>-R</code></strong> 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 <a href="./mkdir.html">dav mkdir</a> to create this collection beforehand.</p>
 <p><strong><code>-p</code></strong> disable file name encryption and decryption</p>
 <p><strong><code>-c</code></strong> enable file name and content encryption</p>
 <p><strong><code>-R</code></strong> upload directory</p>

--- a/docs/html/remove.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/remove.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,7 +66,7 @@
 <div class="content">
 <h1 id="dav-remove">dav remove</h1>
 <p><strong><code>remove [-pc] [-L &lt;lock&gt;] &lt;url&gt;</code></strong></p>
-<p>Removes a resource. When removing a collection, all unterneath resources are removed.</p>
+<p>Removes a resource. When removing a collection, all child resources are also removed.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>
 <p><strong><code>-L</code></strong> <lock> use a lock token</p>

--- a/docs/html/resolve-conflicts.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/resolve-conflicts.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,7 +66,7 @@
 <div class="content">
 <h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1>
 <p><strong><code>resolve-conflicts &lt;directory&gt;</code></strong></p>
-<p>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.</p>
+<p>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. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts.</p>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/set-property.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/set-property.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,8 +66,8 @@
 <div class="content">
 <h1 id="dav-set-property">dav set-property</h1>
 <p><strong><code>set-property [-pc] [-L &lt;lock&gt;] [-n &lt;uri&gt;] &lt;url&gt; &lt;property&gt; [value]</code></strong></p>
-<p>Sets a resource property to a specified value.</p>
-<p>property is a property name with or without prefix (see <a href="./get-property.html">get-property</a> for details).</p>
+<p>Sets a resource property to the specified value.</p>
+<p><em>property</em> is a property name with or without prefix (see <a href="./get-property.html">get-property</a> for details).</p>
 <p>If no value is specified, the content for the property is read from stdin.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>

--- a/docs/html/trash-info.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/trash-info.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,7 +66,7 @@
 <div class="content">
 <h1 id="dav-sync-trash-info">dav-sync trash-info</h1>
 <p><strong><code>trash-info &lt;directory&gt;</code></strong></p>
-<p>Shows the trash directory path for a sync-directory, the number of files in there and the space consumption.</p>
+<p>Shows the trash directory path for a sync-directory, the number of files currently in trash and the space they consume.</p>
 </div>
 <!-- end content -->
 </body>

--- a/docs/html/unlock.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/unlock.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,10 +66,10 @@
 <div class="content">
 <h1 id="dav-unlock">dav unlock</h1>
 <p><strong><code>unlock [-pc] [-L &lt;lock&gt;] &lt;url&gt;</code></strong></p>
-<p>Unlocks the specified url with a lock token. If no lock token is specified with the <code>-L</code> option, it read from stdin.</p>
+<p>Unlocks the specified <em>url</em> with a lock token. If no lock token is specified with the <code>-L</code> option, it read from stdin.</p>
 <p><strong><code>-p</code></strong> disable file name and path decryption if enabled</p>
 <p><strong><code>-c</code></strong> enable file name and path decryption</p>
-<p><strong><code>-L &lt;lock&gt;</code></strong> use a lock token</p>
+<p><strong><code>-L &lt;lock&gt;</code></strong> use the specified lock token</p>
 <h3 id="example-1-unlock-with-lock-token-from-stdin">Example 1: unlock with lock token from stdin</h3>
 <pre><code>$ dav lock myserv/resource &gt; locktoken
 $ dav unlock myserv/resource &lt; locktoken</code></pre>

--- a/docs/src/copy.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/copy.md	Sat Aug 05 13:35:27 2017 +0200
@@ -18,7 +18,7 @@
 
 **`-c`** enable file name and path decryption for *url1*
 
-**`-O`** override the destination resource
+**`-O`** overwrite the destination resource
 
 **`-L <lock>`** use a lock token. See [dav lock][1]
 

--- a/docs/src/date.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/date.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,7 +3,7 @@
 
 **`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 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.
 
@@ -17,7 +17,7 @@
 	
 After some resources are changed on the server, you can download only the modified files.
 
-	$ dav get -R -U `cat last_get` myserv/col/
+	$ dav get -R -u `cat last_get` myserv/col/
 
 
 

--- a/docs/src/get-property.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/get-property.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,18 +3,18 @@
 
 **`get-property [-pc] [-n <uri>] <url> <property>`**
 
-Gets a specified 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. A prefix and property name are separated by an **:**
+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.
 
 Example: `D:creationdate`
 
 `D` is the prefix, `creationdate` is the name.
 
-There are only two available prefixes:
+There are only two available prefixes by default:
 
 1. `D` for the `DAV:` namespace
 2. `idav` for `http://davutils.org/`
 
-To use an other namespace, use the `-n` option.
+To use another namespace, use the `-n` option.
 
 If the property name has no prefix, and no namespace is specified, the default namespace `DAV:` is used.
 

--- a/docs/src/get.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/get.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,10 +3,10 @@
 
 **`get [-pcR] [-o <file>] [-u <date>] <url>`**
 
-Downloads a resource. It can also download collections and its child resources.
+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 it children in there, but it downloads the
+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
@@ -18,6 +18,6 @@
 
 **`-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
+**`-u <date>`** download only files which are modified since the specified date. Uses the HTTP date format
 
 

--- a/docs/src/getting-started.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/getting-started.md	Sat Aug 05 13:35:27 2017 +0200
@@ -7,11 +7,11 @@
 
 	dav list http://example.com/webdav/
 
-This lists all child resources of the specified collection. If you are unfamiliar to WebDAV terminology this means basically listing all files in a directory, similar to the ls unix tool. Infact you can also write dav ls instead of dav list and there is also a -l option like ls has one. 
+This lists all child resources of the specified collection. If you are unfamiliar to WebDAV terminology this means basically listing all files in a directory, similar to the ls unix tool. Actually you can also write `dav ls` instead of `dav list` and there is also an `-l` option similarly to the unix tool `ls`.
 
 ### Create a repository
 
-All dav commands are expecting a url argument, but it may be a bit cumbersome to type a full url every time. But you can configure a repository in the dav configuration file ($HOME/.dav/config.xml) with the servers url, optional authentication information and other options. After that you can access a webdav server just with the repository name and an optional path.
+All dav commands are expecting an url argument, but it may be a bit cumbersome to type a full url every time. But you can configure a repository in the dav configuration file ($HOME/.dav/config.xml) with the servers url, optional authentication information and other options. Afterwards you can access a webdav server just with the repository name and an optional path.
 
 So when you have created a repository with the name myserv and the url http://example.com/webdav/, you can just type
 

--- a/docs/src/info.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/info.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,11 +3,11 @@
 
 **`info [-pc] <url>`**
 
-Prints some information and lists all properties for the resource specified by url.
+Prints some information and lists all properties for the resource specified by *url*.
 
 ### Example 1: info of a collection
 
-In this example *myserv* is a configured repository with the base url *https://example.com/webdav/*. Because *col* is not encrypted, the *url* is just the *path* appended to base url.
+In this example *myserv* is a configured repository with the base url *https://example.com/webdav/*. Because the collection is not encrypted, the *url* in the info output is just the *path* appended to the base url.
 
 	$ dav info myserv/col/
 	name: col
@@ -24,7 +24,8 @@
 
 ### Example 2: encrypted resource
 
-With encrypted resources, the *path* and *url* are different. The real resource name is random, but the name used by *dav* is stored in the *crypto-name* property. 
+With encrypted resources, the *url* in the info output looks different. The real resource name may be disguised, but the name used by *dav* is stored encrypted and base64 encoded in the *crypto-name* property.
+Read the [encryption][1] documentation to learn more about the davutils encryption feature.
 
 	$ dav info -c myserv/crres
 	name: crres
@@ -47,3 +48,6 @@
 	  crypto-hash: fm4zstp/FevTs1aoUXc3+mqTmAf2Go+zQ34rSp8/ixDlGLQJXR74Je+WMl1zxZKbS/+5VwDhyZ9pT3gInsq2SA==
 	  crypto-key: mykey
 	  crypto-name: ZU+lZtFi3dprBz44714plYwfRnhyI/apYq46Sk/B6QU=
+
+[1]: ./encryption.html
+

--- a/docs/src/list.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/list.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,13 +3,14 @@
 
 **`dav list [-altepcR] [-u <date>] <url>`**
 
-Lists child resources of the specified collection. Without any options it
+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 begins with a dot `.`
+**`-a`** don't hide files whose names begin with a dot `.`
 
 **`-l`** show additional information for resources
 
@@ -22,13 +23,13 @@
 1. Field: `d-` indicates a collection
 2. Field: `-c` indicates an encrypted resource
 
-Also encrypted collections are possible, but only the collection name is encrypted, the content may be unencrypted.
+Encrypted collections are also possible, but only the collection name is encrypted, the content may be unencrypted.
 
 The second column in the `list -l` output is the resource size. The number has always a suffix (bytes, KiB, MiB, GiB, TiB). To get the exact content-length in bytes you can use the [dav info][1] command.
 
 [1]: ./info.html
 
-The third column is the date of the last modification. The `strftime` format is `%b %d %H:%M` if the year is the same. Otherwise the format is `%b %d  %Y`.
+The third column is the date of the last modification. The `strftime` format is `%b %d %H:%M` if the year is the current year. Otherwise the format is `%b %d  %Y`.
 
 The last column is the resource name. If the `-R` option is specified, the resource path is shown.
 
@@ -36,8 +37,12 @@
 
 **`-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.
 
-3. Field: **l** indicates a locked resource
-4. Field: **x** indicates a executable resource (executable property with http://apache.org/dav/props/ namespace)
+1. Field: `d---` indicates a collection
+2. Field: `-c--` indicates an encrypted resource
+3. Field: `--l-` indicates a locked resource
+4. Field: `---x` indicates an executable resource (executable property with http://apache.org/dav/props/ namespace)
+
+All combinations of these four flags are possible.
 
 **`-p`** disable file name and path decryption if enabled
 
@@ -45,7 +50,7 @@
 
 **`-R`** recursively show all resources in the collection and all child collections
 
-**`-u <date>`** show only resources with a lastmodified date after the specified
-  date. Uses the http date format
+**`-u <date>`** show only resources with a `lastmodified` date after the specified
+  date. Uses the HTTP date format.
 
 **Command alias:** ls

--- a/docs/src/lock.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/lock.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,9 +3,9 @@
 
 **`lock [-pc] <url>`**
 
-Creates a lock on the resource specified by the url. The lock is an exclusive write lock with infinity depth.
+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 on stdout. This lock token should be saved somewhere to unlock the resource eventually.
+If the resource is successfully locked, a lock token for this resource is printed to stdout. This lock token should be saved somewhere to unlock the resource eventually.
 
 **`-p`** disable file name and path decryption if enabled
 

--- a/docs/src/mkdir.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/mkdir.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,11 +3,11 @@
 
 **`mkdir [-pc] [-k <key>] [-L <lock>] <url>`**
 
-Creates a collection. All intermediate collections are created.
+Creates a collection. All intermediate collections are also created as necessary.
 
 **`-p`** disable file name encryption and decryption
 
-**`-c`** enables file file name and content encryption
+**`-c`** enable file file name and content encryption
 
 **`-k <key>`** use the specified key for encryption. The key must be configured in
   the config.xml file

--- a/docs/src/move.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/move.md	Sat Aug 05 13:35:27 2017 +0200
@@ -7,13 +7,16 @@
 
 If *url2* already exists, the command aborts, unless the `-O` option is specified.
 
-The command uses a single WebDAV MOVE request to move the resources. It does not handle the dav encryption functionality, which means it does not modify *url2* if encryption is enabled.
-
-**`-p`** disable file name and path decryption if enabled. This applies only to *url1*
+The command uses a single WebDAV MOVE request to move the resources.
+You may use file name and path decryption to copy and encrypted resource.
+Please note that the target location will be exactly *url2*, so the top most collection name will not be disguised.
+See [encryption][2] for more details on how encryption works.
 
-**`-c`** enable file name and path decryption This applies only to *url1*
+**`-p`** disable file name and path decryption for *url1*
 
-**`-O`** override the destination resource
+**`-c`** enable file name and path decryption for *url1*
+
+**`-O`** overwrite the destination resource
 
 **`-L <lock>`** use a lock token. See [dav lock][1]
 

--- a/docs/src/pull.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/pull.md	Sat Aug 05 13:35:27 2017 +0200
@@ -5,14 +5,14 @@
 
 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 should be deleted are moved to the trash directory.
+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 should be overridden are moved to the trash.
+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 overrides locally modified files
+**`-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
+**`-d`** Don't lock the repository (default)
 
 

--- a/docs/src/push.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/push.md	Sat Aug 05 13:35:27 2017 +0200
@@ -7,8 +7,9 @@
 
 If conflict detection is not disabled, all files that are also modified on the server will be skipped.
 
-**`-c`** Disable conflict detection. This always overrides files on the server
+**`-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
+**`-d`** Don't lock the repository (default)
+

--- a/docs/src/put.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/put.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,13 +3,14 @@
 
 **`put [-pcR] [-k <key>] [-L <lock>] <url> <file>`**
 
-Uploads a file or a directory. When uploading a file and the url points to
+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
+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][1] to create this collection beforehand.
 
 **`-p`** disable file name encryption and decryption
 
@@ -20,8 +21,9 @@
 **`-k <key>`** use the specified key for encryption. The key must be configured in
   the config.xml file
 
-**`-L <lock>`** use a lock token. See [dav lock][1]
+**`-L <lock>`** use a lock token. See [dav lock][2]
 
-[1]: ./lock.html
+[1]: ./mkdir.html
+[2]: ./lock.html
 
 

--- a/docs/src/remove.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/remove.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,7 +3,7 @@
 
 **`remove [-pc] [-L <lock>] <url>`**
 
-Removes a resource. When removing a collection, all unterneath resources are
+Removes a resource. When removing a collection, all child resources are also
 removed.
 
 **`-p`** disable file name and path decryption if enabled
@@ -13,3 +13,4 @@
 **`-L`** <lock> use a lock token
 
 **Command aliases:** rm, delete
+

--- a/docs/src/resolve-conflicts.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/resolve-conflicts.md	Sat Aug 05 13:35:27 2017 +0200
@@ -4,4 +4,5 @@
 **`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.
+In other words: by executing this command you assert that *you* have resolved the conflicts.
 

--- a/docs/src/set-property.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/set-property.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,9 +3,9 @@
 
 **`set-property [-pc] [-L <lock>] [-n <uri>] <url> <property> [value]`**
 
-Sets a resource property to a specified value.
+Sets a resource property to the specified value.
 
-property is a property name with or without prefix (see [get-property][1] for details).
+*property* is a property name with or without prefix (see [get-property][1] for details).
 
 [1]: ./get-property.html
 

--- a/docs/src/trash-info.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/trash-info.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,4 +3,5 @@
 
 **`trash-info <directory>`**
 
-Shows the trash directory path for a sync-directory, the number of files in there and the space consumption.
+Shows the trash directory path for a sync-directory, the number of files currently in trash and the space they consume.
+

--- a/docs/src/unlock.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/unlock.md	Sat Aug 05 13:35:27 2017 +0200
@@ -3,13 +3,13 @@
 
 **`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.
+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
 
 **`-c`** enable file name and path decryption
 
-**`-L <lock>`** use a lock token
+**`-L <lock>`** use the specified lock token
 
 ### Example 1: unlock with lock token from stdin