From 32a1c430946ec064fe08958fb2bb326bc225978a Mon Sep 17 00:00:00 2001 From: azivner Date: Tue, 18 Dec 2018 20:59:07 +0100 Subject: [PATCH] mention of proxy setup / system proxy --- Synchronization.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Synchronization.md b/Synchronization.md index a95651d..601acfa 100644 --- a/Synchronization.md +++ b/Synchronization.md @@ -38,6 +38,13 @@ Click on "Finish setup" button and if everything went fine, you'll see this scre Once the sync is finished, you'll be automatically redirected to the Trilium application. +## Proxy setup + +Two different setups are supported: + +* you can explicitly set proxy server to be used in Options / Sync. Only unauthenticated proxy servers are currently supported. +* if no proxy server is explicitly configured, then Trilium will use system proxy settings + ## Conflict resolution You can sometimes encounter a situation where you edit same note in multiple instances before the note changes are synchronized.