dav: comparison docs/html/introduction.html

-:2e3a24b9896a
+:8b88efcbf56f
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta charset="utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="generator" content="pandoc" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
 <title>Introduction to dav-sync</title>
-<style type="text/css">code{white-space: pre;}</style>
+<style type="text/css">
-<link rel="stylesheet" href="davdoc.css" 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">
 	<a href="./index.html"><span>DavUtils documentation</span></a>
 </div>
 						<li><a href="put.html">put</a></li>
 						<li><a href="mkdir.html">mkdir</a></li>
 						<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>
 						<li><a href="set-property.html">set-property</a></li>
 						<li><a href="remove-property.html">remove-property</a></li>
 						<li><a href="lock.html">lock</a></li>
 						<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>
 				<li><a href="encryption.html">Encryption</a></li>
 			</ul>
 				<li><a href="sync-commands.html">Commands</a></li>
 					<ul>
 						<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>
 						<li><a href="list-tags.html">list-tags</a></li>
 						<li><a href="add-directory.html">add-directory</a></li>
 	</div>
 </div>
 <!-- begin content -->
 <div class="content">
-<div id="header">
+<header>
 <h1 class="title">Introduction to dav-sync</h1>
-</div>
+</header>
 <p>The dav-sync program can synchronize a local directory with a WebDAV collection.</p>
 <h2 id="first-steps">First Steps</h2>
 <p>To use dav-sync it is required to configure a repository in <a href="./configuration.html">config.xml</a> and the directory in <a href="./sync-configuration.html">sync.xml</a>.</p>
 <p>Create a repository with <a href="./add-repository.html">dav add-repository</a>. Unlike <em>dav</em>, <em>dav-sync</em> is not interactive and never shows an authentication prompt. Therefore the user and password <strong>must</strong> be specified if the server requires authentication.</p>
 <pre><code>$ dav add-repository
 <pre><code>dav-sync push mysyncdir</code></pre>
 <h2 id="database">Database</h2>
 <p>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 <em>$HOME/.dav/</em> and if you want to reset a sync-directory, you can delete the database. After that, <em>pull</em>/<em>push</em> (with disabled conflict detection) will download/upload all files.</p>
 <h2 id="conflict-detection">Conflict detection</h2>
 <p>The <em>pull</em> and <em>push</em> commands detect if a file has changed remotely and locally. This is a conflict that must be resolved manually.</p>
-<p>When <em>pull</em> detects a conflict it renames the local file to <em>orig-$number.$name</em> where <em>$number</em> is an integer, usually 0 if no other conflict file with the name exists and <em>$name</em> 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 <em>resolve-conflicts</em> to remove all conflict entries from the database otherwise <em>push</em> will ignore any file in a conflict state. There is also the <em>delete-conflicts</em> command that deletes all conflict files.</p>
+<p>When <em>pull</em> detects a conflict it renames the local file to <em>orig-$number.$name</em> where <em>$number</em> is an integer, usually 0 if no other conflict file with the name exists and <em>$name</em> 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 <em>resolve-conflicts</em> to remove all conflict entries from the database otherwise <em>push</em> will ignore any file in a conflict state. There is also the <em>delete-conflicts</em> command that deletes all conflict files.</p>
 <p>When <em>push</em> detects that a file is modified locally and on the server, it just skips this file. Run the <em>pull</em> command to get the new file from the server and resolve the conflict like described above.</p>
 <h2 id="trash">Trash</h2>
 <p>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.</p>
 <p>To enable the trash, add the <code>&lt;trash&gt;</code> element to the directory config. The trash path can be absolute or relative to the sync-directory path.</p>
 <pre><code>&lt;directory&gt;

Mercurial > hg > dav / file comparison

comparison: docs/html/introduction.html

docs/html/introduction.html