fix links

azivner 2017-12-24 16:19:42 -05:00
parent 1d4c9708e8
commit 074c42c5e3
3 changed files with 6 additions and 6 deletions

@ -11,7 +11,7 @@ You can follow external link by either double clicking (will open new tab/window
Links to internal notes are created a bit differently. To create link to note at current cursor position, press ```CTRL-L```.
In the dialog you can see radio button to choose from different types of linking. First one is classic link to note, the other two are related to [cloning](Cloning.md) and will be covered separately.
In the dialog you can see radio button to choose from different types of linking. First one is classic link to note, the other two are related to [[cloning|Cloning]] and will be covered separately.
[[gifs/create-link-to-note.gif]]

@ -3,7 +3,7 @@ Trilium is meant to store all kinds of data - including potentially sensitive da
For such sensitive data Trilium can protect these notes which essentially means:
* encrypting the note with encryption key based on your password.
* This means that without your password, protected notes are not decipherable so even if somebody managed to steal your Trilium [document](Document.md), your protected notes could not be read.
* This means that without your password, protected notes are not decipherable so even if somebody managed to steal your Trilium [[document|Document], your protected notes could not be read.
* time-limited access to protected notes
* To first access protected notes you need to enter your password which will decrypt the note and allow you to read / write them. But after certain time period (by default 10 minutes) this decrypted note is unloaded from memory and to read it again you need to enter your password again.
* This protects against a possible scenario where you leave your computer unlocked for a long time and somebody can access your Trilium application.
@ -34,6 +34,6 @@ Not encrypted:
* here we use scrypt for [key stretching](https://en.wikipedia.org/wiki/Key_stretching)
4. Hash produced in the last step is used to decrypt actual _data encryption key_
* data encryption key is encrypted with [AES-128](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard) with random [IV](https://en.wikipedia.org/wiki/Initialization_vector)
* data encryption key is random key generated at the time of [document](Document.md) initialization and is constant over the lifetime of the document. If we change password, only we re-encrypt only this key.
* data encryption key is random key generated at the time of [[document|Document] initialization and is constant over the lifetime of the document. If we change password, only we re-encrypt only this key.
5. We use data encryption key to decrypt actual data - note title and content.
* encryption used is again AES-128 with [CBC chaining](https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation). IV is primary key (noteId for notes and noteHistoryId for history items)

@ -10,7 +10,7 @@ This means that there's one central server (we'll call this instance _sync serve
### Preparation
Here we assume you already have Trilium running on your computer and you want to setup sync server so you can edit same [document](Document.md) online.
Here we assume you already have Trilium running on your computer and you want to setup sync server so you can edit same [[document|Document] online.
Of course you need to install Trilium on the sync server. It's recommended to have exact same version of Trilium installed everywhere. Trilium will reject synchronization if there's a mismatch in Trilium database version between client and sync server.
@ -20,7 +20,7 @@ Before you start the process of setting everything up, it's recommended to stop
1. Run Trilium in your new environment - this will generate default directory ```trilium-data``` in your home directory, default config etc.
2. Stop Trilium in the new environment
3. Copy your existing trilium [document](Document.md) file (by default located in your home directory under ```trilium-data/document.db```) into your target environment into ```trilium-data``` directory
3. Copy your existing trilium [[document|Document] file (by default located in your home directory under ```trilium-data/document.db```) into your target environment into ```trilium-data``` directory
4. Edit client's ```trilium-data/config.ini``` and set ```syncServerHost``` to the host and port where the sync server is running
5. Start the sync server
6. Start the client
@ -29,7 +29,7 @@ You should be able to see in the client logs that sync connection has been estab
### Additional sync client(s) setup
Setting up extra sync clients is very similar to setting up a server - make sure everything is stopped, copy the [document](Document.md), set up client's ```syncServerHost``` in ```config.ini``` to point to the sync server and then start everything up.
Setting up extra sync clients is very similar to setting up a server - make sure everything is stopped, copy the [[document|Document], set up client's ```syncServerHost``` in ```config.ini``` to point to the sync server and then start everything up.
## Conflict resolution