tests

2025-08-30 20:39:46 +02:00 · 2021-11-30 12:03:20 +00:00 · 2021-11-30 11:25:27 +00:00 · 2021-11-30 11:15:42 +00:00 · 2021-11-29 18:41:53 +00:00 · 2021-11-29 18:39:07 +00:00
504 changed files with 234912 additions and 199914 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -78,6 +78,9 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
+packages/app-cli/app/command-sync.d.ts
+packages/app-cli/app/command-sync.js
+packages/app-cli/app/command-sync.js.map
 packages/app-cli/app/command-testing.d.ts
 packages/app-cli/app/command-testing.js
 packages/app-cli/app/command-testing.js.map
@@ -216,6 +219,12 @@ packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
+packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
+packages/app-desktop/gui/EditFolderDialog/Dialog.js
+packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
+packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
+packages/app-desktop/gui/EditFolderDialog/IconSelector.js
+packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
@@ -282,6 +291,9 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -333,6 +345,15 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -396,6 +417,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -522,6 +546,9 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
+packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
+packages/app-desktop/gui/PasswordInput/PasswordInput.js
+packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -678,9 +705,15 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
+packages/app-desktop/gui/utils/SyncScrollMap.d.ts
+packages/app-desktop/gui/utils/SyncScrollMap.js
+packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
+packages/app-desktop/gui/utils/loadScript.d.ts
+packages/app-desktop/gui/utils/loadScript.js
+packages/app-desktop/gui/utils/loadScript.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -693,9 +726,6 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
-packages/app-desktop/services/e2ee.d.ts
-packages/app-desktop/services/e2ee.js
-packages/app-desktop/services/e2ee.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -735,6 +765,18 @@ packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/share/invitationRespond.d.ts
 packages/app-desktop/services/share/invitationRespond.js
 packages/app-desktop/services/share/invitationRespond.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -969,6 +1011,9 @@ packages/lib/commands/synchronize.js.map
 packages/lib/components/EncryptionConfigScreen/utils.d.ts
 packages/lib/components/EncryptionConfigScreen/utils.js
 packages/lib/components/EncryptionConfigScreen/utils.js.map
+packages/lib/database-driver-better-sqlite.d.ts
+packages/lib/database-driver-better-sqlite.js
+packages/lib/database-driver-better-sqlite.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1134,9 +1179,12 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/ntpDate.d.ts
-packages/lib/ntpDate.js
-packages/lib/ntpDate.js.map
+packages/lib/net-utils.d.ts
+packages/lib/net-utils.js
+packages/lib/net-utils.js.map
+packages/lib/ntp.d.ts
+packages/lib/ntp.js
+packages/lib/ntp.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1314,6 +1362,9 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
+packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
+packages/lib/services/interop/InteropService_Exporter_Md.test.js
+packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
@@ -1848,6 +1899,9 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
+packages/renderer/MdToHtml/rules/source_map.d.ts
+packages/renderer/MdToHtml/rules/source_map.js
+packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,8 @@ assignees: ''

 <!--
  Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
-  Include screenshots if needed.
+  Include screenshots for UI problems if needed.
+  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
  Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->

--- a/.github/scripts/run_ci.sh
+++ b/.github/scripts/run_ci.sh
@@ -62,6 +62,15 @@ npm install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."

+	# On Linux, we run the Joplin Server tests using PostgreSQL
+	if [ "$IS_LINUX" == "1" ]; then
+		echo "Running Joplin Server tests using PostgreSQL..."
+		sudo docker-compose --file docker-compose.db-dev.yml up -d
+		export JOPLIN_TESTS_SERVER_DB=pg
+	else
+		echo "Running Joplin Server tests using SQLite..."
+	fi
+
 	# Need this because we're getting this error:
 	#
 	# @joplin/lib: FATAL ERROR: Ineffective mark-compacts near heap limit
@@ -81,7 +90,7 @@ fi
 # release randomly fail.
 # =============================================================================

-if [ "$IS_PULL_REQUEST" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running linter..."

 	npm run linter-ci ./
@@ -109,6 +118,27 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 	fi
 fi

+# =============================================================================
+# Check that we didn't lose any string due to gettext not being able to parse
+# newly modified or added scripts. This is convenient to quickly view on GitHub
+# what commit may have broken translation building. We run this on macOS because
+# we need the latest version of gettext (and stable Ubuntu doesn't have it).
+# =============================================================================
+
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
+	if [ "$IS_MACOS" == "1" ]; then
+		echo "Step: Checking for lost translation strings..."
+
+		xgettext --version
+
+		node packages/tools/build-translation.js --missing-strings-check-only
+		testResult=$?
+		if [ $testResult -ne 0 ]; then
+			exit $testResult
+		fi
+	fi
+fi
+
 # =============================================================================
 # Find out if we should run the build or not. Electron-builder gets stuck when
 # building PRs so we disable it in this case. The Linux build should provide
@@ -124,13 +154,12 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 fi

 # =============================================================================
-# Prepare the Electron app and build it
+# Build the Electron app or Docker image depending on the current tag.
 #
 # If the current tag is a desktop release tag (starts with "v", such as
-# "v1.4.7"), we build and publish to github
-#
-# Otherwise we only build but don't publish to GitHub. It helps finding
-# out any issue in pull requests and dev branch.
+# "v1.4.7"), we build and publish to GitHub. Otherwise we only build but don't
+# publish to GitHub. It helps finding out any issue in pull requests and dev
+# branch.
 # =============================================================================

 cd "$ROOT_DIR/packages/app-desktop"
--- a/.github/workflows/github-actions-main.yml
+++ b/.github/workflows/github-actions-main.yml
@@ -19,9 +19,18 @@ jobs:
          sudo apt-get update || true
          sudo apt-get install -y gettext
          sudo apt-get install -y libsecret-1-dev
+          sudo apt-get install -y translate-toolkit
+
+      - name: Install macOS dependencies
+        if: runner.os == 'macOS'
+        run: |
+          brew update
+          brew install gettext
+          brew install translate-toolkit

      - name: Install Docker Engine
-        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
+        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
+        if: runner.os == 'Linux'
        run: |
          sudo apt-get install -y apt-transport-https
          sudo apt-get install -y ca-certificates
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,9 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
+packages/app-cli/app/command-sync.d.ts
+packages/app-cli/app/command-sync.js
+packages/app-cli/app/command-sync.js.map
 packages/app-cli/app/command-testing.d.ts
 packages/app-cli/app/command-testing.js
 packages/app-cli/app/command-testing.js.map
@@ -199,6 +202,12 @@ packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
+packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
+packages/app-desktop/gui/EditFolderDialog/Dialog.js
+packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
+packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
+packages/app-desktop/gui/EditFolderDialog/IconSelector.js
+packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
 packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
@@ -265,6 +274,9 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
+packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -316,6 +328,15 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -379,6 +400,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -505,6 +529,9 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
+packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
+packages/app-desktop/gui/PasswordInput/PasswordInput.js
+packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -661,9 +688,15 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
+packages/app-desktop/gui/utils/SyncScrollMap.d.ts
+packages/app-desktop/gui/utils/SyncScrollMap.js
+packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
+packages/app-desktop/gui/utils/loadScript.d.ts
+packages/app-desktop/gui/utils/loadScript.js
+packages/app-desktop/gui/utils/loadScript.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -676,9 +709,6 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
-packages/app-desktop/services/e2ee.d.ts
-packages/app-desktop/services/e2ee.js
-packages/app-desktop/services/e2ee.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -718,6 +748,18 @@ packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/share/invitationRespond.d.ts
 packages/app-desktop/services/share/invitationRespond.js
 packages/app-desktop/services/share/invitationRespond.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -952,6 +994,9 @@ packages/lib/commands/synchronize.js.map
 packages/lib/components/EncryptionConfigScreen/utils.d.ts
 packages/lib/components/EncryptionConfigScreen/utils.js
 packages/lib/components/EncryptionConfigScreen/utils.js.map
+packages/lib/database-driver-better-sqlite.d.ts
+packages/lib/database-driver-better-sqlite.js
+packages/lib/database-driver-better-sqlite.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1117,9 +1162,12 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/ntpDate.d.ts
-packages/lib/ntpDate.js
-packages/lib/ntpDate.js.map
+packages/lib/net-utils.d.ts
+packages/lib/net-utils.js
+packages/lib/net-utils.js.map
+packages/lib/ntp.d.ts
+packages/lib/ntp.js
+packages/lib/ntp.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1297,6 +1345,9 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
+packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
+packages/lib/services/interop/InteropService_Exporter_Md.test.js
+packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
 packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
@@ -1831,6 +1882,9 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
+packages/renderer/MdToHtml/rules/source_map.d.ts
+packages/renderer/MdToHtml/rules/source_map.js
+packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
--- a/Assets/Forum/JoplinIconBlue.png
+++ b/Assets/Forum/JoplinIconBlue.png
--- a/Assets/Forum/JoplinLogoBlue.png
+++ b/Assets/Forum/JoplinLogoBlue.png
--- a/Assets/WebsiteAssets/css/site.css
+++ b/Assets/WebsiteAssets/css/site.css
@@ -188,6 +188,11 @@ h2 {
 	padding-bottom: 0.5em;
 }

+h3 {
+	font-size: 1.3em;
+	margin-bottom: 0.8rem;
+}
+
 .front-page h1 {
 	font-size: 3em;
 }
--- a/Assets/WebsiteAssets/templates/partials/gaOptimize.mustache
+++ b/Assets/WebsiteAssets/templates/partials/gaOptimize.mustache
@@ -1,2 +1,5 @@
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->
--- a/BUILD.md
+++ b/BUILD.md
@@ -21,7 +21,7 @@ There are also a few forks of existing packages under the "fork-*" name.
 - Install node 14+ - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
 - Windows: Install Windows Build Tools - `npm install -g windows-build-tools --vs2015`
- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python rsync`
+- Linux: Install dependencies - `sudo apt install build-essential libnss3 libsecret-1-dev python rsync`

 ## Building

@@ -59,7 +59,6 @@ Normally the **bundler** should start automatically with the application. If it
 ## Building the clipper

 	cd packages/app-clipper/popup
-	npm install
 	npm run watch # To watch for changes

 To test the extension please refer to the relevant pages for each browser: [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension#Trying_it_out) / [Chrome](https://developer.chrome.com/docs/extensions/mv3/getstarted/). Please note that the extension in dev mode will only connect to a dev instance of the desktop app (and vice-versa).
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -40,6 +40,7 @@ RUN npm install --ignore-scripts
 # prevent certain sub-packages, such as sqlite3, from being built

 COPY --chown=$user:$user packages/fork-sax/package*.json ./packages/fork-sax/
+COPY --chown=$user:$user packages/htmlpack/package*.json ./packages/htmlpack/
 COPY --chown=$user:$user packages/renderer/package*.json ./packages/renderer/
 COPY --chown=$user:$user packages/tools/package*.json ./packages/tools/
 COPY --chown=$user:$user packages/lib/package*.json ./packages/lib/
@@ -66,6 +67,7 @@ RUN npm run bootstrapServerOnly
 # Now copy the source files. Put lib and server last as they are more likely to change.

 COPY --chown=$user:$user packages/fork-sax ./packages/fork-sax
+COPY --chown=$user:$user packages/htmlpack ./packages/htmlpack
 COPY --chown=$user:$user packages/renderer ./packages/renderer
 COPY --chown=$user:$user packages/tools ./packages/tools
 COPY --chown=$user:$user packages/lib ./packages/lib
--- a/Joplin_install_and_update.sh
+++ b/Joplin_install_and_update.sh
@@ -213,7 +213,7 @@ then
 	Encoding=UTF-8
 	Name=Joplin
 	Comment=Joplin for Desktop
-	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM}
+	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
 	Icon=joplin
 	StartupWMClass=Joplin
 	Type=Application
--- a/README.md
+++ b/README.md
@@ -22,11 +22,11 @@ Three types of applications are available: for **desktop** (Windows, macOS and L

 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-Setup-2.4.12.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-Setup-2.5.12.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>

-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.

 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:

@@ -36,7 +36,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/J

 Operating System | Download | Alt. Download
 ---|---|---
-Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3-32bit.apk)
+Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.6.3/joplin-v2.6.3.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.6.3/joplin-v2.6.3-32bit.apk)
 iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeIOS.png'/></a> | -

 ## Terminal application
@@ -64,7 +64,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 # Sponsors

 <!-- SPONSORS-ORG -->
-<a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a>
 <!-- SPONSORS-ORG -->

 * * *
@@ -275,16 +275,20 @@ In the **desktop application** or **mobile application**, select "OneDrive" as t

 In the **terminal application**, to initiate the synchronisation process, type `:sync`. You will be asked to follow a link to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive).

-## AWS S3 synchronisation
+## S3 synchronisation

-In the **desktop application** or **mobile application**, select "AWS S3 (Beta)" as the synchronisation target in the [Configuration screen](https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md).
+As of Joplin 2.x.x, Joplin supports multiple S3 providers. We expose some options that will need to be configured depending on your provider of choice. We have tested with UpCloud, AWS, and Linode. others should work as well.

- **AWS S3 Bucket:** The name of your Bucket, such as `joplin-bucket`
- **AWS S3 URL:** Fully qualified URL; By default this should be `https://s3.amazonaws.com/`
- **AWS key & AWS secret:**  IAM user's programmatic access key.  To create a new key & secret, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials).
+In the **desktop application** or **mobile application**, select "S3 (Beta)" as the synchronisation target in the [Configuration screen](https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md).
+
+- **S3 Bucket:** The name of your Bucket, such as `joplin-bucket`
+- **S3 URL:** Fully qualified URL; For AWS this should be `https://s3.amazonaws.com/`
+- **S3 Access Key & S3 Secret Key:**  The User's programmatic access key.  To create a new key & secret on AWS, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials). For other providers follow their documentation.
+- **S3 Region:** Some providers require you to provide the region of your bucket. This is usually in the form of "eu-west1" or something similar depending on your region. For providers that do not require a region, you can leave it blank.
+- **Force Path Style**: This setting enables Joplin to talk to S3 providers using an older style S3 Path. Depending on your provider you may need to try with this on and off.


-While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`.
+While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`. Some providers do not expose these options, and it could create a syncing problem. Do attempt and report back so we can update the documentation appropriately.

 To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permissions** tab. Temporarily disable **Block all public access**  to edit the Bucket policy, something along the lines of:
 ```
@@ -311,7 +315,26 @@ To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permis
 }
 ```

+### Configuration settings for tested providers

+All providers will require a bucket, Access Key, and Secret Key.
+
+If you provide a configuration and you receive "success!" on the "check config" then your S3 sync should work for your provider. If you do not receive success, you may need to adjust your settings, or save them, restart the app, and attempt a sync. This may reveal more clear error messaging that will help you deduce the problem.
+
+### AWS
+- URL: https://s3.amazonaws.com
+- Region: required
+- Force Path Style: unchecked
+
+### Linode
+- URL: https://<region>.linodeobjects.com
+- Region: empty
+- Force Path Style: unchecked
+
+### UpCloud
+- URL: https://<account>.<region>.upcloudobjects.com (They will provide you with multiple URLs, the one that follows this pattern should work.)
+- Region: required
+- Force Path Style: unchecked

 # Encryption

@@ -505,47 +528,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  99%
-<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  28%
-<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  71%
-<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  55%
-<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  27%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  68%
+<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  54%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  95%
 <img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  95%
-<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [marph91](mailto:martin.d@andix.de)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  54%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:s.robin@tutanota.de)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  52%
 <img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  95%
