Skip to content

Build your personal knowledge base with Trilium Notes

docs(user): tweak documentation slightly regarding templates/relations

Elian Doran20b4089a1fe4
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Relations.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Relations.html
index bc996cc5db..57c39ed916 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Relations.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Relations.html
@@ -84,11 +84,10 @@ class="table">
<tr>
<td><code spellcheck="false">template:newNoteDefaultParent</code>
</td>
- <td>set on a template note, points to the note under which notes created
- from the template are placed when no other location is picked; when
- set several times, the note is cloned into every target. See&nbsp;
- <a
- class="reference-link" href="#root/_help_KC1HB96bqqHX">Templates</a>.</td>
+ <td>set on a template note, points to the note under which notes created from
+ the template are placed when no other location is picked; when set several
+ times, the note is cloned into every target. See <a class="reference-link"
+ href="#root/_help_KC1HB96bqqHX">Templates</a>.</td>
</tr>
<tr>
<td><code spellcheck="false">inherit</code>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Templates.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Templates.html
index e6e1baf212..b405c2f6cc 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Templates.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Templates.html
@@ -62,21 +62,25 @@
of having them land wherever they happen to be created. To do so, add a
<code
spellcheck="false">~template:newNoteDefaultParent</code>relation to the template note, pointing
- at the note that should hold the instances — for example a <em>Person</em> template
+ at the note that should hold the instances, for example a <em>Person</em> template
pointing to a <em>People</em> note.</p>
<p>Adding the relation several times places the new note in every target,
- as&nbsp;<a class="reference-link" href="#root/_help_IakOLONlIfGI">clones</a>.
- The relation can also be inherited — for example from a folder holding several
- templates — in which case a relation owned by the template itself replaces
+ as&nbsp;<a class="reference-link" href="#root/_help_IakOLONlIfGI">Cloning Notes</a>.
+ The relation can also be inherited (e.g. from a folder holding several
+ templates), in which case a relation owned by the template itself replaces
the inherited one. Inheritance requires the relation to be marked as inheritable:
- a template created from another template does not adopt that template's default
- parent.</p>
+ a template created from another template does not adopt that template's
+ default parent.</p>
<p>The default parent is used whenever a note is created from the template
- through the <em>Choose note type</em> dialog — for example via <code spellcheck="false">@</code>-completion
- in a&nbsp;<a class="reference-link" href="#root/_help_iPIMuisry3hd">Text</a>&nbsp;note,
- or the <em>Create and link child note</em> option of the note search — and
- no other location is picked in that dialog. Creating an instance note from
- the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;context
+ through the <em>Choose note type</em> dialog:</p>
+<ul>
+ <li>Via <code spellcheck="false">@</code>-completion in a&nbsp;<a class="reference-link"
+ href="#root/_help_iPIMuisry3hd">Text</a>&nbsp;note</li>
+ <li>Via the <em>Create and link child note</em> option of the note search (new
+ tab or&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_hrZ1D00cLbal">Internal (reference) links</a>),
+ but only if the default/empty location is set.</li>
+</ul>
+<p>Creating an instance note from the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;context
menu (<em>Insert child note</em>, <em>Insert note after</em>) still creates
it at the chosen place.</p>
<p>Unlike the&nbsp;<a class="reference-link" href="#root/_help_S0Fos78ZfcY7">Note Inbox</a>,
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html
index ac502f109c..0a8c1ffec8 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html
@@ -3,16 +3,15 @@
editor).</p>
<h2>Configuring keyboard shortcuts</h2>
<p>It is also possible to configure most keyboard shortcuts in&nbsp;<a class="reference-link"
- href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts</em>.</p>
-<p>&nbsp;</p>
-<p>On the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/_help_poXkQfguuA0U">Desktop Installation</a>,
+ href="#root/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts</em>.</p>
+<p>On the&nbsp;<a class="reference-link" href="#root/_help_poXkQfguuA0U">Desktop Installation</a>,
it's also possible to make shortcuts global by pressing on the globe icon
near the key combination, which makes the shortcut work even without Trilium
being in focus.</p>
<h2>Shortcut reference</h2>
<aside class="admonition note">
<p>All these shortcuts indicate the default key-bindings which can be changed
- individually from&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts.</em>
+ individually from&nbsp;<a class="reference-link" href="#root/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts.</em>
</p>
</aside>
<h3>Tree</h3>
@@ -20,49 +19,37 @@
</p>
<h3>Note navigation</h3>
<ul>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">←</kbd>,
- <kbd
- spellcheck="false">Alt</kbd>+<kbd spellcheck="false">→</kbd> – go back / forwards in the history</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">J</kbd> – show
- <a
- href="#root/_help_MMiBEQljMQh2">"Jump to" dialog</a>
+ <li><kbd>Alt</kbd>+<kbd>←</kbd>, <kbd>Alt</kbd>+<kbd>→</kbd> – go back / forwards
+ in the history</li>
+ <li><kbd>Ctrl</kbd>+<kbd>J</kbd> – show <a href="#root/_help_MMiBEQljMQh2">"Jump to" dialog</a>
</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">.</kbd> – scroll
- to current note (useful when you scroll away from your note or your focus
- is currently in the editor)</li>
- <li><kbd spellcheck="false">Backspace</kbd> – jumps to parent note</li>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">C</kbd> – collapse
- whole note tree</li>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">-</kbd> (alt
- with minus sign) – collapse subtree (if some subtree takes too much space
- on tree pane you can collapse it)</li>
+ <li><kbd>Ctrl</kbd>+<kbd>.</kbd> – scroll to current note (useful when you
+ scroll away from your note or your focus is currently in the editor)</li>
+ <li><kbd>Backspace</kbd> – jumps to parent note</li>
+ <li><kbd>Alt</kbd>+<kbd>C</kbd> – collapse whole note tree</li>
+ <li><kbd>Alt</kbd>+<kbd>-</kbd> (alt with minus sign) – collapse subtree (if
+ some subtree takes too much space on tree pane you can collapse it)</li>
<li>you can define a <a href="#root/_help_zEY4DaJG4YT5">label</a> <code spellcheck="false">#keyboardShortcut</code> with
e.g. value <code spellcheck="false">Ctrl + I</code> . Pressing this keyboard
combination will then bring you to the note on which it is defined. Note
- that Trilium must be reloaded/restarted (<kbd spellcheck="false">Ctrl</kbd>+
- <kbd
- spellcheck="false">R</kbd>) for changes to be in effect.</li>
+ that Trilium must be reloaded/restarted (<kbd>Ctrl</kbd>+<kbd>R</kbd> )
+ for changes to be in effect.</li>
</ul>
<p>See demo of some of these features in <a href="#root/_help_MMiBEQljMQh2">note navigation</a>.</p>
<h3>Tabs</h3>
<ul>
- <li><kbd spellcheck="false">Ctrl</kbd> + <kbd spellcheck="false">🖱 Left click</kbd> –
- (or middle mouse click) on note link opens note in a new tab</li>
+ <li><kbd>Ctrl</kbd> + <kbd>🖱 Left click</kbd> – (or middle mouse click) on note
+ link opens note in a new tab</li>
</ul>
<p>Only in desktop (electron build):</p>
<ul>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">T</kbd> – opens
- empty tab</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">W</kbd> – closes
- active tab</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Tab</kbd> –
- activates next tab</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Shift</kbd>+
- <kbd
- spellcheck="false">Tab</kbd>– activates previous tab</li>
+ <li><kbd>Ctrl</kbd>+<kbd>T</kbd> – opens empty tab</li>
+ <li><kbd>Ctrl</kbd>+<kbd>W</kbd> – closes active tab</li>
+ <li><kbd>Ctrl</kbd>+<kbd>Tab</kbd> – activates next tab</li>
+ <li><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Tab</kbd> – activates previous tab</li>
</ul>
<h3>Splits</h3>
-<p><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_luNhaphA37EO">Split View</a>&nbsp;can
+<p><a class="reference-link" href="#root/_help_luNhaphA37EO">Split View</a>&nbsp;can
also be controlled through keyboard actions, such as:</p>
<ul>
<li>Creating a new split</li>
@@ -72,15 +59,13 @@
</ul>
<p>All these keyboard shortcuts do not have a default set, go to&nbsp;
<a
- class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts</em> and look for the <em>Split View</em> category.</p>
+ class="reference-link" href="#root/_help_4TIF1oA4VQRO">Options</a>&nbsp;→ <em>Shortcuts</em> and look for the <em>Split View</em> category.</p>
<h3>Creating notes</h3>
<ul>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">O</kbd> – creates
- new note after the current note</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">P</kbd> – creates
- new sub-note into current note</li>
- <li><kbd spellcheck="false">F2</kbd> – edit the&nbsp;<a class="reference-link"
- href="#root/_help_TBwsyfadTA18">Branch prefix</a>&nbsp;of current note clone</li>
+ <li><kbd>Ctrl</kbd>+<kbd>O</kbd> – creates new note after the current note</li>
+ <li><kbd>Ctrl</kbd>+<kbd>P</kbd> – creates new sub-note into current note</li>
+ <li><kbd>F2</kbd> – edit the&nbsp;<a class="reference-link" href="#root/_help_TBwsyfadTA18">Branch prefix</a>&nbsp;of
+ current note clone</li>
</ul>
<h3>Editing notes</h3>
<aside class="admonition note">
@@ -91,39 +76,29 @@
</aside>
<ul>
<li>Enter in tree pane switches from tree pane into note title. Enter from
- note title switches focus to text editor. <kbd spellcheck="false">Ctrl</kbd>+
- <kbd
- spellcheck="false">.</kbd>switches back from editor to tree pane.</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">.</kbd> – jump
- away from the editor to tree pane and scroll to current note</li>
+ note title switches focus to text editor. <kbd>Ctrl</kbd>+<kbd>.</kbd> switches
+ back from editor to tree pane.</li>
+ <li><kbd>Ctrl</kbd>+<kbd>.</kbd> – jump away from the editor to tree pane and
+ scroll to current note</li>
</ul>
<h3>Runtime shortcuts</h3>
<p>These are hooked in Electron to be similar to native browser keyboard
shortcuts.</p>
<ul>
- <li><kbd spellcheck="false">F5</kbd>, <kbd spellcheck="false">Ctrl</kbd>+
- <kbd
- spellcheck="false">R</kbd>– reloads Trilium front-end</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Shift</kbd>+
- <kbd
- spellcheck="false">I</kbd>– show developer tools</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">F</kbd> – show
- search dialog</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">-</kbd> – zoom
- out</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">=</kbd> – zoom
- in</li>
+ <li><kbd>F5</kbd>, <kbd>Ctrl</kbd>+<kbd>R</kbd> – reloads Trilium front-end</li>
+ <li><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd> – show developer tools</li>
+ <li><kbd>Ctrl</kbd>+<kbd>F</kbd> – show search dialog</li>
+ <li><kbd>Ctrl</kbd>+<kbd>-</kbd> – zoom out</li>
+ <li><kbd>Ctrl</kbd>+<kbd>=</kbd> – zoom in</li>
</ul>
<h3>Other</h3>
<ul>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">O</kbd> – show
- SQL console (use only if you know what you're doing)</li>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">M</kbd> – distraction-free
- mode - display only note editor, everything else is hidden</li>
- <li><kbd spellcheck="false">F11 </kbd>– toggle full screen</li>
- <li><kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">S</kbd> – toggle
- <a
- href="#root/_help_eIg8jdvaoNNd">search</a>form in tree pane</li>
- <li><kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">A</kbd> – show
- note <a href="#root/_help_zEY4DaJG4YT5">attributes</a> dialog</li>
+ <li><kbd>Alt</kbd>+<kbd>O</kbd> – show SQL console (use only if you know what
+ you're doing)</li>
+ <li><kbd>Alt</kbd>+<kbd>M</kbd> – distraction-free mode - display only note
+ editor, everything else is hidden</li>
+ <li><kbd>F11 </kbd> – toggle full screen</li>
+ <li><kbd>Ctrl</kbd>+<kbd>S</kbd> – toggle <a href="#root/_help_eIg8jdvaoNNd">search</a> form
+ in tree pane</li>
+ <li><kbd>Alt</kbd>+<kbd>A</kbd> – show note <a href="#root/_help_zEY4DaJG4YT5">attributes</a> dialog</li>
</ul>
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html
index 196d0d9f16..f9ccb11dfd 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html
@@ -67,7 +67,7 @@
<tr>
<td>Alt+↑</td>
<td>⌥+↑</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Move blocks (lists, paragraphs, etc.) down</td>
@@ -77,7 +77,7 @@
<tr>
<td>Alt+↓</td>
<td>⌥+↓</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
</tbody>
</table>
@@ -105,7 +105,7 @@
<tr>
<td>Insert a hard break (a new paragraph)</td>
<td>Enter</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Insert a soft break (a <code spellcheck="false">&lt;br&gt;</code> element)</td>
@@ -155,12 +155,12 @@
<tr>
<td>Move out of a link</td>
<td>←←, →→</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Move out of an inline code style</td>
<td>←←, →→</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Select all</td>
@@ -200,7 +200,7 @@
<tr>
<td>Revert autoformatting action</td>
<td>Backspace</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
</tbody>
</table>
@@ -220,7 +220,7 @@
<tr>
<td>Insert a new paragraph directly after a widget</td>
<td>Enter</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Insert a new paragraph directly before a widget</td>
@@ -230,18 +230,18 @@
<tr>
<td>Move the caret to allow typing directly before a widget</td>
<td>↑, ←</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Move the caret to allow typing directly after a widget</td>
<td>↓, →</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>After entering a nested editable, move the selection to the closest ancestor
widget. For example: move from an image caption to the whole image widget.</td>
<td>Tab then Esc</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
</tbody>
</table>
@@ -260,7 +260,7 @@
<tr>
<td>Increase list item indent</td>
<td>⇥</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Decrease list item indent</td>
@@ -284,7 +284,7 @@
<tr>
<td>Move the selection to the next cell</td>
<td>⇥</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Move the selection to the previous cell</td>
@@ -294,12 +294,12 @@
<tr>
<td>Insert a new table row (when in the last cell of a table)</td>
<td>⇥</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Navigate through the table</td>
<td>↑, →, ↓, ←</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
</tbody>
</table>
@@ -318,7 +318,7 @@
<tr>
<td>Close contextual balloons, dropdowns, and dialogs</td>
<td>Esc</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Open the accessibility help dialog</td>
@@ -338,18 +338,18 @@
<tr>
<td>Navigate through the toolbar or menu bar</td>
<td>↑, →, ↓, ←</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Navigate to the next focusable field or an element outside the editor</td>
<td>Tab, Shift+Tab</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Execute the currently focused button. Executing buttons that interact
with the editor content moves the focus back to the content.</td>
<td>Enter, Space</td>
- <td>&nbsp;</td>
+ <td></td>
</tr>
<tr>
<td>Move focus in and out of an active dialog window</td>
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index 167fe9e143..a76a89b82a 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -7320,93 +7320,93 @@
{
"type": "relation",
"name": "internalLink",
- "value": "DvdZhoQZY9Yd",
+ "value": "4TIF1oA4VQRO",
"isInheritable": false,
"position": 10
},
{
"type": "relation",
"name": "internalLink",
- "value": "MMiBEQljMQh2",
+ "value": "poXkQfguuA0U",
"isInheritable": false,
"position": 20
},
{
"type": "relation",
"name": "internalLink",
- "value": "zEY4DaJG4YT5",
+ "value": "DvdZhoQZY9Yd",
"isInheritable": false,
"position": 30
},
{
"type": "relation",
"name": "internalLink",
- "value": "TBwsyfadTA18",
+ "value": "MMiBEQljMQh2",
+ "isInheritable": false,
+ "position": 40
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "zEY4DaJG4YT5",
"isInheritable": false,
"position": 50
},
{
"type": "relation",
"name": "internalLink",
- "value": "iPIMuisry3hd",
+ "value": "luNhaphA37EO",
"isInheritable": false,
"position": 60
},
{
"type": "relation",
"name": "internalLink",
- "value": "oiVPnW8QfnvS",
+ "value": "TBwsyfadTA18",
"isInheritable": false,
"position": 70
},
{
"type": "relation",
"name": "internalLink",
- "value": "QrtTYPmdd1qq",
+ "value": "iPIMuisry3hd",
"isInheritable": false,
"position": 80
},
{
"type": "relation",
"name": "internalLink",
- "value": "eIg8jdvaoNNd",
+ "value": "oiVPnW8QfnvS",
"isInheritable": false,
"position": 90
},
- {
- "type": "label",
- "name": "shareAlias",
- "value": "keyboard-shortcuts",
- "isInheritable": false,
- "position": 30
- },
- {
- "type": "label",
- "name": "iconClass",
- "value": "bx bxs-keyboard",
- "isInheritable": false,
- "position": 80
- },
{
"type": "relation",
"name": "internalLink",
- "value": "luNhaphA37EO",
+ "value": "QrtTYPmdd1qq",
"isInheritable": false,
"position": 100
},
{
"type": "relation",
"name": "internalLink",
- "value": "4TIF1oA4VQRO",
+ "value": "eIg8jdvaoNNd",
"isInheritable": false,
"position": 110
},
{
- "type": "relation",
- "name": "internalLink",
- "value": "poXkQfguuA0U",
+ "type": "label",
+ "name": "shareAlias",
+ "value": "keyboard-shortcuts",
"isInheritable": false,
- "position": 120
+ "position": 30
+ },
+ {
+ "type": "label",
+ "name": "iconClass",
+ "value": "bx bxs-keyboard",
+ "isInheritable": false,
+ "position": 80
}
],
"format": "markdown",
@@ -17132,52 +17132,66 @@
{
"type": "relation",
"name": "internalLink",
- "value": "iPIMuisry3hd",
+ "value": "IakOLONlIfGI",
"isInheritable": false,
"position": 40
},
{
"type": "relation",
"name": "internalLink",
- "value": "oPVyFC7WL2Lp",
+ "value": "iPIMuisry3hd",
"isInheritable": false,
"position": 50
},
{
"type": "relation",
"name": "internalLink",
- "value": "6tZeKvSHEUiB",
+ "value": "oPVyFC7WL2Lp",
"isInheritable": false,
"position": 60
},
{
"type": "relation",
"name": "internalLink",
- "value": "iRwzGnHPzonm",
+ "value": "S0Fos78ZfcY7",
"isInheritable": false,
"position": 70
},
{
"type": "relation",
"name": "internalLink",
- "value": "xYjQUYhpbUEW",
+ "value": "6tZeKvSHEUiB",
"isInheritable": false,
"position": 80
},
{
"type": "relation",
"name": "internalLink",
- "value": "l0tKav7yLHGF",
+ "value": "iRwzGnHPzonm",
"isInheritable": false,
"position": 90
},
{
"type": "relation",
"name": "internalLink",
- "value": "47ZrP6FNuoG8",
+ "value": "xYjQUYhpbUEW",
"isInheritable": false,
"position": 100
},
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "l0tKav7yLHGF",
+ "isInheritable": false,
+ "position": 110
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "47ZrP6FNuoG8",
+ "isInheritable": false,
+ "position": 120
+ },
{
"type": "label",
"name": "shareAlias",
@@ -17191,6 +17205,13 @@
"value": "bx bx-copy",
"isInheritable": false,
"position": 110
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "hrZ1D00cLbal",
+ "isInheritable": false,
+ "position": 130
}
],
"format": "markdown",
diff --git a/docs/User Guide/User Guide.md b/docs/User Guide/User Guide.md
index 1e63a791c1..ed5805da4b 100644
--- a/docs/User Guide/User Guide.md
+++ b/docs/User Guide/User Guide.md
@@ -22,4 +22,4 @@ Trilium is an open-source solution for note-taking and organizing a personal kno
* The [Trilium Notes website](https://triliumnotes.org/), for a quick presentation of the application.
* [Developer Guide](https://docs.triliumnotes.org/developer-guide/), to understand the architecture and processes behind the development of Trilium Notes.
-* [GitHub Repository (TriliumNext/Trilium)](https://github.com/TriliumNext/Trilium/)
+* [GitHub Repository (TriliumNext/Trilium)](https://github.com/TriliumNext/Trilium/)
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Advanced Usage/Templates.md b/docs/User Guide/User Guide/Advanced Usage/Templates.md
index 1bae7d2609..1c845a5aed 100644
--- a/docs/User Guide/User Guide/Advanced Usage/Templates.md
+++ b/docs/User Guide/User Guide/Advanced Usage/Templates.md
@@ -35,13 +35,18 @@ To specify a template for child notes, you can use a `~child:template` relation
## Default parent for new notes
-A template can gather the notes created from it in one place, instead of having them land wherever they happen to be created. To do so, add a `~template:newNoteDefaultParent` relation to the template note, pointing at the note that should hold the instances — for example a _Person_ template pointing to a _People_ note.
+A template can gather the notes created from it in one place, instead of having them land wherever they happen to be created. To do so, add a `~template:newNoteDefaultParent` relation to the template note, pointing at the note that should hold the instances, for example a _Person_ template pointing to a _People_ note.
-Adding the relation several times places the new note in every target, as <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md">clones</a>. The relation can also be inherited — for example from a folder holding several templates — in which case a relation owned by the template itself replaces the inherited one. Inheritance requires the relation to be marked as inheritable: a template created from another template does not adopt that template's default parent.
+Adding the relation several times places the new note in every target, as <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md">Cloning Notes</a>. The relation can also be inherited (e.g. from a folder holding several templates), in which case a relation owned by the template itself replaces the inherited one. Inheritance requires the relation to be marked as inheritable: a template created from another template does not adopt that template's default parent.
-The default parent is used whenever a note is created from the template through the _Choose note type_ dialog — for example via `@`-completion in a <a class="reference-link" href="../Note%20Types/Text.md">Text</a> note, or the _Create and link child note_ option of the note search — and no other location is picked in that dialog. Creating an instance note from the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> context menu (_Insert child note_, _Insert note after_) still creates it at the chosen place.
+The default parent is used whenever a note is created from the template through the _Choose note type_ dialog:
-Unlike the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20Inbox.md">Note Inbox</a>, which holds quickly captured notes until they are sorted, the default parent is meant as the instances' permanent location.
+* Via `@`\-completion in a <a class="reference-link" href="../Note%20Types/Text.md">Text</a> note
+* Via the _Create and link child note_ option of the note search (new tab or <a class="reference-link" href="../Note%20Types/Text/Links/Internal%20(reference)%20links.md">Internal (reference) links</a>), but only if the default/empty location is set.
+
+Creating an instance note from the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> context menu (_Insert child note_, _Insert note after_) still creates it at the chosen place.
+
+Unlike the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20Inbox.md">Note Inbox</a>, which holds quickly captured notes until they are sorted, the default parent is meant as the instances' permanent location.
## Regarding note types
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.md b/docs/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.md
index ecdc66f42f..b06963e3f2 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.md
@@ -18,26 +18,26 @@ See the corresponding section: <a class="reference-link" href="UI%20Elements/No
### Note navigation
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">←</kbd>, <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">→</kbd> – go back / forwards in the history
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">J</kbd> – show ["Jump to" dialog](Navigation/Note%20Navigation.md)
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">.</kbd> – scroll to current note (useful when you scroll away from your note or your focus is currently in the editor)
-* <kbd spellcheck="false">Backspace</kbd> – jumps to parent note
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">C</kbd> – collapse whole note tree
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">-</kbd> (alt with minus sign) – collapse subtree (if some subtree takes too much space on tree pane you can collapse it)
-* you can define a [label](../Advanced%20Usage/Attributes.md) `#keyboardShortcut` with e.g. value `Ctrl + I` . Pressing this keyboard combination will then bring you to the note on which it is defined. Note that Trilium must be reloaded/restarted (<kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">R</kbd> ) for changes to be in effect.
+* <kbd>Alt</kbd>+<kbd>←</kbd>, <kbd>Alt</kbd>+<kbd>→</kbd> – go back / forwards in the history
+* <kbd>Ctrl</kbd>+<kbd>J</kbd> – show ["Jump to" dialog](Navigation/Note%20Navigation.md)
+* <kbd>Ctrl</kbd>+<kbd>.</kbd> – scroll to current note (useful when you scroll away from your note or your focus is currently in the editor)
+* <kbd>Backspace</kbd> – jumps to parent note
+* <kbd>Alt</kbd>+<kbd>C</kbd> – collapse whole note tree
+* <kbd>Alt</kbd>+<kbd>-</kbd> (alt with minus sign) – collapse subtree (if some subtree takes too much space on tree pane you can collapse it)
+* you can define a [label](../Advanced%20Usage/Attributes.md) `#keyboardShortcut` with e.g. value `Ctrl + I` . Pressing this keyboard combination will then bring you to the note on which it is defined. Note that Trilium must be reloaded/restarted (<kbd>Ctrl</kbd>+<kbd>R</kbd> ) for changes to be in effect.
See demo of some of these features in [note navigation](Navigation/Note%20Navigation.md).
### Tabs
-* <kbd spellcheck="false">Ctrl</kbd> + <kbd spellcheck="false">🖱 Left click</kbd> – (or middle mouse click) on note link opens note in a new tab
+* <kbd>Ctrl</kbd> + <kbd>🖱 Left click</kbd> – (or middle mouse click) on note link opens note in a new tab
Only in desktop (electron build):
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">T</kbd> – opens empty tab
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">W</kbd> – closes active tab
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Tab</kbd> – activates next tab
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Shift</kbd>+<kbd spellcheck="false">Tab</kbd> – activates previous tab
+* <kbd>Ctrl</kbd>+<kbd>T</kbd> – opens empty tab
+* <kbd>Ctrl</kbd>+<kbd>W</kbd> – closes active tab
+* <kbd>Ctrl</kbd>+<kbd>Tab</kbd> – activates next tab
+* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Tab</kbd> – activates previous tab
### Splits
@@ -52,32 +52,32 @@ All these keyboard shortcuts do not have a default set, go to <a class="referen
### Creating notes
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">O</kbd> – creates new note after the current note
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">P</kbd> – creates new sub-note into current note
-* <kbd spellcheck="false">F2</kbd> – edit the <a class="reference-link" href="Notes/Cloning%20Notes/Branch%20prefix.md">Branch prefix</a> of current note clone
+* <kbd>Ctrl</kbd>+<kbd>O</kbd> – creates new note after the current note
+* <kbd>Ctrl</kbd>+<kbd>P</kbd> – creates new sub-note into current note
+* <kbd>F2</kbd> – edit the <a class="reference-link" href="Notes/Cloning%20Notes/Branch%20prefix.md">Branch prefix</a> of current note clone
### Editing notes
> [!NOTE]
> For keyboard shortcuts specific to <a class="reference-link" href="../Note%20Types/Text.md">Text</a> notes, refer to <a class="reference-link" href="../Note%20Types/Text/Keyboard%20shortcuts.md">Keyboard shortcuts</a> and <a class="reference-link" href="../Note%20Types/Text/Markdown-like%20formatting.md">Markdown-like formatting</a>.
-* Enter in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">.</kbd> switches back from editor to tree pane.
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">.</kbd> – jump away from the editor to tree pane and scroll to current note
+* Enter in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <kbd>Ctrl</kbd>+<kbd>.</kbd> switches back from editor to tree pane.
+* <kbd>Ctrl</kbd>+<kbd>.</kbd> – jump away from the editor to tree pane and scroll to current note
### Runtime shortcuts
These are hooked in Electron to be similar to native browser keyboard shortcuts.
-* <kbd spellcheck="false">F5</kbd>, <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">R</kbd> – reloads Trilium front-end
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">Shift</kbd>+<kbd spellcheck="false">I</kbd> – show developer tools
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">F</kbd> – show search dialog
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">-</kbd> – zoom out
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">=</kbd> – zoom in
+* <kbd>F5</kbd>, <kbd>Ctrl</kbd>+<kbd>R</kbd> – reloads Trilium front-end
+* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd> – show developer tools
+* <kbd>Ctrl</kbd>+<kbd>F</kbd> – show search dialog
+* <kbd>Ctrl</kbd>+<kbd>-</kbd> – zoom out
+* <kbd>Ctrl</kbd>+<kbd>=</kbd> – zoom in
### Other
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">O</kbd> – show SQL console (use only if you know what you're doing)
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">M</kbd> – distraction-free mode - display only note editor, everything else is hidden
-* <kbd spellcheck="false">F11 </kbd> – toggle full screen
-* <kbd spellcheck="false">Ctrl</kbd>+<kbd spellcheck="false">S</kbd> – toggle [search](Navigation/Search.md) form in tree pane
-* <kbd spellcheck="false">Alt</kbd>+<kbd spellcheck="false">A</kbd> – show note [attributes](../Advanced%20Usage/Attributes.md) dialog
\ No newline at end of file
+* <kbd>Alt</kbd>+<kbd>O</kbd> – show SQL console (use only if you know what you're doing)
+* <kbd>Alt</kbd>+<kbd>M</kbd> – distraction-free mode - display only note editor, everything else is hidden
+* <kbd>F11 </kbd> – toggle full screen
+* <kbd>Ctrl</kbd>+<kbd>S</kbd> – toggle [search](Navigation/Search.md) form in tree pane
+* <kbd>Alt</kbd>+<kbd>A</kbd> – show note [attributes](../Advanced%20Usage/Attributes.md) dialog
\ No newline at end of file