--- 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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta charset="utf-8" />
<meta name="generator" content="pandoc" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<title>dav-sync list-conflicts</title>
- <style type="text/css">code{white-space: pre;}</style>
- <link rel="stylesheet" href="davdoc.css" type="text/css" />
+ <style type="text/css">
+ code{white-space: pre-wrap;}
+ span.smallcaps{font-variant: small-caps;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
+ </style>
+ <link rel="stylesheet" href="davdoc.css" />
+ <!--[if lt IE 9]>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+ <![endif]-->
</head>
<body>
<div class="header">
@@ -26,6 +34,7 @@
<li><a href="remove.html">remove</a></li>
<li><a href="copy.html">copy</a></li>
<li><a href="move.html">move</a></li>
+ <li><a href="rename.html">rename</a></li>
<li><a href="export.html">export</a></li>
<li><a href="import.html">import</a></li>
<li><a href="get-property.html">get-property</a></li>
@@ -35,9 +44,19 @@
<li><a href="unlock.html">unlock</a></li>
<li><a href="info.html">info</a></li>
<li><a href="date.html">date</a></li>
+ <li><a href="versioncontrol.html">versioncontrol</a></li>
+ <li><a href="list-versions.html">list-versions</a></li>
+ <li><a href="checkout.html">checkout</a></li>
+ <li><a href="checkin.html">checkin</a></li>
+ <li><a href="uncheckout.html">uncheckout</a></li>
<li><a href="add-repository.html">add-repository</a></li>
<li><a href="remove-repository.html">remove-repository</a></li>
<li><a href="list-repositories.html">list-repositories</a></li>
+ <li><a href="repository-url.html">repository-url</a></li>
+ <li><a href="add-user.html">add-user</a></li>
+ <li><a href="remove-user.html">remove-user</a></li>
+ <li><a href="edit-user.html">edit-user</a></li>
+ <li><a href="list-users.html">list-users</a></li>
<li><a href="check-config.html">check-config</a></li>
</ul>
<li><a href="configuration.html">Configuration</a></li>
@@ -53,11 +72,13 @@
<li><a href="pull.html">pull</a></li>
<li><a href="push.html">push</a></li>
<li><a href="archive.html">archive</a></li>
- <li><a href="list-conflicts.html">list-conflicts</a></li>
+ <li><a href="restore.html">restore</a></li>
+ <li><a href="list-conflicts.html">list-conflicts</a></li>
<li><a href="resolve-conflicts.html">resolve-conflicts</a></li>
<li><a href="delete-conflicts.html">delete-conflicts</a></li>
<li><a href="trash-info.html">trash-info</a></li>
<li><a href="empty-trash.html">empty-trash</a></li>
+ <li><a href="list-versions.html">list-versions</a></li>
<li><a href="add-tag.html">add-tag</a></li>
<li><a href="remove-tag.html">remove-tag</a></li>
<li><a href="set-tags.html">set-tags</a></li>
@@ -74,12 +95,12 @@
<!-- begin content -->
<div class="content">
-<div id="header">
+<header>
<h1 class="title">dav-sync list-conflicts</h1>
-</div>
+</header>
<p><strong><code>dav-sync list-conflicts [-v] <directory></code></strong></p>
<p>Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file.</p>
-<p>For each conflict a backup file with the pattern <code>orig.N.filename</code> 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 <code>dav-sync</code> will remove the conflict from the database automatically. You can also use the <a href="./delete-conflicts.html">delete-conflicts</a> command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the <a href="./resolve-conflicts.html">resolve-conflicts</a> command to forcefully clear the conflict database.</p>
+<p>For each conflict a backup file with the pattern <code>orig.N.filename</code> 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 <code>dav-sync</code> will remove the conflict from the database automatically. You can also use the <a href="./delete-conflicts.html">delete-conflicts</a> command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the <a href="./resolve-conflicts.html">resolve-conflicts</a> command to forcefully clear the conflict database.</p>
</div>
<!-- end content -->
</body>