Merge remote-tracking branch 'origin/master'

zadam 2020-08-31 22:58:43 +02:00
commit 33e9e81046
3 changed files with 13 additions and 2 deletions

@ -47,6 +47,8 @@ In the demo, you can see how clone can be created using context menu. It's possi
You can also notice how after creating the clone, all clones are highlighted. This is so you can easily see which notes are cloned into other locations in the hierarchy.
Please note: In more recent versions, titles of cloned noted in the tree view have an asterisk to the right. Also, the "Paths" dropdown has been changed to a dropdown at the top of the tree view. As documented [here](https://github.com/zadam/trilium/issues/1139#issuecomment-651582746).
## Prefix
Since notes can be categorized into multiple places, it's important to choose name which fits into both (all) locations.

@ -10,7 +10,7 @@ Server installation has both desktop and [[mobile frontend]].
## Configuration
For server installations, you might want to configure e.g. port or [[TLS|TLS configuration]]. This is done in the Trilium config file, by default it's in `config.ini` in the [[data directory]]
For server installations, you might want to configure e.g. port or [[TLS|TLS configuration]]. This is done in the Trilium config file, by default it's in `config.ini` in the [[data directory]].
### Config location
@ -22,6 +22,16 @@ If this is not desired, you may change it via `TRILIUM_DATA_DIR` environment var
export TRILIUM_DATA_DIR=/home/myuser/data/my-trilium-data
```
### Disable authentication
Among others, you can also disable authentication (in case you run on localhost only or authentication is handled by another component) with:
```
[General]
noAuthentication=true
```
Note that disabling authentication is possible only since version 0.44.
## Reverse proxy setup
### nginx

@ -14,7 +14,6 @@ In both cases it is possible to switch to editable mode again.
CKEditor supports markdown-like editing experience. It recognizes syntax and automatically converts it to rich text. See it in action:
[[gifs/autoformat.gif]]
ode
Complete documentation for this feature is available in [CKEditor documentation](https://ckeditor.com/docs/ckeditor5/latest/features/autoformat.html).
If the autoformat is not desirable for what you just wrote, you can press `CTRL-Z` which will un-autoformat the text to its original form.