mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-27 10:02:59 +08:00
chore(docs): sync
This commit is contained in:
parent
2b53a1c534
commit
9c0c1bad2d
@ -382,10 +382,24 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "l2VkvOwUNfZj",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 20
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "l2VkvOwUNfZj",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
@ -399,20 +413,6 @@
|
||||
"value": "bx bx-code-alt",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
}
|
||||
],
|
||||
"format": "markdown",
|
||||
@ -475,35 +475,35 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"value": "J1Bb6lVlwU5T",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"isInheritable": false,
|
||||
"position": 20
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "rWX5eY045zbE",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "moVgBcoxE3EK",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "J1Bb6lVlwU5T",
|
||||
"value": "moVgBcoxE3EK",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
@ -4089,17 +4089,31 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QEAPj01N5f7w",
|
||||
"value": "oiVPnW8QfnvS",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QrtTYPmdd1qq",
|
||||
"isInheritable": false,
|
||||
"position": 60
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "eIg8jdvaoNNd",
|
||||
"value": "QEAPj01N5f7w",
|
||||
"isInheritable": false,
|
||||
"position": 70
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "eIg8jdvaoNNd",
|
||||
"isInheritable": false,
|
||||
"position": 80
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
@ -4113,20 +4127,6 @@
|
||||
"value": "bx bxs-keyboard",
|
||||
"isInheritable": false,
|
||||
"position": 80
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "oiVPnW8QfnvS",
|
||||
"isInheritable": false,
|
||||
"position": 90
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QrtTYPmdd1qq",
|
||||
"isInheritable": false,
|
||||
"position": 100
|
||||
}
|
||||
],
|
||||
"format": "markdown",
|
||||
@ -6038,19 +6038,19 @@
|
||||
"type": "text",
|
||||
"mime": "text/html",
|
||||
"attributes": [
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "MI26XDLSAlCD",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "iconClass",
|
||||
"value": "bx bxs-keyboard",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "MI26XDLSAlCD",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
}
|
||||
],
|
||||
"format": "markdown",
|
||||
|
86
src/public/app/doc_notes/en/User Guide/!!!meta.json
generated
86
src/public/app/doc_notes/en/User Guide/!!!meta.json
generated
@ -382,10 +382,24 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "l2VkvOwUNfZj",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 20
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "l2VkvOwUNfZj",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
@ -399,20 +413,6 @@
|
||||
"value": "bx bx-code-alt",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
}
|
||||
],
|
||||
"format": "html",
|
||||
@ -475,35 +475,35 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"value": "J1Bb6lVlwU5T",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"isInheritable": false,
|
||||
"position": 20
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "rWX5eY045zbE",
|
||||
"value": "3tW6mORuTHnB",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "moVgBcoxE3EK",
|
||||
"value": "rWX5eY045zbE",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "J1Bb6lVlwU5T",
|
||||
"value": "moVgBcoxE3EK",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
@ -4089,17 +4089,31 @@
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QEAPj01N5f7w",
|
||||
"value": "oiVPnW8QfnvS",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QrtTYPmdd1qq",
|
||||
"isInheritable": false,
|
||||
"position": 60
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "eIg8jdvaoNNd",
|
||||
"value": "QEAPj01N5f7w",
|
||||
"isInheritable": false,
|
||||
"position": 70
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "eIg8jdvaoNNd",
|
||||
"isInheritable": false,
|
||||
"position": 80
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
@ -4113,20 +4127,6 @@
|
||||
"value": "bx bxs-keyboard",
|
||||
"isInheritable": false,
|
||||
"position": 80
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "oiVPnW8QfnvS",
|
||||
"isInheritable": false,
|
||||
"position": 90
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "QrtTYPmdd1qq",
|
||||
"isInheritable": false,
|
||||
"position": 100
|
||||
}
|
||||
],
|
||||
"format": "html",
|
||||
@ -6038,19 +6038,19 @@
|
||||
"type": "text",
|
||||
"mime": "text/html",
|
||||
"attributes": [
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "MI26XDLSAlCD",
|
||||
"isInheritable": false,
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "iconClass",
|
||||
"value": "bx bxs-keyboard",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "MI26XDLSAlCD",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
}
|
||||
],
|
||||
"format": "html",
|
||||
|
@ -54,8 +54,8 @@
|
||||
</li>
|
||||
<li><a href="#root/_help_QEAPj01N5f7w">Reference links</a>
|
||||
</li>
|
||||
<li><a href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_NwBbFdNZ9h7O">Admonitions</a>,
|
||||
we ended up creating our own plugin but <a href="https://github.com/aarkue/ckeditor5-admonition">aarkue/ckeditor5-admonition</a> was
|
||||
<li><a href="#root/_help_NwBbFdNZ9h7O">Admonitions</a>, we ended up creating
|
||||
our own plugin but <a href="https://github.com/aarkue/ckeditor5-admonition">aarkue/ckeditor5-admonition</a> was
|
||||
a good inspiration (including the toolbar icon).</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
@ -86,10 +86,10 @@
|
||||
</ul>
|
||||
<h2>Editing notes</h2>
|
||||
<ul>
|
||||
<li>For <a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a> notes,
|
||||
refer to <a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_oiVPnW8QfnvS">Keyboard shortcuts</a> and
|
||||
<li>For <a class="reference-link" href="#root/_help_iPIMuisry3hd">Text</a> notes,
|
||||
refer to <a class="reference-link" href="#root/_help_oiVPnW8QfnvS">Keyboard shortcuts</a> and
|
||||
<a
|
||||
class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_QrtTYPmdd1qq">Markdown-like formatting</a>.</li>
|
||||
class="reference-link" href="#root/_help_QrtTYPmdd1qq">Markdown-like formatting</a>.</li>
|
||||
<li><kbd>Alt</kbd>-<kbd>F10</kbd> - bring up inline formatting toolbar (arrow
|
||||
keys <kbd><span>←</span></kbd>,<kbd><span>→</span></kbd> to navigate, <kbd>Enter</kbd> to
|
||||
apply)</li>
|
||||
|
@ -14,10 +14,10 @@
|
||||
|
||||
<div class="ck-content">
|
||||
<aside class="admonition warning">
|
||||
<p>This page describes manually installing Trilium on your server. <strong>Note that this is a not well supported way to install Trilium, problems may appear, information laid out here is quite out of date. It is recommended to use either </strong>
|
||||
<p>This page describes manually installing Trilium on your server. <strong>Note that this is a not well supported way to install Trilium, problems may appear, information laid out here is quite out of date. It is recommended to use either</strong>
|
||||
<a
|
||||
class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/WOcw2SLH6tbX/Dgg7bR3b6K9j/_help_rWX5eY045zbE">Docker Server Installation</a><strong> or </strong><a class="reference-link"
|
||||
href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/WOcw2SLH6tbX/Dgg7bR3b6K9j/_help_3tW6mORuTHnB">Packaged server installation</a><strong>.</strong>
|
||||
class="reference-link" href="#root/_help_rWX5eY045zbE">Docker Server Installation</a> <strong>or</strong> <a class="reference-link"
|
||||
href="#root/_help_3tW6mORuTHnB">Packaged server installation</a><strong>.</strong>
|
||||
</p>
|
||||
</aside>
|
||||
<h2>Requirements</h2>
|
||||
|
@ -15,24 +15,27 @@
|
||||
<div class="ck-content">
|
||||
<p>Trilium does not support multiple users. In order to have two or more
|
||||
persons with their own set of notes, multiple server instances must be
|
||||
set up. It is also not possible to use multiple <a href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/_help_cbkrhQjrkKrh">sync</a> servers.</p>
|
||||
set up. It is also not possible to use multiple <a href="#root/_help_cbkrhQjrkKrh">sync</a> servers.</p>
|
||||
<p>To allow multiple server instances on a single physical server:</p>
|
||||
<ul>
|
||||
<li>
|
||||
<p>For <a class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/WOcw2SLH6tbX/Dgg7bR3b6K9j/_help_3tW6mORuTHnB">Packaged version for Linux</a> or
|
||||
<p>For <a class="reference-link" href="#root/_help_3tW6mORuTHnB">Packaged version for Linux</a> or
|
||||
<a
|
||||
class="reference-link" href="#root/Dgg7bR3b6K9j/_help_J1Bb6lVlwU5T">Manually</a>, if starting the server manually just specify a different
|
||||
class="reference-link" href="#root/_help_J1Bb6lVlwU5T">Manually</a>, if starting the server manually just specify a different
|
||||
port and data directory per instance:</p><pre><code class="language-text-x-trilium-auto">TRILIUM_NETWORK_PORT=8080 TRILIUM_DATA_DIR=/path/to/your/data-dir-A /opt/trilium/trilium.sh</code></pre>
|
||||
<p>For a second instance:</p><pre><code class="language-text-x-trilium-auto">TRILIUM_NETWORK_PORT=8081 TRILIUM_DATA_DIR=/path/to/your/data-dir-B /opt/trilium/trilium.sh</code></pre>
|
||||
<p>If using <code>systemd</code>, then set the <a href="https://serverfault.com/questions/413397/how-to-set-environment-variable-in-systemd-service">environment variables in the service configuration</a>.</p>
|
||||
<p> </p>
|
||||
</li>
|
||||
<li>For <a class="reference-link" href="#root/Dgg7bR3b6K9j/_help_rWX5eY045zbE">Using Docker</a>,
|
||||
simply use two different containers, each with their own port binding and
|
||||
data directory.</li>
|
||||
<li>For <a class="reference-link" href="#root/Dgg7bR3b6K9j/_help_moVgBcoxE3EK">On NixOS</a>,
|
||||
the only possible way is to use Docker OCI containers or at least one NixOS
|
||||
container with its own service definition.</li>
|
||||
<li>
|
||||
<p>For <a class="reference-link" href="#root/_help_rWX5eY045zbE">Using Docker</a>,
|
||||
simply use two different containers, each with their own port binding and
|
||||
data directory.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>For <a class="reference-link" href="#root/_help_moVgBcoxE3EK">On NixOS</a>,
|
||||
the only possible way is to use Docker OCI containers or at least one NixOS
|
||||
container with its own service definition.</p>
|
||||
</li>
|
||||
</ul>
|
||||
<p>For support or additional context, see the related <a href="https://github.com/orgs/TriliumNext/discussions/1642#discussioncomment-12768808">GitHub Discussion</a>.</p>
|
||||
</div>
|
||||
|
@ -69,7 +69,7 @@
|
||||
section.</li>
|
||||
</ul>
|
||||
<aside class="admonition note">
|
||||
<p><strong>Context regarding syntax highlighting</strong>
|
||||
<p><strong>Context regarding syntax highlighting</strong>
|
||||
</p>
|
||||
<p>In order to achieve the syntax highlight, the Highlight.js library is
|
||||
being used. Do note that support for syntax highlighting in code blocks
|
||||
|
@ -16,8 +16,8 @@
|
||||
<aside class="admonition tip">
|
||||
<p>This section of keyboard shortcuts presents a subset of the keyboard shortcuts
|
||||
as supported by the editor technology we are using, <a class="reference-link"
|
||||
href="#root/pOsGYCXsbNQG/tC7s2alapj8V/1YeN2MzFUluU/_help_MI26XDLSAlCD">CKEditor</a>.
|
||||
The shortcuts were taken from the <a href="https://ckeditor.com/docs/ckeditor5/latest/features/accessibility.html#keyboard-shortcuts">official documentation</a>.
|
||||
href="#root/_help_MI26XDLSAlCD">CKEditor</a>. The shortcuts were taken
|
||||
from the <a href="https://ckeditor.com/docs/ckeditor5/latest/features/accessibility.html#keyboard-shortcuts">official documentation</a>.
|
||||
Note that not all the shortcuts in the original documentation are applicable
|
||||
(due to using a different configuration).</p>
|
||||
</aside>
|
||||
@ -170,7 +170,8 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</figure>
|
||||
<h3>Interacting with blocks</h3>
|
||||
|
||||
<h3>Interacting with blocks</h3>
|
||||
<p>Blocks are images, tables, blockquotes, annotations.</p>
|
||||
<figure class="table">
|
||||
<table>
|
||||
@ -283,7 +284,8 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</figure>
|
||||
<h3>General UI shortcuts</h3>
|
||||
|
||||
<h3>General UI shortcuts</h3>
|
||||
<figure class="table">
|
||||
<table>
|
||||
<thead>
|
||||
|
@ -41,8 +41,8 @@
|
||||
the official documentation.</p>
|
||||
<h2>Markdown support</h2>
|
||||
<p>Math equations will be preserved when exporting to or importing from Markdown,
|
||||
surrounded by <code><span class="math-tex">\(</span></code> characters for
|
||||
inline math expressions, and <code>$\)</code> for display mode.</p>
|
||||
surrounded by <code>\(</code> characters for inline math expressions, and <code>$\)</code> for
|
||||
display mode.</p>
|
||||
<p>If you notice any issue with the Markdown import/export for equations,
|
||||
feel free to <a href="#root/_help_wy8So3yZZlH9">report</a> it while providing
|
||||
the equation that causes issues.</p>
|
||||
|
Loading…
x
Reference in New Issue
Block a user