gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mention of proxy setup / system proxy

azivner 2018-12-18 20:59:07 +01:00
parent 057e5db21e
commit 32a1c43094
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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. 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 ## Conflict resolution
You can sometimes encounter a situation where you edit same note in multiple instances before the note changes are synchronized. You can sometimes encounter a situation where you edit same note in multiple instances before the note changes are synchronized.