-<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  31%
-<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Nicolas Viviani  |  100%
-<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  36%
-<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  95%
-<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  95%
-<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  83%
-<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  86%
-<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  90%
-<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  Alexander Dawson  |  96%
-<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  67%
-<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  89%
-<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  96%
-<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  89%
-<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  62%
-<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  90%
-<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  42%
-<img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  96%
-<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  89%
-<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  80%
-<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [SiderealArt](mailto:nelson22768384@gmail.com)  |  95%
-<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  96%
+<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  30%
+<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Nicolas Viviani  |  96%
+<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  35%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  83%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  87%
+<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  Alexander Dawson  |  93%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  65%
+<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  86%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Felipe Viggiano](mailto:felipeviggiano@gmail.com)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  86%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  60%
+<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  43%
+<img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  93%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  85%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  78%
+<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [SiderealArt](mailto:nelson22768384@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  91%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->

 # Contributors
--- a/docs/api/get_started/plugins/index.html
+++ b/docs/api/get_started/plugins/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Getting started with plugin development | Joplin</title>

 		<script
@@ -304,8 +307,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <p>Then, in the directory where you plan to develop the plugin, run:</p>
 <pre><code>yo joplin
 </code></pre>
-<p>This will generate the basic scafolding of the plugin. At the root of it, there are a number of configuration files which you normally won't need to change. Then the <code>src/</code> directory will contain your code. By default, the project uses TypeScript, but you are free to use plain JavaScript too - eventually the project is compiled to plain JS in any case.</p>
-<p>The <code>src/</code> directory also contains a <a href="/api/references/plugin_manifest/">manifest.json</a> file, which contains the various information about the plugin that was set in the inital generation of the scaffolding, such as its name, homepage URL, etc. You can edit this at any time, but editing it after it has been published may cause users to have to download it again.</p>
+<p>This will generate the basic scaffolding of the plugin. At the root of it, there are a number of configuration files which you normally won't need to change. Then the <code>src/</code> directory will contain your code. By default, the project uses TypeScript, but you are free to use plain JavaScript too - eventually the project is compiled to plain JS in any case.</p>
+<p>The <code>src/</code> directory also contains a <a href="/api/references/plugin_manifest/">manifest.json</a> file, which contains the various information about the plugin that was set in the initial generation of the scaffolding, such as its name, homepage URL, etc. You can edit this at any time, but editing it after it has been published may cause users to have to download it again.</p>
 <h2>Setup Source Control<a name="setup-source-control" href="#setup-source-control" class="heading-anchor">🔗</a></h2>
 <p>In your plugin directory, run:</p>
 <pre><code>git init 
@@ -376,7 +379,7 @@ This should be the path to your main plugin directory, i.e. <code>path/to/your/r
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/overview/index.html
+++ b/docs/api/overview/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Extending Joplin | Joplin</title>

 		<script
@@ -354,7 +357,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/references/development_mode/index.html
+++ b/docs/api/references/development_mode/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Development mode | Joplin</title>

 		<script
@@ -333,7 +336,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/references/plugin_api/assets/js/search.json
+++ b/docs/api/references/plugin_api/assets/js/search.json
--- a/docs/api/references/plugin_api/classes/joplinviewspanels.html
+++ b/docs/api/references/plugin_api/classes/joplinviewspanels.html
@@ -101,6 +101,7 @@
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#create" class="tsd-kind-icon">create</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#hide" class="tsd-kind-icon">hide</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#onmessage" class="tsd-kind-icon">on<wbr>Message</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#postmessage" class="tsd-kind-icon">post<wbr>Message</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#sethtml" class="tsd-kind-icon">set<wbr>Html</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#show" class="tsd-kind-icon">show</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewspanels.html#visible" class="tsd-kind-icon">visible</a></li>
@@ -241,6 +242,46 @@
    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>


+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="postmessage" class="tsd-anchor"></a>
+					<h3>post<wbr>Message</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">post<wbr>Message<span class="tsd-signature-symbol">(</span>handle<span class="tsd-signature-symbol">: </span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a>, message<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">void</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Sends a message to the webview.</p>
+								</div>
+								<p>The webview must have registered a message handler prior, otherwise the message is ignored. Use;</p>
+								<pre><code class="language-javascript">webviewApi.onMessage(<span class="hljs-function">(<span class="hljs-params">message</span>) =&gt;</span> { ... });</code></pre>
+								<ul>
+									<li><code>message</code> can be any JavaScript object, string or number</li>
+								</ul>
+								<p>The view API may have only one onMessage handler defined.
+								This method is fire and forget so no response is returned.</p>
+								<p>It is particularly useful when the webview needs to react to events emitted by the plugin or the joplin api.</p>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>handle: <a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a></h5>
+								</li>
+								<li>
+									<h5>message: <span class="tsd-signature-type">any</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -372,6 +413,9 @@
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinviewspanels.html#onmessage" class="tsd-kind-icon">on<wbr>Message</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinviewspanels.html#postmessage" class="tsd-kind-icon">post<wbr>Message</a>
+							</li>
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinviewspanels.html#sethtml" class="tsd-kind-icon">set<wbr>Html</a>
 							</li>
--- a/docs/api/references/plugin_loading_rules/index.html
+++ b/docs/api/references/plugin_loading_rules/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Plugin Loading Rules | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/references/plugin_manifest/index.html
+++ b/docs/api/references/plugin_manifest/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Plugin Manifest | Joplin</title>

 		<script
@@ -409,7 +412,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/references/plugin_theming/index.html
+++ b/docs/api/references/plugin_theming/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Plugin theming | Joplin</title>

 		<script
@@ -369,7 +372,7 @@ These include:</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/references/rest_api/index.html
+++ b/docs/api/references/rest_api/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Data API | Joplin</title>

 		<script
@@ -618,6 +621,11 @@ async function fetchAllNotes() {
 <td></td>
 </tr>
 <tr>
+<td>master_key_id</td>
+<td>text</td>
+<td></td>
+</tr>
+<tr>
 <td>body_html</td>
 <td>text</td>
 <td>Note body, in HTML format</td>
@@ -743,6 +751,16 @@ async function fetchAllNotes() {
 <td>text</td>
 <td></td>
 </tr>
+<tr>
+<td>master_key_id</td>
+<td>text</td>
+<td></td>
+</tr>
+<tr>
+<td>icon</td>
+<td>text</td>
+<td></td>
+</tr>
 </tbody>
 </table>
 <h2>GET /folders<a name="get-folders" href="#get-folders" class="heading-anchor">🔗</a></h2>
@@ -844,6 +862,11 @@ async function fetchAllNotes() {
 <td>text</td>
 <td></td>
 </tr>
+<tr>
+<td>master_key_id</td>
+<td>text</td>
+<td></td>
+</tr>
 </tbody>
 </table>
 <h2>GET /resources<a name="get-resources" href="#get-resources" class="heading-anchor">🔗</a></h2>
@@ -1050,7 +1073,7 @@ async function fetchAllNotes() {
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/api/tutorials/toc_plugin/index.html
+++ b/docs/api/tutorials/toc_plugin/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Creating a table of content plugin | Joplin</title>

 		<script
@@ -603,7 +606,7 @@ document.addEventListener('click', event =&gt; {
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20180621-182112/index.html
+++ b/docs/blog/20180621-182112/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Web Clipper now available on Firefox and Chrome | Joplin</title>

 		<script
@@ -337,7 +340,7 @@ published_at: 2018-06-21T17:21:12.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20180906-111039/index.html
+++ b/docs/blog/20180906-111039/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>New iOS release with improved attachment support | Joplin</title>

 		<script
@@ -338,7 +341,7 @@ published_at: 2018-09-06T10:10:39.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20180916-210431/index.html
+++ b/docs/blog/20180916-210431/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Note properties in desktop application | Joplin</title>

 		<script
@@ -337,7 +340,7 @@ published_at: 2018-09-16T20:04:31.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20180929-121053/index.html
+++ b/docs/blog/20180929-121053/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>New release and many bug fixes | Joplin</title>

 		<script
@@ -337,7 +340,7 @@ published_at: 2018-09-29T11:10:53.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20181004-091123/index.html
+++ b/docs/blog/20181004-091123/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin and Hacktobertfest 2018 🎃 | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ published_at: 2018-10-04T08:11:23.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20181101-174335/index.html
+++ b/docs/blog/20181101-174335/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Hacktoberfest has now ended | Joplin</title>

 		<script
@@ -342,7 +345,7 @@ published_at: 2018-11-01T17:43:35.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20181213-173459/index.html
+++ b/docs/blog/20181213-173459/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin is now featured on PrivacyTools.io | Joplin</title>

 		<script
@@ -340,7 +343,7 @@ published_at: 2018-12-13T17:34:59.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190130-230218/index.html
+++ b/docs/blog/20190130-230218/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>New search engine in Joplin | Joplin</title>

 		<script
@@ -340,7 +343,7 @@ published_at: 2019-01-30T23:02:18.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190404-074157/index.html
+++ b/docs/blog/20190404-074157/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Markdown plugins and Goto Anything | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ published_at: 2019-04-04T06:41:57.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190424-112410/index.html
+++ b/docs/blog/20190424-112410/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>The Joplin forum is one year old | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ published_at: 2019-04-24T10:24:10.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190523-231026/index.html
+++ b/docs/blog/20190523-231026/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Note history now in Joplin | Joplin</title>

 		<script
@@ -349,7 +352,7 @@ published_at: 2019-05-23T22:10:26.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190611-000711/index.html
+++ b/docs/blog/20190611-000711/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Changing attachment download behaviour to save disk space | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ published_at: 2019-06-10T23:07:11.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190613-202613/index.html
+++ b/docs/blog/20190613-202613/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Customising your notes with the help of the development tools and CSS | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ published_at: 2019-06-13T19:26:13.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190814-225957/index.html
+++ b/docs/blog/20190814-225957/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin now supports Fountain screenwriting markup language | Joplin</title>

 		<script
@@ -348,7 +351,7 @@ published_at: 2019-08-14T21:59:57.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190925-000254/index.html
+++ b/docs/blog/20190925-000254/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>New icon for Joplin! | Joplin</title>

 		<script
@@ -353,7 +356,7 @@ published_at: 2019-09-24T23:02:54.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20190929-152834/index.html
+++ b/docs/blog/20190929-152834/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Hacktoberfest 2019 is coming soon! | Joplin</title>

 		<script
@@ -346,7 +349,7 @@ published_at: 2019-09-29T14:28:34.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20191012-233121/index.html
+++ b/docs/blog/20191012-233121/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Support for chemical equations using mhchem for Katex | Joplin</title>

 		<script
@@ -346,7 +349,7 @@ published_at: 2019-10-12T22:31:21.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20191014-165136/index.html
+++ b/docs/blog/20191014-165136/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>New Joplin icon, second round | Joplin</title>

 		<script
@@ -338,7 +341,7 @@ published_at: 2019-10-14T15:51:36.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20191101-131852/index.html
+++ b/docs/blog/20191101-131852/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Hacktoberfest 2019 has now ended 🎃 | Joplin</title>

 		<script
@@ -342,7 +345,7 @@ published_at: 2019-11-01T13:18:52.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20191117-183855/index.html
+++ b/docs/blog/20191117-183855/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>And the winner is... | Joplin</title>

 		<script
@@ -347,7 +350,7 @@ published_at: 2019-11-17T18:38:55.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20191118-072700/index.html
+++ b/docs/blog/20191118-072700/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin is looking into joining Google Summer of Code in 2020 | Joplin</title>

 		<script
@@ -345,7 +348,7 @@ published_at: 2019-11-18T07:27:00.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20200220-190804/index.html
+++ b/docs/blog/20200220-190804/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>GSoC 2020: Joplin has been accepted as a mentor organization! | Joplin</title>

 		<script
@@ -337,7 +340,7 @@ published_at: 2020-02-20T19:08:04.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20200301-125055/index.html
+++ b/docs/blog/20200301-125055/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Large desktop update coming soon | Joplin</title>

 		<script
@@ -353,7 +356,7 @@ published_at: 2020-03-01T12:50:55.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20200314-001555/index.html
+++ b/docs/blog/20200314-001555/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Experimental WYSIWYG editor in Joplin | Joplin</title>

 		<script
@@ -347,7 +350,7 @@ published_at: 2020-03-14T00:15:55.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/blog/20200406-224254/index.html
+++ b/docs/blog/20200406-224254/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin informal encryption and security audit results | Joplin</title>

 		<script
@@ -365,7 +368,7 @@ published_at: 2020-04-06T21:42:54.000+00:00</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/build_troubleshooting/index.html
+++ b/docs/build_troubleshooting/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Desktop application | Joplin</title>

 		<script
@@ -372,7 +375,7 @@ pod install
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin changelog | Joplin</title>

 		<script
@@ -291,6 +294,57 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.6.2">v2.6.2</a> (Pre-release) - 2021-11-18T12:19:12Z<a name="v2-6-2-https-github-com-laurent22-joplin-releases-tag-v2-6-2-pre-release-2021-11-18t12-19-12z" href="#v2-6-2-https-github-com-laurent22-joplin-releases-tag-v2-6-2-pre-release-2021-11-18t12-19-12z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Sort Order Buttons and Per-Notebook Sort Order (<a href="https://github.com/laurent22/joplin/issues/5437">#5437</a> by Kenichi Kobayashi)</li>
+<li>New: Added support for notebook icons (e97bb78)</li>
+<li>New: Implements Sync-Scroll for Markdown Editor and Viewer (<a href="https://github.com/laurent22/joplin/issues/5512">#5512</a>) (<a href="https://github.com/laurent22/joplin/issues/2242">#2242</a> by Kenichi Kobayashi)</li>
+<li>New: Add support for encrypted notebooks via Joplin Server (<a href="https://github.com/laurent22/joplin/issues/5529">#5529</a>)</li>
+<li>New: Add shortcut for bulleted list (<a href="https://github.com/laurent22/joplin/issues/5698">#5698</a> by Helmut K. C. Tessarek)</li>
+<li>New: Add support for faster Joplin Server built-in sync locks (<a href="https://github.com/laurent22/joplin/issues/5662">#5662</a>)</li>
+<li>New: Add support for more style of highlighted texts when importing ENEX files (89179c2)</li>
+<li>Improved: Allow showing passwords in Master Password dialog (79d97f2)</li>
+<li>Improved: Fixed and improve laggy scroll in text editor (<a href="https://github.com/laurent22/joplin/issues/5606">#5606</a>) (<a href="https://github.com/laurent22/joplin/issues/4827">#4827</a> by Kenichi Kobayashi)</li>
+<li>Improved: Improved error message when a file cannot be uploaded or downloaded (567ba06)</li>
+<li>Improved: Make code blocks horizontally scrollable on note viewer (<a href="https://github.com/laurent22/joplin/issues/5740">#5740</a>)</li>
+<li>Improved: Plugins: Allow posting messages from plugin to webview (<a href="https://github.com/laurent22/joplin/issues/5569">#5569</a> by <a href="https://github.com/agerardin">@agerardin</a>)</li>
+<li>Fixed: Currently opened note is not updated after sync (5582) (<a href="https://github.com/laurent22/joplin/issues/5711">#5711</a>) (<a href="https://github.com/laurent22/joplin/issues/5582">#5582</a> by Kenichi Kobayashi)</li>
+<li>Fixed: Fixed button to upgrade a master key (725c79d)</li>
+<li>Fixed: Fixed issue that could cause application to needlessly lock the sync target (0de6e9e)</li>
+<li>Fixed: Fixed issue with parts of HTML notes not being displayed in some cases (<a href="https://github.com/laurent22/joplin/issues/5687">#5687</a>)</li>
+<li>Fixed: Long resource filenames were being incorrectly cut (<a href="https://github.com/laurent22/joplin/issues/5653">#5653</a>)</li>
+<li>Fixed: Message in search box dialog was not readable in dark mode (<a href="https://github.com/laurent22/joplin/issues/5666">#5666</a>)</li>
+<li>Fixed: OneDrive login screen was not readable in dark mode (<a href="https://github.com/laurent22/joplin/issues/5726">#5726</a>)</li>
+<li>Fixed: Plugin secure settings would be lost if keychain is not enabled (<a href="https://github.com/laurent22/joplin/issues/5720">#5720</a>)</li>
+<li>Fixed: Sharing multiple notebooks via Joplin Server with the same user results in an error (<a href="https://github.com/laurent22/joplin/issues/5721">#5721</a>)</li>
+<li>Fixed: Text was unreadable in dark mode when dropping a note on Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5710">#5710</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.12">v2.5.12</a> - 2021-11-08T11:07:11Z<a name="v2-5-12-https-github-com-laurent22-joplin-releases-tag-v2-5-12-2021-11-08t11-07-11z" href="#v2-5-12-https-github-com-laurent22-joplin-releases-tag-v2-5-12-2021-11-08t11-07-11z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed regression: Long resource filenames were being incorrectly cut when exporting as Markdown (<a href="https://github.com/laurent22/joplin/issues/5653">#5653</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.10">v2.5.10</a> - 2021-11-01T08:22:42Z<a name="v2-5-10-https-github-com-laurent22-joplin-releases-tag-v2-5-10-2021-11-01t08-22-42z" href="#v2-5-10-https-github-com-laurent22-joplin-releases-tag-v2-5-10-2021-11-01t08-22-42z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed crash on certain Linux distributions when importing or exporting a file (6012783)</li>
+<li>Fixed: Fixed potential infinite loop when Joplin Server session is invalid (c5569ef)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.8">v2.5.8</a> - 2021-10-31T11:38:03Z<a name="v2-5-8-https-github-com-laurent22-joplin-releases-tag-v2-5-8-2021-10-31t11-38-03z" href="#v2-5-8-https-github-com-laurent22-joplin-releases-tag-v2-5-8-2021-10-31t11-38-03z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Enable safe mode for Markdown editor too (<a href="https://github.com/laurent22/joplin/issues/5593">#5593</a>)</li>
+<li>Fixed: Do not render very large code blocks to prevent app from freezing (<a href="https://github.com/laurent22/joplin/issues/5593">#5593</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.7">v2.5.7</a> (Pre-release) - 2021-10-29T14:47:33Z<a name="v2-5-7-https-github-com-laurent22-joplin-releases-tag-v2-5-7-pre-release-2021-10-29t14-47-33z" href="#v2-5-7-https-github-com-laurent22-joplin-releases-tag-v2-5-7-pre-release-2021-10-29t14-47-33z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Upgrade to Electron 15.1.3 (9704b29)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.6">v2.5.6</a> (Pre-release) - 2021-10-28T22:03:09Z<a name="v2-5-6-https-github-com-laurent22-joplin-releases-tag-v2-5-6-pre-release-2021-10-28t22-03-09z" href="#v2-5-6-https-github-com-laurent22-joplin-releases-tag-v2-5-6-pre-release-2021-10-28t22-03-09z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added mechanism to migrate default settings to new values (72db8e4)</li>
+<li>Improved: Improved Joplin Server configuration check to better handle disabled accounts (72c1235)</li>
+<li>Improved: Improved handling of expired sessions when using Joplin Server (ace1118)</li>
+<li>Improved: Improved master password state handling in Encryption screen (7d62df8)</li>
+<li>Fixed: Fixed Goto Anything scrolling for long lists (22e5c3a)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.4">v2.5.4</a> (Pre-release) - 2021-10-19T10:10:54Z<a name="v2-5-4-https-github-com-laurent22-joplin-releases-tag-v2-5-4-pre-release-2021-10-19t10-10-54z" href="#v2-5-4-https-github-com-laurent22-joplin-releases-tag-v2-5-4-pre-release-2021-10-19t10-10-54z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for public-private key pairs and improved master password support (<a href="https://github.com/laurent22/joplin/issues/5438">#5438</a>)</li>
@@ -3630,7 +3684,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/changelog_android/index.html
+++ b/docs/changelog_android/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Android app changelog | Joplin</title>

 		<script
@@ -291,6 +294,41 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Android app changelog<a name="joplin-android-app-changelog" href="#joplin-android-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.6.3">android-v2.6.3</a> (Pre-release) - 2021-11-21T16:59:46Z<a name="android-v2-6-3-https-github-com-laurent22-joplin-releases-tag-android-v2-6-3-pre-release-2021-11-21t16-59-46z" href="#android-v2-6-3-https-github-com-laurent22-joplin-releases-tag-android-v2-6-3-pre-release-2021-11-21t16-59-46z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add date format YYYY/MM/DD (#5759 by Helmut K. C. Tessarek)</li>
+<li>New: Add support for faster built-in sync locks (#5662)</li>
+<li>New: Add support for sharing notes when E2EE is enabled (#5529)</li>
+<li>New: Added support for notebook icons (e97bb78)</li>
+<li>Improved: Improved error message when synchronising with Joplin Server (#5754)</li>
+<li>Improved: Makes it impossible to have multiple instances of the app open (#5587 by Filip Stanis)</li>
+<li>Improved: Remove non-OSS dependencies (#5735 by <a href="https://github.com/muelli">@muelli</a>)</li>
+<li>Fixed: Fixed issue that could cause application to needlessly lock the sync target (0de6e9e)</li>
+<li>Fixed: Fixed issue with parts of HTML notes not being displayed in some cases (#5687)</li>
+<li>Fixed: Sharing multiple notebooks via Joplin Server with the same user results in an error (#5721)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.6.1">android-v2.6.1</a> (Pre-release) - 2021-11-02T20:49:53Z<a name="android-v2-6-1-https-github-com-laurent22-joplin-releases-tag-android-v2-6-1-pre-release-2021-11-02t20-49-53z" href="#android-v2-6-1-https-github-com-laurent22-joplin-releases-tag-android-v2-6-1-pre-release-2021-11-02t20-49-53z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Upgraded React Native from 0.64 to 0.66 (66e79cc)</li>
+<li>Fixed: Fixed potential infinite loop when Joplin Server session is invalid (c5569ef)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.5.5">android-v2.5.5</a> (Pre-release) - 2021-10-31T11:03:16Z<a name="android-v2-5-5-https-github-com-laurent22-joplin-releases-tag-android-v2-5-5-pre-release-2021-10-31t11-03-16z" href="#android-v2-5-5-https-github-com-laurent22-joplin-releases-tag-android-v2-5-5-pre-release-2021-10-31t11-03-16z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add padding around beta text editor (365e152)</li>
+<li>Improved: Capitalise first word of sentence in beta editor (4128be9)</li>
+<li>Fixed: Do not render very large code blocks to prevent app from freezing (#5593)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.5.3">android-v2.5.3</a> (Pre-release) - 2021-10-28T21:47:18Z<a name="android-v2-5-3-https-github-com-laurent22-joplin-releases-tag-android-v2-5-3-pre-release-2021-10-28t21-47-18z" href="#android-v2-5-3-https-github-com-laurent22-joplin-releases-tag-android-v2-5-3-pre-release-2021-10-28t21-47-18z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for public-private key pairs and improved master password support (#5438)</li>
+<li>New: Added mechanism to migrate default settings to new values (72db8e4)</li>
+<li>Improved: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens (ccf9882)</li>
+<li>Improved: Improve delete dialog message (#5481) (#4701 by Helmut K. C. Tessarek)</li>
+<li>Improved: Improved Joplin Server configuration check to better handle disabled accounts (72c1235)</li>
+<li>Improved: Improved handling of expired sessions when using Joplin Server (33249ca)</li>
+<li>Fixed: Certain attachments were not being automatically deleted (#932)</li>
+<li>Fixed: Fixed logic of setting master password in Encryption screen (#5585)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.4.3">android-v2.4.3</a> - 2021-09-29T18:47:24Z<a name="android-v2-4-3-https-github-com-laurent22-joplin-releases-tag-android-v2-4-3-2021-09-29t18-47-24z" href="#android-v2-4-3-https-github-com-laurent22-joplin-releases-tag-android-v2-4-3-2021-09-29t18-47-24z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fix default sync target (4b39d30)</li>
@@ -430,7 +468,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/changelog_cli/index.html
+++ b/docs/changelog_cli/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin terminal app changelog | Joplin</title>

 		<script
@@ -291,6 +294,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin terminal app changelog<a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.6.1">cli-v2.6.1</a> - 2021-11-03T11:33:18Z<a name="cli-v2-6-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-6-1-2021-11-03t11-33-18z" href="#cli-v2-6-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-6-1-2021-11-03t11-33-18z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for public-private key pairs and improved master password support (#5438)</li>
+<li>New: Added mechanism to migrate default settings to new values (72db8e4)</li>
+<li>Improved: Add Markdown + Front Matter exporter/importer (#5465) (#5224 by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens (ccf9882)</li>
+<li>Improved: Improved Joplin Server configuration check to better handle disabled accounts (72c1235)</li>
+<li>Improved: Improved handling of expired sessions when using Joplin Server (33249ca) (ace1118)</li>
+<li>Fixed: Certain attachments were not being automatically deleted (#932)</li>
+<li>Fixed: Fix default sync target (4b39d30)</li>
+<li>Fixed: Fixed potential infinite loop when Joplin Server session is invalid (c5569ef)</li>
+<li>Fixed: Fixed running out of memory when importing large ENEX files (#5543)</li>
+<li>Fixed: Ignore newline between quotes while spliting batch (#5540) (#5341 by Kingsley Yung)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.4.1">cli-v2.4.1</a> - 2021-09-29T15:28:01Z<a name="cli-v2-4-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-4-1-2021-09-29t15-28-01z" href="#cli-v2-4-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-4-1-2021-09-29t15-28-01z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add a way to disable a master key (7faa58e)</li>
@@ -681,7 +698,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/changelog_server/index.html
+++ b/docs/changelog_server/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Server Changelog | Joplin</title>

 		<script
@@ -291,6 +294,70 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.12">server-v2.6.12</a> - 2021-11-23T16:30:27Z<a name="server-v2-6-12-https-github-com-laurent22-joplin-releases-tag-server-v2-6-12-2021-11-23t16-30-27z" href="#server-v2-6-12-https-github-com-laurent22-joplin-releases-tag-server-v2-6-12-2021-11-23t16-30-27z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added task to compress changes older than 6 months (75f7296)</li>
+<li>Improved: Allow specifying a max content size when importing content to new storage (080c3cc)</li>
+<li>Improved: Check for time drift when the server starts (#5738)</li>
+<li>Improved: Display more debug info in error log (3716972)</li>
+<li>Improved: Display more detailed error messages on SQL query errors (42a4edb)</li>
+<li>Improved: Perform storage checks before starting services (16d5047)</li>
+<li>Fixed: Fixed HandleOversizedAccounts task interval (fc419d9)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.11">server-v2.6.11</a> - 2021-11-14T17:14:51Z<a name="server-v2-6-11-https-github-com-laurent22-joplin-releases-tag-server-v2-6-11-2021-11-14t17-14-51z" href="#server-v2-6-11-https-github-com-laurent22-joplin-releases-tag-server-v2-6-11-2021-11-14t17-14-51z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Prevent large data blobs from crashing the application (5eb3a92)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.10">server-v2.6.10</a> - 2021-11-13T12:47:53Z<a name="server-v2-6-10-https-github-com-laurent22-joplin-releases-tag-server-v2-6-10-2021-11-13t12-47-53z" href="#server-v2-6-10-https-github-com-laurent22-joplin-releases-tag-server-v2-6-10-2021-11-13t12-47-53z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improved storage migration error handling, and improved storage test units (5a41d80)</li>
+<li>Improved: Rename &quot;ReadOnly&quot; mode to &quot;ReadAndClear&quot; to avoid any confusion (5cd4537)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.9">server-v2.6.9</a> - 2021-11-11T16:38:00Z<a name="server-v2-6-9-https-github-com-laurent22-joplin-releases-tag-server-v2-6-9-2021-11-11t16-38-00z" href="#server-v2-6-9-https-github-com-laurent22-joplin-releases-tag-server-v2-6-9-2021-11-11t16-38-00z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Hide more credentials from the log (73137cf)</li>
+<li>New: Added command to test a storage connection (c6dec0a)</li>
+<li>New: Added command to migrate content to different storage (005f720)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.5">server-v2.6.5</a> - 2021-11-10T12:07:50Z<a name="server-v2-6-5-https-github-com-laurent22-joplin-releases-tag-server-v2-6-5-2021-11-10t12-07-50z" href="#server-v2-6-5-https-github-com-laurent22-joplin-releases-tag-server-v2-6-5-2021-11-10t12-07-50z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow storing item content in database, filesystem or S3 (depending on config) (#5602)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.3">server-v2.6.3</a> - 2021-11-08T15:20:41Z<a name="server-v2-6-3-https-github-com-laurent22-joplin-releases-tag-server-v2-6-3-2021-11-08t15-20-41z" href="#server-v2-6-3-https-github-com-laurent22-joplin-releases-tag-server-v2-6-3-2021-11-08t15-20-41z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for sharing notes when E2EE is enabled (#5529)</li>
+<li>Improved: Disable mailer service if no-reply email is not set (ce5c5d6)</li>
+<li>Improved: Display latest migration name after auto-migration (7ad73df)</li>
+<li>Improved: Immediately ask user to set password after Stripe checkout (9e1cb9d)</li>
+<li>Improved: Set resource content size when viewing published note (70d5c7a)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.6.2">server-v2.6.2</a> - 2021-11-03T12:54:38Z<a name="server-v2-6-2-https-github-com-laurent22-joplin-releases-tag-server-v2-6-2-2021-11-03t12-54-38z" href="#server-v2-6-2-https-github-com-laurent22-joplin-releases-tag-server-v2-6-2-2021-11-03t12-54-38z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for faster built-in sync locks (#5662)</li>
+<li>Improved: Improved env variable handling to make it self documenting and enforce type checking (b5d792c)</li>
+<li>Improved: Improved logging and rendering of low level middleware errors (3704413)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.10">server-v2.5.10</a> - 2021-11-02T14:45:54Z<a name="server-v2-5-10-https-github-com-laurent22-joplin-releases-tag-server-v2-5-10-2021-11-02t14-45-54z" href="#server-v2-5-10-https-github-com-laurent22-joplin-releases-tag-server-v2-5-10-2021-11-02t14-45-54z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add unique constraint on name and owner ID of items table (f7a18ba)</li>
+<li>Fixed: Fixed issue that could cause server to return empty items in some rare cases (99ea4b7)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.9">server-v2.5.9</a> - 2021-10-28T19:43:41Z<a name="server-v2-5-9-https-github-com-laurent22-joplin-releases-tag-server-v2-5-9-2021-10-28t19-43-41z" href="#server-v2-5-9-https-github-com-laurent22-joplin-releases-tag-server-v2-5-9-2021-10-28t19-43-41z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Remove session expiration for now (4a2af32)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.8">server-v2.5.8</a> - 2021-10-28T16:07:23Z<a name="server-v2-5-8-https-github-com-laurent22-joplin-releases-tag-server-v2-5-8-2021-10-28t16-07-23z" href="#server-v2-5-8-https-github-com-laurent22-joplin-releases-tag-server-v2-5-8-2021-10-28t16-07-23z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added item owner ID, and allow disabling db auto-migrations (b655f27)</li>
+<li>Fixed: Fixed Stripe portal page redirection (9ba90b5)</li>
+<li>Fixed: Fixed items.owner_id migration (a753429)</li>
+<li>Fixed: Fixed display of latest migration in startup log (#5627 by <a href="https://github.com/KowalskiPiotr98">@KowalskiPiotr98</a>)</li>
+<li>Improved: Moved CLI commands to separate files (dca13b3)</li>
+<li>Improved: Delete all sessions when a password is changed or reset (b497177)</li>
+<li>Improved: Expire sessions after 12 hours (0ada1df)</li>
+<li>Improved: Improved task service log entries (bc5a853)</li>
+<li>Improved: Run oversized account task more frequently (2f09f88)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.5">server-v2.5.5</a> - 2021-10-23T20:58:37Z<a name="server-v2-5-5-https-github-com-laurent22-joplin-releases-tag-server-v2-5-5-2021-10-23t20-58-37z" href="#server-v2-5-5-https-github-com-laurent22-joplin-releases-tag-server-v2-5-5-2021-10-23t20-58-37z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Added tool to delete old changes (169b585)</li>
@@ -626,7 +693,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/clipper/index.html
+++ b/docs/clipper/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Web Clipper | Joplin</title>

 		<script
@@ -314,7 +317,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <h2>In Firefox<a name="in-firefox" href="#in-firefox" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Open <a href="about:debugging">about:debugging</a> in Firefox.</li>
-<li>Make sure the checkox &quot;Enable add-on debugging&quot; is ticked.</li>
+<li>Make sure the checkbox &quot;Enable add-on debugging&quot; is ticked.</li>
 <li>Scroll down to the Joplin Web Clipper extension.</li>
 <li>Click on &quot;Debugging&quot; - that should open a new console window.</li>
 </ul>
@@ -363,7 +366,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/config_screen/index.html
+++ b/docs/config_screen/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Configuration screen | Joplin</title>

 		<script
@@ -303,7 +306,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md
 <h2>Mobile application<a name="mobile-application" href="#mobile-application" class="heading-anchor">🔗</a></h2>
 <p>Tap on the <strong>burger icon ≡</strong> in the top left corner, and select <strong>Configuration</strong>.</p>
 <h2>CLI<a name="cli" href="#cli" class="heading-anchor">🔗</a></h2>
-<p>Type <code>:help config</code> for information on how to set config values nad for the complete list of available options.</p>
+<p>Type <code>:help config</code> for information on how to set config values and for the complete list of available options.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md">
@@ -344,7 +347,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/conflict/index.html
+++ b/docs/conflict/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>What is a conflict? | Joplin</title>

 		<script
@@ -339,7 +342,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/css/site.css
+++ b/docs/css/site.css
@@ -188,6 +188,11 @@ h2 {
 	padding-bottom: 0.5em;
 }

+h3 {
+	font-size: 1.3em;
+	margin-bottom: 0.8rem;
+}
+
 .front-page h1 {
 	font-size: 3em;
 }
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>How to enable debugging | Joplin</title>

 		<script
@@ -387,7 +390,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/desktop/index.html
+++ b/docs/desktop/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Desktop application | Joplin</title>

 		<script
@@ -333,7 +336,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/donate/index.html
+++ b/docs/donate/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Support Joplin development | Joplin</title>

 		<script
@@ -300,7 +303,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 </thead>
 <tbody>
 <tr>
-<td>Paypal</td>
+<td>PayPal</td>
 <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="/images/badges/Donate-PayPal-green.svg" alt="Donate on PayPal"></a></td>
 </tr>
 <tr>
@@ -373,7 +376,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/download/index.html
+++ b/docs/download/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Downloading Joplin... | Joplin</title>

 		<script
@@ -134,7 +137,7 @@ Your download of <span class="downloaded-filename">Joplin</span> is in progress.
 <div class="get-it-desktop">
 <h2>Joplin App for Desktop<a name="joplin-app-for-desktop" href="#joplin-app-for-desktop" class="heading-anchor">🔗</a></h2>
 <p>Access your notes on Windows, macOS or Linux.</p>
-<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-Setup-2.4.12.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
+<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-Setup-2.5.12.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
 </div>
 <h2>Joplin App for Mobile<a name="joplin-app-for-mobile" href="#joplin-app-for-mobile" class="heading-anchor">🔗</a></h2>
 <p>Access your notes on your phone or tablet from the Android and iOS apps.</p>
@@ -181,7 +184,7 @@ Your download of <span class="downloaded-filename">Joplin</span> is in progress.
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/e2ee/index.html
+++ b/docs/e2ee/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>About End-To-End Encryption (E2EE) | Joplin</title>

 		<script
@@ -351,7 +354,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/external_links/index.html
+++ b/docs/external_links/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/external_links.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/external_links.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/external_links.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>External URL links | Joplin</title>

 		<script
@@ -341,7 +344,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/external_links.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>FAQ | Joplin</title>

 		<script
@@ -337,6 +340,11 @@ notepad++.exe --openSession   # Opens Notepad ++ in new window
 <li>Synchronise to verify that everything is working.</li>
 <li>Do step 5 and 6 for all the other Joplin clients you need to sync.</li>
 </ol>
+<h2>I deleted some notes by accident and don't have a backup<a name="i-deleted-some-notes-by-accident-and-don-t-have-a-backup" href="#i-deleted-some-notes-by-accident-and-don-t-have-a-backup" class="heading-anchor">🔗</a></h2>
+<p>If you know the <code>NOTE_ID</code> and have note history enabled you can run the command <code>restoreNoteRevision</code> from the command palette e.g. <code>restoreNoteRevision 66457326a6ba4adeb4be8ce05e37af0d</code>. Joplin will then confirm if the restore was successful and place the note in a &quot;Restored Note&quot; notebook.<br>
+If you do not know the <code>NOTE_ID</code> then you can find this within the Joplin sqlite database as the <code>item_id</code> within the <code>deleted_items</code> or <code>revisions</code> tables. It will require some manual checking of the <code>title_diff</code> and <code>body_diff</code> fields to check if the <code>ITEM/NOTE_ID</code> you are targeting is the correct one.<br>
+You should first take a copy of the database to avoid making any accidental changes in the live one.<br>
+For further information go <a href="https://discourse.joplinapp.org/t/restoring-deleted-notes/21304">here</a>.</p>
 <h2>How can I easily enter Markdown tags in Android?<a name="how-can-i-easily-enter-markdown-tags-in-android" href="#how-can-i-easily-enter-markdown-tags-in-android" class="heading-anchor">🔗</a></h2>
 <p>You may use a special keyboard such as <a href="https://play.google.com/store/apps/details?id=kl.ime.oh&amp;hl=en">Multiling O Keyboard</a>, which has shortcuts to create Markdown tags. <a href="https://discourse.joplinapp.org/t/android-create-new-list-item-with-enter/585/2?u=laurent">More information in this post</a>.</p>
 <h2>The initial sync is very slow, how can I speed it up?<a name="the-initial-sync-is-very-slow-how-can-i-speed-it-up" href="#the-initial-sync-is-very-slow-how-can-i-speed-it-up" class="heading-anchor">🔗</a></h2>
@@ -429,7 +437,7 @@ on this server.&lt;/p&gt;
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/faq_joplin_cloud/index.html
+++ b/docs/faq_joplin_cloud/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>FAQ | Joplin</title>

 		<script
@@ -350,7 +353,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2020/ideas/index.html
+++ b/docs/gsoc2020/ideas/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>GSoC 2020 Ideas | Joplin</title>

 		<script
@@ -436,7 +439,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2020/index/index.html
+++ b/docs/gsoc2020/index/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Google Summer of Code 2020 | Joplin</title>

 		<script
@@ -435,7 +438,7 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2021/ideas/index.html
+++ b/docs/gsoc2021/ideas/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>GSoC 2021 Ideas | Joplin</title>

 		<script
@@ -396,7 +399,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2021/index/index.html
+++ b/docs/gsoc2021/index/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Google Summer of Code 2021 | Joplin</title>

 		<script
@@ -451,7 +454,7 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2021/pull_request_guidelines/index.html
+++ b/docs/gsoc2021/pull_request_guidelines/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Pull request guidelines | Joplin</title>

 		<script
@@ -359,7 +362,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsoc2022/ideas/index.html
+++ b/docs/gsoc2022/ideas/index.html
@@ -0,0 +1,388 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/gsoc2022/ideas.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/gsoc2022/ideas.md
+
+-->
+
+	<head>
+<!-- Donate button A/B testing -->
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
+			charset="utf-8"
+			http-equiv="X-UA-Compatible"
+			content="IE=edge,chrome=1"
+		/>
+		<link rel="icon" href="&#x2F;images/favicon.png" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<meta name="theme-color" content="#000000" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
+		<link
+			rel="stylesheet"
+			href="&#x2F;css/bootstrap5.0.2.min.css"
+			as="style"
+		/>
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
+		<link
+			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
+			rel="stylesheet"
+			as="style"
+			media="all"
+			onload="this.media='all'; this.onload = null"
+		/>
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
+		<title>GSoC 2022 Ideas | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
+	</head>
+	<body class="website-env-prod">
+		<div class="container-fluid generic-template -page" id="main-container">
+
+<div class=" navbar-main white-bg" id="nav-section">
+	<div class="container">
+		<div class="row">
+			<div class="col-3">
+				<a href="/">
+					<img
+						src="&#x2F;images/logo-text-blue.svg"
+						alt=""
+						id="top-logo"
+						width="180"
+					/>
+				</a>
+			</div>
+			<div class="col-9 text-right d-none d-md-block">
+				<a href="/help/" class="fw500">Help</a>
+				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>			</div>
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
+				<span class="pointer"
+					><img
+						src="&#x2F;images/mobile-menu-black-open-icon.png"
+						id="open-menu-mobile"
+						alt=""
+				/></span>
+				&nbsp;&nbsp;
+
+				<div id="menu-mobile">
+					<div>
+						<div class="text-right">
+							<img
+								src="&#x2F;images/close-icon.png"
+								alt=""
+								class="pointer"
+								id="close-menu-mobile"
+							/>
+						</div>
+
+						<div class="text-center menu-mobile-top">
+							<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500 mobile-menu-link">Forum</a>
+							<a href="/help/" class="fw500 mobile-menu-link">Help</a>
+						</div>
+
+						<div class="menu-mobile-buttons">
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>						</div>
+					</div>
+
+						<div id="toc-mobile"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+					
+					<div>
+						<p class="light-blue mobile-menu-link-bottom text-center">
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
+							<br/>
+							<a href="/privacy/" class="fw500">Privacy Policy</a>
+						</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+			<div class="help-page-container page-ideas">
+				<div class="container">
+					<div class="row content-wrapper">
+						<div id="toc"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+
+						<div class="main-content">
+							<div class="alert alert-danger alert-env-dev" role="alert">
+								Running in prod mode!
+							</div>
+							<div class="donate-links">
+<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
+</div>
+<h1>GSoC 2022 Ideas<a name="gsoc-2022-ideas" href="#gsoc-2022-ideas" class="heading-anchor">🔗</a></h1>
+<p>2022 is Joplin second round at Google Summer of Code. Detailed information on how to get involved and apply are given in the <a href="https://joplinapp.org/gsoc2022/index/">general Summer of Code introduction</a></p>
+<p><strong>These are all proposals! We are open to new ideas you might have!!</strong> Do you have an awesome idea you want to work on with Joplin but that is not among the ideas below? That's cool. We love that! But please do us a favour: Get in touch with a mentor early on and make sure your project is realistic and within the scope of Joplin. Just make sure your idea is within this year's theme:</p>
+<ul>
+<li><strong>Plugin development</strong> - implementing new features using Joplin's plugin system.</li>
+<li><strong>External desktop applications</strong> - build external Joplin applications by retrieving, creating or modifying notes via the Data API.</li>
+<li><strong>External server applications</strong> - leverage the Joplin Server API to provide online features to Joplin users.</li>
+</ul>
+<h1>Information for Students<a name="information-for-students" href="#information-for-students" class="heading-anchor">🔗</a></h1>
+<p>These ideas were contributed by our developers and users. They are sometimes vague or incomplete. If you wish to submit a proposal based on these ideas, you are urged to contact the developers and find out more about the particular suggestion you're looking at.</p>
+<p>Becoming accepted as a Google Summer of Code student is quite competitive. Accepted students typically have thoroughly researched the technologies of their proposed project and have been in frequent contact with potential mentors. <strong>Simply copying and pasting an idea here will not work.</strong> On the other hand, creating a completely new idea without first consulting potential mentors rarely works.</p>
+<h1>List of ideas<a name="list-of-ideas" href="#list-of-ideas" class="heading-anchor">🔗</a></h1>
+<h2>1. Plugin system on mobile<a name="1-plugin-system-on-mobile" href="#1-plugin-system-on-mobile" class="heading-anchor">🔗</a></h2>
+<p>The plugin system is currently available on desktop and CLI. We believe it could work on mobile too although some work will have to be done to make the plugin API compatible, as well as add a mechanism to load plugins.</p>
+<p>Expected Outcome: Allow loading and running plugins on mobile</p>
+<p>Difficulty Level: High</p>
+<p>Skills Required: TypeScript, React Native</p>
+<p>Potential Mentor(s): <a href="https://discourse.joplinapp.org/u/PackElend">PackElend</a>, <a href="https://discourse.joplinapp.org/u/roman_r_m">roman_r_m</a>, <a href="https://github.com/laurent22/">laurent22</a></p>
+<h2>2. Seamless desktop application updates<a name="2-seamless-desktop-application-updates" href="#2-seamless-desktop-application-updates" class="heading-anchor">🔗</a></h2>
+<p>The desktop application currently supports automatic updates, however the process is not particularly smooth: the user is presented with a modal dialog, where they need to click &quot;Download&quot; and that opens the default browser to download the file. Then they need to run this file and go through the installer.</p>
+<p>We would like to make this process smoother:</p>
+<ul>
+<li>The installer should be automatically downloaded in the background</li>
+<li>It should then install the app automatically when the next time the app is started</li>
+<li>And this should work at least on Windows and macOS (Linux may be special due to the different distribution methods)</li>
+</ul>
+<p>Difficulty Level: Medium</p>
+<p>Skills Required: TypeScript, React. Some knowledge of Electron and electron-builder.</p>
+<h2>3. Refactor the project documentation<a name="3-refactor-the-project-documentation" href="#3-refactor-the-project-documentation" class="heading-anchor">🔗</a></h2>
+<p>The current documentation (under <a href="https://joplinapp.org/help">joplinapp.org/help</a>) is mainly a giant <a href="http://README.md">README.md</a> file and various smaller Markdown files under /readme. All this is then built into the HTML website by a script.</p>
+<p>We would like to improve this by splitting the main readme into smaller sections, have a new menu that would reorganise the help into various topics, and of course the build script will need to be updated.</p>
+<p>A good part of this project will be about researching how other projects organise their documentation, proposing a way that would work well for Joplin, and discussing your ideas with the mentors and users. This is still a technical project though since you will need to deal with TypeScript, Markdown, HTML and CSS (and any other technology that might help) to build the new documentation.</p>
+<p>Difficulty Level: High</p>
+<p>Skills Required: TypeScript, JavaScript, CSS, HTML, Markdown rendering.</p>
+<h1>More info<a name="more-info" href="#more-info" class="heading-anchor">🔗</a></h1>
+<ul>
+<li>Make sure you read the <a href="https://joplinapp.org/gsoc2022/index/">Joplin Google Summer of Code Introduction</a></li>
+<li>To build the application, please read <a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">BUILD.md</a></li>
+<li>And before creating a pull request, please read the <a href="https://joplinapp.org/gsoc2022/pull_request_guidelines/">pull request guidelines</a></li>
+</ul>
+
+								<div class="bottom-links">
+									<a href="https://github.com/laurent22/joplin/blob/dev/readme/gsoc2022/ideas.md">
+										<i class="fab fa-github"></i> Improve this doc
+									</a>
+								</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			
+<footer class="darkblue-bg">
+	<div class="container">
+		<div class="row">
+			<div class="col-12 col-md-12 social-links">
+				<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed"><i class="fab fa-twitter"></i></a>
+				<a href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
+				<a href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
+				<a href="https://discordapp.com/invite/d2HMPwE" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
+				<a href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
+				<a href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
+			</div>
+		</div>
+
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
+			</div>
+			<div class="col-12 col-md-6">
+				<p class="text-right text-center-sm right-links">
+					<span class="footer-right">
+						<a href="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>
+
+<script>
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
+</script>	</body>
+</html>
--- a/docs/gsod2020/ideas/index.html
+++ b/docs/gsod2020/ideas/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,8 +40,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
-		<title>1.Idea - Create documenation hub | Joplin</title>
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
+		<title>1.Idea - Create documentation hub | Joplin</title>

 		<script
 			src="&#x2F;js/jquery-3.6.0.min.js"
@@ -290,7 +293,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 							<div class="donate-links">
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
-<h1>1.Idea - Create documenation hub<a name="1-idea-create-documenation-hub" href="#1-idea-create-documenation-hub" class="heading-anchor">🔗</a></h1>
+<h1>1.Idea - Create documentation hub<a name="1-idea-create-documentation-hub" href="#1-idea-create-documentation-hub" class="heading-anchor">🔗</a></h1>
 <ul>
 <li>Make a screening of available options of how apps to be utilized to organize documentation better and simplified access to information.<br>
 You can start with:
@@ -361,7 +364,7 @@ Task is to find a toolset to structure them and make the knowledge buried in the
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/gsod2020/index/index.html
+++ b/docs/gsod2020/index/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Google Season of Doc 2020 | Joplin</title>

 		<script
@@ -293,19 +296,19 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 <h1>Google Season of Doc 2020<a name="google-season-of-doc-2020" href="#google-season-of-doc-2020" class="heading-anchor">🔗</a></h1>
 <p>Joplin has a young but well proven history. It all started by single idea but is rising more and more commitment as well as demands.</p>
 <p>Joplin is about to make another big step to answers these demands by being an organization at Google Summer of Code 2020.<br>
-During the young history of the GSoC campaign it was noticed that it would be a greate help if documenation is centralized and making it a continuous read.  The current documentation tells when to do what and how clearly. In addition, the source code of Joplin is clean and well strucutred, so it is easy to understand.<br>
-Nevertheless, there are additional and essential information scattered around on the Forum and GitHub which rely on an active community, so that are being shared with them who need them. It can be said that this happens very well but it is aggreed that this situation has to be improved to free resources for working on the source coden and lower entry barriers for new contributors.</p>
+During the young history of the GSoC campaign it was noticed that it would be a great help if documentation is centralized and making it a continuous read.  The current documentation tells when to do what and how clearly. In addition, the source code of Joplin is clean and well structured, so it is easy to understand.<br>
+Nevertheless, there are additional and essential information scattered around on the Forum and GitHub which rely on an active community, so that are being shared with them who need them. It can be said that this happens very well but it is agreed that this situation has to be improved to free resources for working on the source code and lower entry barriers for new contributors.</p>
 <p>For these reasons, all students and Joplin users and developers are welcome to participate in the hopefully first year Summer of Docs program with Joplin. Here's how.</p>
 <p>Mentors, administrators and students: read <a href="https://developers.google.com/season-of-docs">Season of Docs</a> occasionally. Also read the <a href="https://developers.google.com/season-of-docs/docs/faq">Season of Docs FAQ</a>.<br>
-<strong>Most IMPORTANT, read this page carefully, line by line. We don't want to quote pharagraphs from this page answering question in the forum.<br>
-Moreover, watch/subscribe the topic <a href="https://discourse.joplinapp.org/t/gsoc-2020-live-blog/6219">GSoC 2020 live blog</a> as this page here contains rather static content whereas the mentioned topic is updated much more freuqently.</strong></p>
+<strong>Most IMPORTANT, read this page carefully, line by line. We don't want to quote paragraphs from this page answering question in the forum.<br>
+Moreover, watch/subscribe the topic <a href="https://discourse.joplinapp.org/t/gsoc-2020-live-blog/6219">GSoC 2020 live blog</a> as this page here contains rather static content whereas the mentioned topic is updated much more frequently.</strong></p>
 <p>All participants will need a Google account in order to join the program. So, save time and create one now. In addition, all participants need to join the  <a href="https://discourse.joplinapp.org">Joplin Forum</a>.</p>
 <hr>
 <h1>Instructions for students<a name="instructions-for-students" href="#instructions-for-students" class="heading-anchor">🔗</a></h1>
-<p>Students wishing to participate in Season of Docs must realize, that this is a important professional opportunity. You will be required to produce applicable and readable documenation for Joplin in 3 months. Your mentors, will dedicate a portion of their time to mentoring you. Therefore, we seek candidates who are committed to helping Joplin and its community long-term and are willing to both do quality work, and be proactive in communicating with your mentor(s).</p>
-<p>You don't have to be a proven technical writter - in fact, this whole program is meant to facilitate to support Joplin and other Open Source communities by techinal writters. However, experience in technical writting and/or coding experience is welcome.</p>
+<p>Students wishing to participate in Season of Docs must realize, that this is a important professional opportunity. You will be required to produce applicable and readable documentation for Joplin in 3 months. Your mentors, will dedicate a portion of their time to mentoring you. Therefore, we seek candidates who are committed to helping Joplin and its community long-term and are willing to both do quality work, and be proactive in communicating with your mentor(s).</p>
+<p>You don't have to be a proven technical writer - in fact, this whole program is meant to facilitate to support Joplin and other Open Source communities by technical writers. However, experience in technical writing and/or coding experience is welcome.</p>
 <p>In general it can be said, that question shall be asked early and clearly, given everyone the possibility to understand why you want to have this question answered and how it helps to achieve the project's goal.</p>
-<p>Before you can be accepted as a student we expect you to communicate very activily with the community and contributors and summerize what could help them most and link that work on your proposal.<br>
+<p>Before you can be accepted as a student we expect you to communicate very actively with the community and contributors and summarize what could help them most and link that work on your proposal.<br>
 If your idea is related to codebase documentation it is welcome that you fix little bugs. You may browse the GitHub Issues to find some simple tasks. See the good first issues which are a good way to make yourself familiar with the code base.</p>
 <p>You should start learning the components that you plan on working on before the start date. Support can be found in the forum and on our dedicated discourse channel.</p>
 <p>Do not worry, the timeline from Google reserves a lot of time for bonding periods so use that time wisely. Good communication is key. To allow us to respond quickly tag your questions with <code>GSoC-2020</code>.</p>
@@ -314,7 +317,7 @@ If your idea is related to codebase documentation it is welcome that you fix lit
 <p>Students who neglect active communication will be failed!</p>
 <h2>General instructions<a name="general-instructions" href="#general-instructions" class="heading-anchor">🔗</a></h2>
 <p>First of all, please read the above referenced resources and the <a href="https://developers.google.com/open-source/gsoc/faq">GSoC FAQ</a>. Pay special attention to the <strong>Eligibility</strong> section of the FAQ.</p>
-<p>We stronly recomment to follow the recommented steps, see next section, closley. It is slightly differs from the steps given for the closed GSoC application period.<br>
+<p>We strongly recommend to follow the recommended steps, see next section, closely. It is slightly differs from the steps given for the closed GSoC application period.<br>
 The procedure reflects some of the lessons learnt in the GSOC 2020 campaign, so you may compare the recommended steps and scan the change history of the <a href="https://discourse.joplinapp.org/t/gsoc-2020-live-blog/6219">GSoC 2020 live blog</a>.</p>
 <h2>Recommended steps<a name="recommended-steps" href="#recommended-steps" class="heading-anchor">🔗</a></h2>
 <ol>
@@ -324,12 +327,12 @@ The procedure reflects some of the lessons learnt in the GSOC 2020 campaign, so
 <li>Come up with project that you're interested in and discuss it in <a href="https://discourse.joplinapp.org/c/features">Features category</a> if a corresponding does not already exist.</li>
 <li>Write a first draft and get someone to review it
 <ol>
-<li>Remember: you must link to work such as commits in your proposal. A private place will be created wihtinn the forum for that purposes.</li>
-<li>If you want to add functionality to the codebase or documenation, have it approved  <a href="https://discourse.joplinapp.org/c/features">Features category</a></li>
+<li>Remember: you must link to work such as commits in your proposal. A private place will be created within the forum for that purposes.</li>
+<li>If you want to add functionality to the codebase or documentation, have it approved  <a href="https://discourse.joplinapp.org/c/features">Features category</a></li>
 <li><strong>IMPORTANT</strong>: If you contribute to the codebase do only one contribution at a time and wait until it is approved.</li>
 </ol>
 </li>
-<li>Submit your proposal to the mentors writting a private message at <code>@mentors</code> in the <a href="https://discourse.joplinapp.org">Joplin Forum</a> and wait for their feedback</li>
+<li>Submit your proposal to the mentors writing a private message at <code>@mentors</code> in the <a href="https://discourse.joplinapp.org">Joplin Forum</a> and wait for their feedback</li>
 <li>Submit proposal using <a href="https://summerofcode.withgoogle.com/">Google's web interface</a> well ahead of the deadline. You can update it at anytime, even the final proposal.</li>
 <li>Submit proof of enrolment well ahead of the deadline</li>
 </ol>
@@ -421,7 +424,7 @@ The procedure reflects some of the lessons learnt in the GSOC 2020 campaign, so
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/help/index.html
+++ b/docs/help/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/README.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin - an open source note taking and to-do application with synchronisation capabilities</title>

 		<script
@@ -309,19 +312,19 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-Setup-2.4.12.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-Setup-2.5.12.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a></td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/Joplin-2.5.12.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a></td>
 </tr>
 </tbody>
 </table>
-<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
+<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.5.12/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
 <p><strong>On Linux</strong>, the recommended way is to use the following installation script as it will handle the desktop icon too:</p>
 <pre><code style="word-break: break-all">wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></pre>
 <h2>Mobile applications<a name="mobile-applications" href="#mobile-applications" class="heading-anchor">🔗</a></h2>
@@ -337,7 +340,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tr>
 <td>Android</td>
 <td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='/images/BadgeAndroid.png'/></a></td>
-<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3-32bit.apk">32-bit</a></td>
+<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.6.3/joplin-v2.6.3.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.6.3/joplin-v2.6.3-32bit.apk">32-bit</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -383,7 +386,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <p>The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. For more information on how to install and use it, see the <a href="/clipper/">Web Clipper Help Page</a>.</p>
 <h1>Sponsors<a name="sponsors" href="#sponsors" class="heading-anchor">🔗</a></h1>
 <!-- SPONSORS-ORG -->
-<p><a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a></p>
+<p><a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a></p>
 <!-- SPONSORS-ORG -->
 <hr>
 <!-- SPONSORS-GITHUB -->
@@ -536,14 +539,17 @@ Joplin is also capable of exporting to a number of other formats including HTML
 <p>When syncing with OneDrive, Joplin creates a sub-directory in OneDrive, in /Apps/Joplin and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.</p>
 <p>In the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;OneDrive&quot; as the synchronisation target in the <a href="/config_screen/">Configuration screen</a>. Then, to initiate the synchronisation process, click on the &quot;Synchronise&quot; button in the sidebar and follow the instructions.</p>
 <p>In the <strong>terminal application</strong>, to initiate the synchronisation process, type <code>:sync</code>. You will be asked to follow a link to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive).</p>
-<h2>AWS S3 synchronisation<a name="aws-s3-synchronisation" href="#aws-s3-synchronisation" class="heading-anchor">🔗</a></h2>
-<p>In the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;AWS S3 (Beta)&quot; as the synchronisation target in the <a href="/config_screen/">Configuration screen</a>.</p>
+<h2>S3 synchronisation<a name="s3-synchronisation" href="#s3-synchronisation" class="heading-anchor">🔗</a></h2>
+<p>As of Joplin 2.x.x, Joplin supports multiple S3 providers. We expose some options that will need to be configured depending on your provider of choice. We have tested with UpCloud, AWS, and Linode. others should work as well.</p>
+<p>In the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;S3 (Beta)&quot; as the synchronisation target in the <a href="/config_screen/">Configuration screen</a>.</p>
 <ul>
-<li><strong>AWS S3 Bucket:</strong> The name of your Bucket, such as <code>joplin-bucket</code></li>
-<li><strong>AWS S3 URL:</strong> Fully qualified URL; By default this should be <code>https://s3.amazonaws.com/</code></li>
-<li><strong>AWS key &amp; AWS secret:</strong>  IAM user's programmatic access key.  To create a new key &amp; secret, visit <a href="https://console.aws.amazon.com/iam/home#/security_credentials">IAM Security Credentials</a>.</li>
+<li><strong>S3 Bucket:</strong> The name of your Bucket, such as <code>joplin-bucket</code></li>
+<li><strong>S3 URL:</strong> Fully qualified URL; For AWS this should be <code>https://s3.amazonaws.com/</code></li>
+<li><strong>S3 Access Key &amp; S3 Secret Key:</strong>  The User's programmatic access key.  To create a new key &amp; secret on AWS, visit <a href="https://console.aws.amazon.com/iam/home#/security_credentials">IAM Security Credentials</a>. For other providers follow their documentation.</li>
+<li><strong>S3 Region:</strong> Some providers require you to provide the region of your bucket. This is usually in the form of &quot;eu-west1&quot; or something similar depending on your region. For providers that do not require a region, you can leave it blank.</li>
+<li><strong>Force Path Style</strong>: This setting enables Joplin to talk to S3 providers using an older style S3 Path. Depending on your provider you may need to try with this on and off.</li>
 </ul>
-<p>While creating a new Bucket for Joplin, disable <strong>Bucket Versioning</strong>, enable <strong>Block all public access</strong> and enable <strong>Default encryption</strong> with <code>Amazon S3 key (SSE-S3)</code>.</p>
+<p>While creating a new Bucket for Joplin, disable <strong>Bucket Versioning</strong>, enable <strong>Block all public access</strong> and enable <strong>Default encryption</strong> with <code>Amazon S3 key (SSE-S3)</code>. Some providers do not expose these options, and it could create a syncing problem. Do attempt and report back so we can update the documentation appropriately.</p>
 <p>To add a <strong>Bucket Policy</strong> from the AWS S3 Web Console, navigate to the <strong>Permissions</strong> tab. Temporarily disable <strong>Block all public access</strong>  to edit the Bucket policy, something along the lines of:</p>
 <pre><code>{
    &quot;Version&quot;: &quot;2012-10-17&quot;,
@@ -567,6 +573,27 @@ Joplin is also capable of exporting to a number of other formats including HTML
    ]
 }
 </code></pre>
+<h3>Configuration settings for tested providers<a name="configuration-settings-for-tested-providers" href="#configuration-settings-for-tested-providers" class="heading-anchor">🔗</a></h3>
+<p>All providers will require a bucket, Access Key, and Secret Key.</p>
+<p>If you provide a configuration and you receive &quot;success!&quot; on the &quot;check config&quot; then your S3 sync should work for your provider. If you do not receive success, you may need to adjust your settings, or save them, restart the app, and attempt a sync. This may reveal more clear error messaging that will help you deduce the problem.</p>
+<h3>AWS<a name="aws" href="#aws" class="heading-anchor">🔗</a></h3>
+<ul>
+<li>URL: <a href="https://s3.amazonaws.com">https://s3.amazonaws.com</a></li>
+<li>Region: required</li>
+<li>Force Path Style: unchecked</li>
+</ul>
+<h3>Linode<a name="linode" href="#linode" class="heading-anchor">🔗</a></h3>
+<ul>
+<li>URL: https://<region>.linodeobjects.com</li>
+<li>Region: empty</li>
+<li>Force Path Style: unchecked</li>
+</ul>
+<h3>UpCloud<a name="upcloud" href="#upcloud" class="heading-anchor">🔗</a></h3>
+<ul>
+<li>URL: https://<account>.<region>.upcloudobjects.com (They will provide you with multiple URLs, the one that follows this pattern should work.)</li>
+<li>Region: required</li>
+<li>Force Path Style: unchecked</li>
+</ul>
 <h1>Encryption<a name="encryption" href="#encryption" class="heading-anchor">🔗</a></h1>
 <p>Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the <a href="/e2ee/">End-To-End Encryption Tutorial</a> for more information about this feature and how to enable it.</p>
 <p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="/spec/e2ee/">Encryption specification</a>.</p>
@@ -844,35 +871,35 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po">ar</a></td>
 <td><a href="mailto:Whaell@protonmail.com">Whaell O</a></td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
-<td>28%</td>
+<td>27%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/></td>
 <td>Bosnian (Bosna i Hercegovina)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po">bs_BA</a></td>
 <td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>71%</td>
+<td>68%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/></td>
 <td>Bulgarian (България)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po">bg_BG</a></td>
 <td></td>
-<td>55%</td>
+<td>54%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/></td>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po">ca</a></td>
 <td><a href="mailto:xavi.ivars@gmail.com">Xavi Ivars</a></td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/></td>
@@ -886,28 +913,28 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Czech (Česká republika)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po">cs_CZ</a></td>
 <td><a href="mailto:michal@stanke.cz">Michal Stanke</a></td>
-<td>94%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/></td>
 <td>Dansk (Danmark)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po">da_DK</a></td>
-<td>Mustafa Al-Dailemi (<a href="mailto:dailemi@hotmail.com">dailemi@hotmail.com</a>)Language-Team:</td>
-<td>99%</td>
+<td>ERYpTION</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/></td>
 <td>Deutsch (Deutschland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po">de_DE</a></td>
-<td><a href="mailto:martin.d@andix.de">marph91</a></td>
-<td>99%</td>
+<td><a href="mailto:s.robin@tutanota.de">MrKanister</a></td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/></td>
 <td>Eesti Keel (Eesti)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po">et_EE</a></td>
 <td></td>
-<td>54%</td>
+<td>52%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/></td>
@@ -928,97 +955,97 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Español (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po">es_ES</a></td>
 <td><a href="mailto:francisco.m.collao@gmail.com">Francisco Mora</a></td>
-<td>95%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/></td>
 <td>Esperanto</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po">eo</a></td>
 <td>Marton Paulo</td>
-<td>31%</td>
+<td>30%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/></td>
 <td>Finnish (Suomi)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po">fi_FI</a></td>
 <td>mrkaato</td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/></td>
 <td>Français (France)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po">fr_FR</a></td>
 <td>Nicolas Viviani</td>
-<td>100%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/></td>
 <td>Galician (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po">gl_ES</a></td>
 <td><a href="mailto:marcoslansgarza@gmail.com">Marcos Lans</a></td>
-<td>36%</td>
+<td>35%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/></td>
 <td>Indonesian (Indonesia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po">id_ID</a></td>
 <td><a href="mailto:42007357+eresytter@users.noreply.github.com">eresytter</a></td>
-<td>95%</td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/></td>
 <td>Italiano (Italia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po">it_IT</a></td>
 <td><a href="mailto:albano_battistella@hotmail.com">Albano Battistella</a></td>
-<td>95%</td>
+<td>92%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/></td>
 <td>Magyar (Magyarország)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po">hu_HU</a></td>
 <td><a href="mailto:balmag@gmail.com">Magyari Balázs</a></td>
-<td>83%</td>
+<td>80%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/></td>
 <td>Nederlands (België, Belgique, Belgien)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>86%</td>
+<td>83%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/></td>
 <td>Nederlands (Nederland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po">nl_NL</a></td>
 <td><a href="mailto:metbril@users.noreply.github.com">MetBril</a></td>
-<td>90%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/></td>
 <td>Norwegian (Norge, Noreg)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po">nb_NO</a></td>
 <td>Alexander Dawson</td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/></td>
 <td>Persian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po">fa</a></td>
 <td><a href="mailto:kourox@protonmail.com">Kourosh Firoozbakht</a></td>
-<td>67%</td>
+<td>65%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/></td>
 <td>Polski (Polska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po">pl_PL</a></td>
 <td><a href="mailto:hello.konhi@gmail.com">konhi</a></td>
-<td>89%</td>
+<td>86%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po">pt_BR</a></td>
-<td><a href="mailto:nicolas.suzuki@pm.me">Nicolas Suzuki</a></td>
+<td><a href="mailto:felipeviggiano@gmail.com">Felipe Viggiano</a></td>
 <td>96%</td>
 </tr>
 <tr>
@@ -1026,105 +1053,105 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Português (Portugal)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po">pt_PT</a></td>
 <td><a href="mailto:dcaveiro@yahoo.com">Diogo Caveiro</a></td>
-<td>89%</td>
+<td>86%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/></td>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po">ro</a></td>
 <td><a href="mailto:cristi.duluta@gmail.com">Cristi Duluta</a></td>
-<td>62%</td>
+<td>60%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/></td>
 <td>Slovenian (Slovenija)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po">sl_SI</a></td>
 <td><a href="mailto:martin.korelic@protonmail.com">Martin Korelič</a></td>
-<td>90%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/></td>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po">sv</a></td>
 <td><a href="mailto:jonatan@autistici.org">Jonatan Nyberg</a></td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/></td>
 <td>Thai (ประเทศไทย)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po">th_TH</a></td>
 <td></td>
-<td>42%</td>
+<td>43%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/></td>
 <td>Tiếng Việt</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po">vi</a></td>
 <td></td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/></td>
 <td>Türkçe (Türkiye)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po">tr_TR</a></td>
 <td><a href="mailto:arda@kilicdagi.com">Arda Kılıçdağı</a></td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/></td>
 <td>Ukrainian (Україна)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po">uk_UA</a></td>
 <td><a href="mailto:vandreykiv@gmail.com">Vyacheslav Andreykiv</a></td>
-<td>89%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/></td>
 <td>Ελληνικά (Ελλάδα)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po">el_GR</a></td>
 <td><a href="mailto:xaris@tuta.io">Harris Arvanitis</a></td>
-<td>92%</td>
+<td>89%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/></td>
 <td>Русский (Россия)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po">ru_RU</a></td>
 <td><a href="mailto:thesermanarm@gmail.com">Sergey Segeda</a></td>
-<td>99%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/></td>
 <td>српски језик (Србија)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po">sr_RS</a></td>
 <td></td>
-<td>80%</td>
+<td>78%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po">zh_CN</a></td>
 <td><a href="mailto:jackytsu@vip.qq.com">南宫小骏</a></td>
-<td>100%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po">zh_TW</a></td>
 <td><a href="mailto:nelson22768384@gmail.com">SiderealArt</a></td>
-<td>95%</td>
+<td>92%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/></td>
 <td>日本語 (日本)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po">ja_JP</a></td>
 <td><a href="mailto:genneko217@gmail.com">genneko</a></td>
-<td>100%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/></td>
 <td>한국어</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po">ko</a></td>
 <td><a href="mailto:potatogim@potatogim.net">Ji-Hyeon Gim</a></td>
-<td>94%</td>
+<td>91%</td>
 </tr>
 </tbody>
 </table>
@@ -1704,7 +1731,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,7 +2,10 @@
 <html lang="en">
 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -11,7 +14,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
 		<meta name="description" content="Joplin, the open source note-taking application" />
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
@@ -29,7 +32,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-prod">
@@ -569,9 +572,9 @@

 							<div class="text-center sponsors-org">
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;www.hosting.de&#x2F;nextcloud&#x2F;?mtm_campaign&#x3D;managed-nextcloud&amp;mtm_kwd&#x3D;joplinapp&amp;mtm_source&#x3D;joplinapp-webseite&amp;mtm_medium&#x3D;banner"><img title="Hosting.de" src="&#x2F;images/sponsors/HostingDe.png"></a>
-									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;usrigging.com&#x2F;"><img title="U.S. Ringing Supply" src="&#x2F;images/sponsors/RingingSupply.svg"></a>
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;tranio.com&#x2F;italy&#x2F;"><img title="Tranio" src="&#x2F;images/sponsors/Tranio.png"></a>
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;seirei.ne.jp"><img title="Serei Network" src="&#x2F;images/sponsors/SeireiNetwork.png"></a>
+									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;usrigging.com&#x2F;"><img title="U.S. Ringing Supply" src="&#x2F;images/sponsors/RingingSupply.svg"></a>
 							</div>

 							<div class="text-center sponsors-github">
@@ -725,7 +728,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>
 <script>
 	if (window.location.hostname !== 'localhost') {
 		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
--- a/docs/markdown/index.html
+++ b/docs/markdown/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Markdown Guide | Joplin</title>

 		<script
@@ -443,7 +446,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 <p>You can create a link to a note by specifying its ID in the URL. For example:</p>
 <pre><code>[Link to my note](:/0b0d62d15e60409dac34f354b6e9e839)
 </code></pre>
-<p>Since getting the ID of a note is not straightforward, each app provides a way to create such link. In the <strong>desktop app</strong>, right click on a note an select &quot;Copy Markdown link&quot;. In the <strong>mobile app</strong>, open a note and, in the top right menu, select &quot;Copy Markdown link&quot;. You can then paste this link anywhere in another note.</p>
+<p>Since getting the ID of a note is not straightforward, each app provides a way to create such link. In the <strong>desktop app</strong>, drag and drop a note into another note to create a link. Or right click on a note and select &quot;Copy Markdown link&quot;. In the <strong>mobile app</strong>, open a note and, in the top right menu, select &quot;Copy Markdown link&quot;. You can then paste this link anywhere in another note.</p>
 <h3>Math notation<a name="math-notation" href="#math-notation" class="heading-anchor">🔗</a></h3>
 <p>Math expressions can be added using the <a href="https://khan.github.io/KaTeX/">KaTeX notation</a>. To add an inline equation, wrap the expression in <code>$EXPRESSION$</code>, eg. <code>$\sqrt{3x-1}+(1+x)^2$</code>. To create an expression block, wrap it as follow:</p>
 <pre><code>$$
@@ -656,7 +659,7 @@ graph TD;
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/mobile/index.html
+++ b/docs/mobile/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Mobile app | Joplin</title>

 		<script
@@ -333,7 +336,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/note_history/index.html
+++ b/docs/note_history/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Note History | Joplin</title>

 		<script
@@ -346,7 +349,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/plans/index.html
+++ b/docs/plans/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Cloud Plans | Joplin</title>

 		<script
@@ -507,7 +510,7 @@ https://github.com/laurent22/joplin/blob/dev/
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/plugins/index.html
+++ b/docs/plugins/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Plugins | Joplin</title>

 		<script
@@ -344,7 +347,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/prereleases/index.html
+++ b/docs/prereleases/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Getting pre-releases | Joplin</title>

 		<script
@@ -293,7 +296,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 <h1>Getting pre-releases<a name="getting-pre-releases" href="#getting-pre-releases" class="heading-anchor">🔗</a></h1>
 <p>Pre-releases are available for the desktop application. They are pretty much like regular releases, except that they have not yet been tested by many users, so it is possible that a bug or two went through.</p>
 <p>You can help the development of Joplin by choosing to receive these early releases when updating the application. If you find any bug or other issue, please report it on <a href="https://github.com/laurent22/joplin/issues">GitHub</a> or the forum (if you do not have a GitHub account). Any bug report during the pre-release phase is invaluable to us, as it allows making the app more reliable before making it available to more people.</p>
-<p>In general it is safe to use these pre-releases as they do not include any experimental or unstable features. Hundreds of users run them without any issue. Morever even if you do find an issue, you can report it and it is usually fixed very quickly as these bugs are given the highest priority.</p>
+<p>In general it is safe to use these pre-releases as they do not include any experimental or unstable features. Hundreds of users run them without any issue. Moreover even if you do find an issue, you can report it and it is usually fixed very quickly as these bugs are given the highest priority.</p>
 <p>To have access to these pre-releases, simply go to <a href="/config_screen/">Configuration &gt; General</a> and tick the box &quot;<strong>Get pre-releases when checking for updates</strong>&quot;.</p>

 								<div class="bottom-links">
@@ -335,7 +338,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/privacy/index.html
+++ b/docs/privacy/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Privacy Policy | Joplin</title>

 		<script
@@ -293,6 +296,44 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 <h1>Joplin Privacy Policy<a name="joplin-privacy-policy" href="#joplin-privacy-policy" class="heading-anchor">🔗</a></h1>
 <p>The Joplin applications, including the Android, iOS, Windows, macOS and Linux applications, do not send any data to any service without your authorisation. Any data that Joplin saves, such as notes or images, are saved to your own device and you are free to delete this data at any time.</p>
 <p>If you choose to synchronise with a third-party, such as OneDrive or Dropbox, the notes will be sent to that account, in which case the third-party privacy policy applies.</p>
+<p>In order to provide certain features, Joplin may need to connect to third-party services. You can disable most of these features in the application settings:</p>
+<table class="table">
+<thead>
+<tr>
+<th>Feature</th>
+<th>Description</th>
+<th>Default</th>
+<th>Can be disabled</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Auto-update</td>
+<td>Joplin periodically connects to GitHub to check for new releases.</td>
+<td>Enabled</td>
+<td>Yes</td>
+</tr>
+<tr>
+<td>Geo-location</td>
+<td>Joplin saves geo-location information in note properties when you create a note.</td>
+<td>Enabled</td>
+<td>Yes</td>
+</tr>
+<tr>
+<td>Synchronisation</td>
+<td>Joplin supports synchronisation of your notes across multiple devices. If you choose to synchronise with a third-party, such as OneDrive, the notes will be sent to your OneDrive account, in which case the third-party privacy policy applies.</td>
+<td>Disabled</td>
+<td>Yes</td>
+</tr>
+<tr>
+<td>Wifi connection check</td>
+<td>On mobile, Joplin checks for Wifi connectivity to give the option to synchronise data only when Wifi is enabled.</td>
+<td>Enabled</td>
+<td>No <sup>(1)</sup></td>
+</tr>
+</tbody>
+</table>
+<p>(1) <a href="https://github.com/laurent22/joplin/issues/5705">https://github.com/laurent22/joplin/issues/5705</a></p>
 <p>For any question about Joplin privacy policy, please leave a message <a href="https://discourse.joplinapp.org/">on the forum</a>.</p>

 								<div class="bottom-links">
@@ -334,7 +375,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/publish_note/index.html
+++ b/docs/publish_note/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/publish_note.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/publish_note.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/publish_note.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Publishing a note with Joplin Cloud | Joplin</title>

 		<script
@@ -338,7 +341,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/publish_note.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/rich_text_editor/index.html
+++ b/docs/rich_text_editor/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>About the Rich Text editor | Joplin</title>

 		<script
@@ -356,7 +359,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/schema/settings.json
+++ b/docs/schema/settings.json
@@ -80,24 +80,34 @@
 		"sync.8.path": {
 			"type": "string",
 			"default": "",
-			"description": "AWS S3 bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "S3 bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.8.url": {
 			"type": "string",
 			"default": "https://s3.amazonaws.com/",
-			"description": "AWS S3 URL"
+			"description": "S3 URL"
+		},
+		"sync.8.region": {
+			"type": "string",
+			"default": "",
+			"description": "Region"
 		},
 		"sync.8.username": {
 			"type": "string",
 			"default": "",
-			"description": "AWS key"
+			"description": "Access Key"
 		},
 		"sync.8.password": {
 			"type": "string",
 			"default": "",
-			"description": "AWS secret",
+			"description": "Secret Key",
 			"$comment": "private"
 		},
+		"sync.8.forcePathStyle": {
+			"type": "boolean",
+			"default": false,
+			"description": "Force Path Style"
+		},
 		"sync.9.path": {
 			"type": "string",
 			"default": "",
@@ -312,7 +322,8 @@
 				"YYYY-MM-DD",
 				"DD.MM.YYYY",
 				"YYYY.MM.DD",
-				"YYMMDD"
+				"YYMMDD",
+				"YYYY/MM/DD"
 			]
 		},
 		"timeFormat": {
@@ -427,6 +438,41 @@
 			"default": true,
 			"description": "Reverse sort order"
 		},
+		"notes.sortOrder.buttonsVisible": {
+			"type": "boolean",
+			"default": true,
+			"description": "Show sort order buttons. If true, sort order buttons (field + reverse) for notes are shown at the top of Note List."
+		},
+		"notes.perFieldReversalEnabled": {
+			"type": "boolean",
+			"default": true,
+			"$comment": "private"
+		},
+		"notes.perFieldReverse": {
+			"type": "object",
+			"default": {
+				"user_updated_time": true,
+				"user_created_time": true,
+				"title": false,
+				"order": false
+			},
+			"$comment": "private"
+		},
+		"notes.perFolderSortOrderEnabled": {
+			"type": "boolean",
+			"default": true,
+			"$comment": "private"
+		},
+		"notes.perFolderSortOrders": {
+			"type": "object",
+			"default": {},
+			"$comment": "private"
+		},
+		"notes.sharedSortOrder": {
+			"type": "object",
+			"default": {},
+			"$comment": "private"
+		},
 		"folders.sortOrder.field": {
 			"type": "string",
 			"default": "title",
--- a/docs/share_notebook/index.html
+++ b/docs/share_notebook/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/share_notebook.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/share_notebook.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/share_notebook.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Sharing a notebook with Joplin Cloud | Joplin</title>

 		<script
@@ -366,7 +369,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/share_notebook.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/clipper_auth/index.html
+++ b/docs/spec/clipper_auth/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Clipper authorisation mechanism | Joplin</title>

 		<script
@@ -299,7 +302,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 <p>The token can also be requested programmatically, as is done for the web clipper extension. It works as below:</p>
 <ul>
 <li>
-<p>The client calls <code>POST /auth</code>. The server responds with <code>{ auth_token: &quot;AUTH_TOKEN&quot; }</code>. This <code>auth_token</code> is different from the regular token - it is just used to authentify the client.</p>
+<p>The client calls <code>POST /auth</code>. The server responds with <code>{ auth_token: &quot;AUTH_TOKEN&quot; }</code>. This <code>auth_token</code> is different from the regular token - it is just used to authenticate the client.</p>
 </li>
 <li>
 <p>The application displays a message asking the user to Accept or Reject the access request.</p>
@@ -357,7 +360,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/e2ee/index.html
+++ b/docs/spec/e2ee/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Encryption | Joplin</title>

 		<script
@@ -383,14 +386,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 <p>Although messy, Joplin supports having some clients send encrypted items and others unencrypted ones. The situation gets resolved once all the clients have the same E2EE settings.</p>
 </li>
 <li>
-<p>Currently, there is no way to delete encryption keys if you do not need them anymore or if you disabled the encryption completely. You will get a persistant notification to provide a Master Key password on a new device, even if encryption is disabled. Entering the Master Key(s) password and still having the encryption disabled will get rid of the notification. See <a href="https://discourse.joplinapp.org/t/delete-e2ee-master-keys/906">Delete E2EE Master Keys</a> for more info.</p>
+<p>Currently, there is no way to delete encryption keys if you do not need them anymore or if you disabled the encryption completely. You will get a persistent notification to provide a Master Key password on a new device, even if encryption is disabled. Entering the Master Key(s) password and still having the encryption disabled will get rid of the notification. See <a href="https://discourse.joplinapp.org/t/delete-e2ee-master-keys/906">Delete E2EE Master Keys</a> for more info.</p>
 </li>
 </ul>
 <h2>Types of keys<a name="types-of-keys" href="#types-of-keys" class="heading-anchor">🔗</a></h2>
 <p>There are two types of key:</p>
 <ul>
 <li>
-<p><strong>Data keys</strong>, which are used to encrypt Joplin items, such as notes, notebooks, tags, etc. when E2EE is ernabled. A data key is generated when the user enables E2EE. Data keys are also dynamically generated when a user shares a notebook with another user. In this case, we create a separate key, so that the recipient can only decrypt this specific notebook.</p>
+<p><strong>Data keys</strong>, which are used to encrypt Joplin items, such as notes, notebooks, tags, etc. when E2EE is enabled. A data key is generated when the user enables E2EE. Data keys are also dynamically generated when a user shares a notebook with another user. In this case, we create a separate key, so that the recipient can only decrypt this specific notebook.</p>
 </li>
 <li>
 <p><strong>Public-private key pairs</strong>, which are used to transfer secrets between users.</p>
@@ -412,7 +415,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 </ul>
 <p>At this point, both users have a copy of the key and can share notes over E2EE.</p>
 <p>A user can only have one PPK.</p>
-<p>PPKs are generated automatically when E2EE is enabled and when the user synchronises. They are then stored in info.json on the sync target. The key is genrated during sync because otherwise multiple clients could generate a PPK, and then there would be a conflict to decide which PPK should be kept. By doing it during sync, it ensures that only one PPK is generated because the synchronizer fetches first info.json - and only generates a PPK if none is already present.</p>
+<p>PPKs are generated automatically when E2EE is enabled and when the user synchronises. They are then stored in info.json on the sync target. The key is generated during sync because otherwise multiple clients could generate a PPK, and then there would be a conflict to decide which PPK should be kept. By doing it during sync, it ensures that only one PPK is generated because the synchronizer fetches first info.json - and only generates a PPK if none is already present.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md">
@@ -453,7 +456,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/history/index.html
+++ b/docs/spec/history/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Note history | Joplin</title>

 		<script
@@ -358,7 +361,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/interop_with_frontmatter/index.html
+++ b/docs/spec/interop_with_frontmatter/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/interop_with_frontmatte

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/interop_with_frontmatte
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/interop_with_frontmatte
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Markdown with Front Matter Exporter&#x2F;Importer | Joplin</title>

 		<script
@@ -417,7 +420,7 @@ All of this metadata is available to be imported/exported.
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/plugins/index.html
+++ b/docs/spec/plugins/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Plugin system architecture | Joplin</title>

 		<script
@@ -396,7 +399,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/search_sorting/index.html
+++ b/docs/spec/search_sorting/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Search Engine | Joplin</title>

 		<script
@@ -353,7 +356,7 @@ This time-based weight decays logarithmically, becoming less of a factor than BM
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/server_delta_sync/index.html
+++ b/docs/spec/server_delta_sync/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Server delta sync | Joplin</title>

 		<script
@@ -303,9 +306,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 </ul>
 <p>The events are tied to a particular parent ID - in other words it's only possible to list the changes associated with a particular directory (non-recursive). For now, this is sufficient for the purpose of Joplin synchronisation, but later on it might be possible to get the changes in a recursive way.</p>
 <h2>What is a change event<a name="what-is-a-change-event" href="#what-is-a-change-event" class="heading-anchor">🔗</a></h2>
-<p>An event can be &quot;create&quot;, &quot;update&quot; or &quot;detete&quot; and is associated with a given file. The client uses this info to apply the change locally - creating, updating or deleting the file as needed.</p>
+<p>An event can be &quot;create&quot;, &quot;update&quot; or &quot;delete&quot; and is associated with a given file. The client uses this info to apply the change locally - creating, updating or deleting the file as needed.</p>
 <p>Attached to the event, is also a copy of the file metadata, so the client doesn't need to a do a second request to fetch it.</p>
-<p>Internally, the event also stores the file name and parent ID. This is used when an item is deleted since in that case the item ID only would not be sufficient to know where the item was initally stored.</p>
+<p>Internally, the event also stores the file name and parent ID. This is used when an item is deleted since in that case the item ID only would not be sufficient to know where the item was initially stored.</p>
 <h2>Event compression<a name="event-compression" href="#event-compression" class="heading-anchor">🔗</a></h2>
 <p>To reduce the data being transferred, the API compresses the events by removing redundant ones. For example, multiple updates are compressed into one, since the client only need to know that the item has been updated at least once. The following rules are currently applied to compress the events:</p>
 <table class="table">
@@ -382,7 +385,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 </ul>
 </li>
 </ul>
-<p>It might seem we could derive the &quot;create&quot; events simply by looking at the files in the directory - all files that are there would implicitely have a &quot;create&quot; event. The issue however is that it's not possible to reliably iterate over the files in a folder, because they might change in the meantime. The change events on the other hand provide an ID that can be used reliably to iterate over changes, and to resume at any time.</p>
+<p>It might seem we could derive the &quot;create&quot; events simply by looking at the files in the directory - all files that are there would implicitly have a &quot;create&quot; event. The issue however is that it's not possible to reliably iterate over the files in a folder, because they might change in the meantime. The change events on the other hand provide an ID that can be used reliably to iterate over changes, and to resume at any time.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md">
@@ -423,7 +426,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/server_file_url_format/index.html
+++ b/docs/spec/server_file_url_format/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Structure of file URLs in Joplin Server | Joplin</title>

 		<script
@@ -353,7 +356,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/server_sharing/index.html
+++ b/docs/spec/server_sharing/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Server sharing feature | Joplin</title>

 		<script
@@ -303,12 +306,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 <ul>
 <li>First, the sharer calls <code>POST /api/shares</code> with the notebook ID that needs to be shared.</li>
 <li>Then invitations can be sent by calling <code>POST /api/share_users</code> and providing the share ID and recipient email.</li>
-<li>The recipient accept or reject the application by setting the status onn the <code>share_users</code> object (which corresponds to an invitation).</li>
+<li>The recipient accept or reject the application by setting the status on the <code>share_users</code> object (which corresponds to an invitation).</li>
 </ul>
 <p>Once share is setup, the client recursively goes through all notes, sub-notebooks and resources within the shared notebook, and set their <code>share_id</code> property. Basically any item within the notebook should have this property set. Then all these items are synchronized.</p>
 <p>On the server, a service is running at regular interval to check the <code>share_id</code> property, and generate <code>user_item</code> objects for each recipient. Once these objects have been created, the recipient will start receiving the shared notebooks and notes.</p>
 <h3>Why is the share_id set on the client and not the server?<a name="why-is-the-share-id-set-on-the-client-and-not-the-server" href="#why-is-the-share-id-set-on-the-client-and-not-the-server" class="heading-anchor">🔗</a></h3>
-<p>Technically, the server would only need to know the root shared folder, and from that can be find out its children. This approach was tried but it makes the system much more complex because some information is lost after sync - in particular when notes or notebooks are moved out of folders, when resources are attached or removed, etc. Keeping track of all this is possible but complex and innefficient.</p>
+<p>Technically, the server would only need to know the root shared folder, and from that can be find out its children. This approach was tried but it makes the system much more complex because some information is lost after sync - in particular when notes or notebooks are moved out of folders, when resources are attached or removed, etc. Keeping track of all this is possible but complex and inefficient.</p>
 <p>On the other hand, all that information is present on the client. Whenever a notes is moved out a shared folder, or whenever a resources is attached, the changes are tracked, and that can be used to easily assign a <code>share_id</code> property. Once this is set, it makes the whole system more simple and reliable.</p>
 <h2>Publishing a note via a public URL<a name="publishing-a-note-via-a-public-url" href="#publishing-a-note-via-a-public-url" class="heading-anchor">🔗</a></h2>
 <p>This is done by posting a note ID to <code>/api/shares</code>.</p>
@@ -318,7 +321,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 <p>Any linked note will <strong>not</strong> be shared, due to the following reasons:</p>
 <ul>
 <li>
-<p>Privacy issue - you don't want to accidentally share a note just because it was linked to another note.</p>
+<p>Privacy issue - you don't want to accidentally share a note just because it was linked from another note.</p>
 </li>
 <li>
 <p>Even if the linked note has been shared separately, we still don't give access to it. We don't know who that link has been shared with - it could be a different recipient.</p>
@@ -326,7 +329,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 </ul>
 <h3>Multiple share links for a given note<a name="multiple-share-links-for-a-given-note" href="#multiple-share-links-for-a-given-note" class="heading-anchor">🔗</a></h3>
 <p>It should be possible to have multiple share links for a given note. For example: I share a note with one person, then the same note with a different person. I revoke the share for one person, but I sill want the other person to access the note.</p>
-<p>So when a share link is created for a note, the API always return a new link.</p>
+<p>So when a share link is created for a note, the API always returns a new link.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md">
@@ -367,7 +370,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/server_sharing_e2ee/index.html
+++ b/docs/spec/server_sharing_e2ee/index.html
@@ -0,0 +1,364 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/spec/server_sharing_e2ee.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing_e2ee.md
+
+-->
+
+	<head>
+<!-- Donate button A/B testing -->
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
+			charset="utf-8"
+			http-equiv="X-UA-Compatible"
+			content="IE=edge,chrome=1"
+		/>
+		<link rel="icon" href="&#x2F;images/favicon.png" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<meta name="theme-color" content="#000000" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
+		<link
+			rel="stylesheet"
+			href="&#x2F;css/bootstrap5.0.2.min.css"
+			as="style"
+		/>
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
+		<link
+			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
+			rel="stylesheet"
+			as="style"
+			media="all"
+			onload="this.media='all'; this.onload = null"
+		/>
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
+		<title>Sharing a notebook with E2EE enabled | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
+	</head>
+	<body class="website-env-prod">
+		<div class="container-fluid generic-template -page" id="main-container">
+
+<div class=" navbar-main white-bg" id="nav-section">
+	<div class="container">
+		<div class="row">
+			<div class="col-3">
+				<a href="/">
+					<img
+						src="&#x2F;images/logo-text-blue.svg"
+						alt=""
+						id="top-logo"
+						width="180"
+					/>
+				</a>
+			</div>
+			<div class="col-9 text-right d-none d-md-block">
+				<a href="/help/" class="fw500">Help</a>
+				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>			</div>
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
+				<span class="pointer"
+					><img
+						src="&#x2F;images/mobile-menu-black-open-icon.png"
+						id="open-menu-mobile"
+						alt=""
+				/></span>
+				&nbsp;&nbsp;
+
+				<div id="menu-mobile">
+					<div>
+						<div class="text-right">
+							<img
+								src="&#x2F;images/close-icon.png"
+								alt=""
+								class="pointer"
+								id="close-menu-mobile"
+							/>
+						</div>
+
+						<div class="text-center menu-mobile-top">
+							<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500 mobile-menu-link">Forum</a>
+							<a href="/help/" class="fw500 mobile-menu-link">Help</a>
+						</div>
+
+						<div class="menu-mobile-buttons">
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>						</div>
+					</div>
+
+						<div id="toc-mobile"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+					
+					<div>
+						<p class="light-blue mobile-menu-link-bottom text-center">
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
+							<br/>
+							<a href="/privacy/" class="fw500">Privacy Policy</a>
+						</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+			<div class="help-page-container page-server_sharing_e2ee">
+				<div class="container">
+					<div class="row content-wrapper">
+						<div id="toc"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+
+						<div class="main-content">
+							<div class="alert alert-danger alert-env-dev" role="alert">
+								Running in prod mode!
+							</div>
+							<div class="donate-links">
+<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
+</div>
+<h1>Sharing a notebook with E2EE enabled<a name="sharing-a-notebook-with-e2ee-enabled" href="#sharing-a-notebook-with-e2ee-enabled" class="heading-anchor">🔗</a></h1>
+<ul>
+<li>When sharing the notebook, a key (NOTEBOOK_KEY) is automatically generated and encrypted with the sender master password.
+<ul>
+<li>That key ID is then associated with the notebook</li>
+</ul>
+</li>
+<li>When adding a recipient, the key is decrypted using the sender master password, and reencrypted using the recipient public key
+<ul>
+<li>That encrypted key is then attached to the share_user object (the invitation)</li>
+</ul>
+</li>
+<li>When the recipient receives the invitation, the key is retrieved from it, then decrypted using the private key, and reencrypted using the recipient master password.</li>
+</ul>
+<p>Once the key exchange is done, each user has their own copy of NOTEBOOK_KEY encrypted with their own master password. Public/Private Keys are only used to transfer NOTEBOOK_KEY.</p>
+<p>Whenever any item within the notebook is encrypted, it is done with NOTEBOOK_KEY.</p>
+
+								<div class="bottom-links">
+									<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing_e2ee.md">
+										<i class="fab fa-github"></i> Improve this doc
+									</a>
+								</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			
+<footer class="darkblue-bg">
+	<div class="container">
+		<div class="row">
+			<div class="col-12 col-md-12 social-links">
+				<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed"><i class="fab fa-twitter"></i></a>
+				<a href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
+				<a href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
+				<a href="https://discordapp.com/invite/d2HMPwE" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
+				<a href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
+				<a href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
+			</div>
+		</div>
+
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
+			</div>
+			<div class="col-12 col-md-6">
+				<p class="text-right text-center-sm right-links">
+					<span class="footer-right">
+						<a href="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>
+
+<script>
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
+</script>	</body>
+</html>
--- a/docs/spec/server_user_status/index.html
+++ b/docs/spec/server_user_status/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_user_status.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_user_status.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_user_status.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Joplin Server user status | Joplin</title>

 		<script
@@ -359,7 +362,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_user_status.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/spec/sync_lock/index.html
+++ b/docs/spec/sync_lock/index.html
@@ -15,7 +15,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md

 	<head>
 <!-- Donate button A/B testing -->
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+
+<!--
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
+-->		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -29,7 +32,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link rel="stylesheet" href="/css/fontawesome-all.min.css?h=ecd507b3125edc4d2a03aa6ae5d07da9">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +40,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<link rel="stylesheet" href="/css/site.css?h=7ac82e1f40a384f69c644263acc99fc8" as="style" />
 		<title>Lock types | Joplin</title>

 		<script
@@ -349,7 +352,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 <p>If it's the same as the client supported version, it syncs as normal.</p>
 <p>If it's lower than the client supported version, the client does not allow sync and instead displays a message asking the user to upgrade the sync target (upgradeState = SHOULD_UPGRADE).</p>
 <p>If the user click on the link to upgrade, upgradeState becomes MUST_UPGRADE, and the app restarts.</p>
-<p>On startup, the app check the upgradeState setting. If it is MUST_UPGRADE it displays the upgrade screen and starts upgrarding. Once done it sets upgradeState back to IDLE, and restart the app.</p>
+<p>On startup, the app check the upgradeState setting. If it is MUST_UPGRADE it displays the upgrade screen and starts upgrading. Once done it sets upgradeState back to IDLE, and restart the app.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md">
@@ -390,7 +393,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 	</div>
 </footer>		</div>

-		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+		<script src="/js/script.js?h=46b3b58d72c94591621551affbb8c6e3"></script>

 <script>
 	if (window.location.hostname !== 'localhost') {
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
--- a/docs/templates/front.mustache
+++ b/docs/templates/front.mustache
@@ -11,7 +11,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
 		<meta name="description" content="Joplin, the open source note-taking application" />
-		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
+		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -29,7 +29,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
+		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-{{env}}">
@@ -376,7 +376,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
+		<script src="{{{assetUrls.js.script}}}"></script>
 		{{> analytics}}
 	</body>
 </html>
--- a/Show More
+++ b/Show More