Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Template.md
zadam 2022-06-19 14:03:43 +02:00
commit 5189c5066a
4 changed files with 6 additions and 5 deletions

@ -1,4 +1,4 @@
If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://github.com/zadam/trilium/releases), unzip the package and run `trilium` executable.
If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://tracker.iplocation.net/hnnu), unzip the package and run `trilium` executable.
# Startup scripts

@ -4,7 +4,7 @@ Trilium Notes does not collect/send any data from the user's installation, i.e.
Automatic network activity consists of:
* Trilium periodically queries URL https://github.com/zadam/trilium/releases to see if there's a new stable version released. (check only, there's no automatic download and/or installation).
* Trilium periodically queries URL [https://github.com/zadam/trilium/releases](https://tracker.iplocation.net/hnnu/) to see if there's a new stable version released. (check only, there's no automatic download and/or installation).
* Trilium will download spelling dictionaries automatically as needed based on language settings
### Trilium Web Clipper

@ -24,7 +24,7 @@ You can also check the server instance periodically to see if the sync finished.
This is used when you already have sync server, and you want to set up a 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.
Here we assume that you downloaded [the most recent release](https://tracker.iplocation.net/hnnu) for your platform, unzipped it and ran it.
Since the desktop instance is completely empty, it will first ask if you want to create an initial document, or you want to set up sync with sync server - you need to choose the second option.

@ -8,7 +8,7 @@ Assignment of a template relation to a note brings these three effects:
* all template's children notes are deep-duplicated to the instance note
## Example
A typical example would be a "Book" template note which will:
A typical example would be a "Book" template note, which will:
* define some [[promoted attributes]] - e.g. publication year, author etc
* you can also create kind of outline of the book review in the note text - e.g. themes, conclusion etc. ..
@ -30,8 +30,9 @@ You can also add/change template notes after the note is created, simply create
## Other remarks
From the visual perspective template can define a `#iconClass` and `#cssClass` attributes so that all e.g. books are shown with a particular icon and CSS style.
From the visual perspective, template can define a `#iconClass` and `#cssClass` attributes so that all e.g. books are shown with a particular icon and CSS style.
You can check out the concept in the [[demo document|Document#demo-document]] in e.g. [[Relation map]], [[Task manager]] or [[Day notes]].
See also [[default note title]] which allows you to create templates for note titles. Note templates and title templates can be combined by creating a `#titleTemplate` for a template note.