Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
docs(user): tweak synchronization
Elian Doranc462e1092dac
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.htmlindex e102d06e30..958095ffaf 100644--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html@@ -212,8 +212,10 @@<h2>Adding a marker using the map</h2><h3>Adding a new note using the plus button</h3><ol>- <li>To create a marker, first navigate to the desired point on the map. Then- press the <em>Add marker</em> button at the center-bottom of the map.</li>+ <li>+ <p>To create a marker, first navigate to the desired point on the map. Then+ press the <em>Add marker</em> button at the center-bottom of the map.</p>+ </li><li><p>Once pressed, the map will enter in the insert mode, as illustrated bythe notification. Additionally, a preview of the marker will be shown at@@ -221,8 +223,10 @@<p>Simply click the point on the map where to place the marker. To cancel,press either the Escape key or press again the <em>Add marker</em> button.</p></li>- <li>Once clicked, the marker will show up on the map and a popup will show- to the right with the title already selected to be changed.</li>+ <li>+ <p>Once clicked, the marker will show up on the map and a popup will show+ to the right with the title already selected to be changed.</p>+ </li></ol><h3>Adding a new note using the contextual menu</h3><ol>diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.htmlindex a29d59ddda..3699938261 100644--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html@@ -22,19 +22,24 @@<li><strong>Server Deployment</strong>: Ensure your server instance is deployedbut uninitialized.</li><li><strong>Desktop Configuration</strong>: Open your desktop instance, navigate- to Options -> Sync tab -> Sync configuration, and set the "Server- instance address" to your sync server's address. Click Save.</li>-</ol>-<p>- <img src="Synchronization_sync-config.png" alt="screenshot of the sync settings options modal">-</p>-<ol>- <li><strong>Testing Sync</strong>: Click the "Test sync" button to verify- the connection to the sync server. If successful, the client will start- pushing all data to the server instance. This process may take some time,- but you can continue using Trilium. Periodically check the server instance- to confirm when the sync is complete. Once finished, you should see the- login screen on the server.</li>+ to <a class="reference-link" href="#root/_help_4TIF1oA4VQRO">Options</a> → <em>Sync</em> → <em>Sync server</em>,+ and set the <em>Server address</em> to your sync server's address.+ <ul>+ <li>Note that the sync server can also be overridden through <a class="reference-link"+ href="#root/_help_Gzjqa934BdH4">Configuration (config.ini or environment variables)</a>,+ case in which that value takes precedence. If that's the case, a field+ called <em>Server in use</em> indicates it.</li>+ </ul>+ </li>+ <li><strong>Testing Sync</strong>: Click the <em>Test sync</em> button to verify+ the connection to the sync server.+ <ul>+ <li>If successful, the client will start pushing all data to the server instance.</li>+ <li>This process may take some time, but you can continue using Trilium. Periodically+ check the server instance to confirm when the sync is complete. Once finished,+ you should see the login screen on the server.</li>+ </ul>+ </li></ol><h3>Synchronizing a Desktop Instance from a Sync Server</h3><p>This method is used when you already have a sync server and want to configurediff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.pngdeleted file mode 100644index d86942d850..0000000000Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.png and /dev/null differdiff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.jsonindex c4938c2cd2..760912e488 100644--- a/docs/User Guide/!!!meta.json+++ b/docs/User Guide/!!!meta.json@@ -1118,14 +1118,6 @@"position": 10,"dataFileName": "Synchronization_image.png"},- {- "attachmentId": "wlHlhXqZ0i1S",- "title": "sync-config.png",- "role": "image",- "mime": "image/png",- "position": 10,- "dataFileName": "Synchronization_sync-config.png"- },{"attachmentId": "x0t06ATHph6b","title": "sync-init.png",diff --git a/docs/User Guide/User Guide/Installation & Setup/Synchronization.md b/docs/User Guide/User Guide/Installation & Setup/Synchronization.mdindex 7493cf1efb..088d088f5d 100644--- a/docs/User Guide/User Guide/Installation & Setup/Synchronization.md+++ b/docs/User Guide/User Guide/Installation & Setup/Synchronization.md@@ -16,11 +16,11 @@ Setting up the server securely is critical and can be complex. It is crucial toThis method is used when you already have a desktop instance of Trilium and want to set up a sync server on your web host.1. **Server Deployment**: Ensure your server instance is deployed but uninitialized.-2. **Desktop Configuration**: Open your desktop instance, navigate to Options -> Sync tab -> Sync configuration, and set the "Server instance address" to your sync server's address. Click Save.----1. **Testing Sync**: Click the "Test sync" button to verify the connection to the sync server. If successful, the client will start pushing all data to the server instance. This process may take some time, but you can continue using Trilium. Periodically check the server instance to confirm when the sync is complete. Once finished, you should see the login screen on the server.+2. **Desktop Configuration**: Open your desktop instance, navigate to <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Options.md">Options</a> → _Sync_ → _Sync server_, and set the _Server address_ to your sync server's address.+ * Note that the sync server can also be overridden through <a class="reference-link" href="../Advanced%20Usage/Configuration%20(config.ini%20or%20environment%20variables).md">Configuration (config.ini or environment variables)</a>, case in which that value takes precedence. If that's the case, a field called _Server in use_ indicates it.+3. **Testing Sync**: Click the _Test sync_ button to verify the connection to the sync server.+ * If successful, the client will start pushing all data to the server instance.+ * This process may take some time, but you can continue using Trilium. Periodically check the server instance to confirm when the sync is complete. Once finished, you should see the login screen on the server.### Synchronizing a Desktop Instance from a Sync Serverdiff --git a/docs/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.png b/docs/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.pngdeleted file mode 100644index d86942d850..0000000000Binary files a/docs/User Guide/User Guide/Installation & Setup/Synchronization_sync-config.png and /dev/null differ