Merge remote-tracking branch 'origin/master'

This commit is contained in:
zadam 2021-10-25 21:59:34 +02:00
commit 6135de8507

View file

@ -134,12 +134,12 @@
<p>This setup needs to be initiated from the desktop instance:</p>
<ol>
<li>please open your desktop instance of Trilium Notes</li>
<li>click on Options button in the top right</li>
<li>click on Sync tab</li>
<li>configure server instance address to the: <span id="current-host"></span> and click save.</li>
<li>click on "Test sync" button</li>
<li>once you've done all this, click <a href="/">here</a></li>
<li>Open your desktop instance of Trilium Notes.</li>
<li>From the Trilium Menu, click Options.</li>
<li>Click on Sync tab.</li>
<li>Change server instance address to: <span id="current-host"></span> and click save.</li>
<li>Click "Test sync" button to verify connection is successfull.</li>
<li>Once you've completed these steps, click <a href="/">here</a>.</li>
</ol>
<button type="button" data-bind="click: back" class="btn btn-secondary">Back</button>