sync update

Synchronization.md

@@ -4,7 +4,7 @@ Trilium supports synchronization with star-shaped topology:
 
 This means that there's one central server (we'll call this instance _sync server_) and several _client_ (sometimes called _desktop_) instances which all point to this sync server and synchronize against it.
 
-**Beware that synchronization is considered experimental and you should expect occasional issues which might require manual intervention.**
+Once sync is setup, synchronization is automatic and ongoing - you don't need to trigger it manually. It should "just work".
 
 ## How to setup synchronization
 
@@ -12,13 +12,37 @@ This means that there's one central server (we'll call this instance _sync serve
 
 This approach is used when you already have a desktop instance of Trilium and you want to [[setup sync server on your web host|Server installation]]. 
 
-So let's assume your server instance is already setup. Then open your desktop instance, click on Options -> 
+So let's assume your server instance is already setup. Then open your desktop instance, click on Options -> Sync tab -> Sync configuration and set "Server instance address" to point to your sync server. Click Save.
+
+[[images/sync-config.png]]
+
+Sync server is totally empty at this point and we need to establish initial sync with it - to do this, click on "Sync local document to the server instance" button. After this document will start to sync which might take some time, but you can close the Options dialog and keep using Trilium.
+
+You can also check the server instance periodically to see if the sync finished. Once it's finished you should see login screen.
+ 
+### Setup synchronization from sync server do desktop instance
+
+This is used when you already have sync server and you want to setup desktop instance to sync with (from) it.
+
+Here we assume that you downloaded [the most recent release](https://github.com/zadam/trilium/releases/latest) for your platform, unzipped it and ran it.
+
+Since the desktop instance is completely empty, it will first ask if you want to create initial document or you want to setup sync with sync server - you need to choose the second option.
+
+[[images/sync-init.png]]
+
+You'll need to configure Trilium server address and importantly also correct username / password (sync setup requires authentication).
+
+Click on "Finish setup" button and if everything went fine, you'll see this screen:
+
+[[images/sync-in-progress.png]]
+
+Once the sync is finished, you'll be automatically redirected to the Trilium application.
 
 ## Conflict resolution
 
 You can sometimes encounter a situation where you edit same note in multiple instances before the note changes are synchronized.
 
-Trilium handles this situation by just picking up the newer change and discarding the older change. The older change should still be visible in history so it should be possible to recover any data lost in conflict resolution.
+Trilium handles this situation by just picking up the newer change and discarding the older change. The older change should still be visible in [[note revisions]] so it should be possible to recover any data lost in conflict resolution.
 
 ## Hash check