feat(docs): improve documentation, add icons, reorganize

docs/User Guide/User Guide/Advanced Usage/Advanced Showcases/Day Notes.md

@@ -7,7 +7,7 @@ Select an existing day note, and the menubar contains a calendar widget. Select
 
 ![](1_Day%20Notes_image.png)
 
-This pattern works well also because of [Cloning Notes](../../Basic%20Concepts/Note/Cloning%20Notes.md) functionality - note can appear in multiple places in the note tree, so besides appearing under day note, it can also be categorized into other notes.
+This pattern works well also because of [Cloning Notes](../../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md) functionality - note can appear in multiple places in the note tree, so besides appearing under day note, it can also be categorized into other notes.
 
 ## Demo
 

docs/User Guide/User Guide/Advanced Usage/Advanced Showcases/Task Manager.md

@@ -7,7 +7,7 @@ Task Manager is a [promoted attributes](../Attributes/Promoted%20Attributes.md)
 
 Task Manager manages outstanding (TODO) tasks and finished tasks (non-empty doneDate attribute). Outstanding tasks are further categorized by location and arbitrary tags - whenever you change tag attribute in the task note, this task is then automatically moved to appropriate location.
 
-Task Manager also integrates with [day notes](Day%20Notes.md) - notes are [cloned](../../Basic%20Concepts/Note/Cloning%20Notes.md) into day note to both todoDate note and doneDate note (with [prefix](../../Basic%20Concepts/Navigation/Tree%20Concepts.md) of either "TODO" or "DONE").
+Task Manager also integrates with [day notes](Day%20Notes.md) - notes are [cloned](../../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md) into day note to both todoDate note and doneDate note (with [prefix](../../Basic%20Concepts%20and%20Features/Navigation/Tree%20Concepts.md) of either "TODO" or "DONE").
 
 ## Implementation
 

docs/User Guide/User Guide/Advanced Usage/Attributes.md

@@ -36,15 +36,15 @@ Labels are also searchable, enhancing note retrieval.
 *   `**appCss**`: Marks CSS notes used to modify Trilium’s appearance
 *   `**appTheme**`: Marks full CSS themes available in Trilium's options
 *   `**cssClass**`: Adds a CSS class to the note's representation in the tree
-*   `**iconClass**`: Adds a CSS class to the note's icon, useful for distinguishing notes visually. See [note icons](../Basic%20Concepts/Note/Note%20Icons.md)
+*   `**iconClass**`: Adds a CSS class to the note's icon, useful for distinguishing notes visually. See [note icons](../Basic%20Concepts%20and%20Features/Notes/Note%20Icons.md)
 *   `**pageSize**`: Specifies the number of items per page in note listings
 *   `**customRequestHandler**` **and** `**customResourceProvider**`: Refer to [Custom request handler](Custom%20Request%20Handler.md)
 *   `**widget**`: Marks a note as a custom widget, added to Trilium's component tree
-*   `**workspace**` **and related attributes**: See [Workspace](../Basic%20Concepts/Navigation/Workspace.md) for more details
+*   `**workspace**` **and related attributes**: See [Workspace](../Basic%20Concepts%20and%20Features/Navigation/Workspace.md) for more details
 *   `**searchHome**`: Specifies the parent for new search notes
 *   `**inbox**`: Designates a default location for new notes created via the sidebar
 *   `**sqlConsoleHome**`: Default location for SQL console notes
-*   `**bookmarked**` **and** `**bookmarkFolder**`: See [Bookmarks](../Basic%20Concepts/Navigation/Bookmarks.md)
+*   `**bookmarked**` **and** `**bookmarkFolder**`: See [Bookmarks](../Basic%20Concepts%20and%20Features/Navigation/Bookmarks.md)
 *   `**shareXXX**`: See [Sharing](Sharing.md)
 *   `**keyboardShortcut**`: Assigns a keyboard shortcut to open the note
 *   `**displayRelations**` **and** `**hideRelations**`: Manages the display of note relations

docs/User Guide/User Guide/Advanced Usage/Attributes/Template.md

@@ -23,7 +23,7 @@ To create an instance note through the UI:
 
 ![show child note templates](../../Attachments/template-create-instance-n.png)
 
-For the template to appear in the menu, the template note must have the `#template` label. Do not confuse this with the `~template` relation, which links the instance note to the template note. If you use [workspaces](../../Basic%20Concepts/Navigation/Workspace.md), you can also mark templates with `#workspaceTemplate` to display them only in the workspace.
+For the template to appear in the menu, the template note must have the `#template` label. Do not confuse this with the `~template` relation, which links the instance note to the template note. If you use [workspaces](../../Basic%20Concepts%20and%20Features/Navigation/Workspace.md), you can also mark templates with `#workspaceTemplate` to display them only in the workspace.
 
 Templates can also be added or changed after note creation by creating a `~template` relation pointing to the desired template note.
 

docs/User Guide/User Guide/Advanced Usage/Database.md

@@ -9,7 +9,7 @@ When you run Trilium for the first time, it will generate a new database contain
 *   [Day Notes](Advanced%20Showcases/Day%20Notes.md)
 *   [Weight Tracker](Advanced%20Showcases/Weight%20Tracker.md)
 *   [Task Manager](Advanced%20Showcases/Task%20Manager.md)
-*   [Custom CSS Themes](../Basic%20Concepts/Themes.md)
+*   [Custom CSS Themes](../Basic%20Concepts%20and%20Features/Themes.md)
 
 ### Restoring Demo Notes
 

docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.md

@@ -1,7 +1,7 @@
 # SQL Console
 The SQL Console is Trilium's built-in database editor.
 
-It can be accessed by going to the [global menu](../../../Basic%20Concepts/UI%20Elements) → Advanced → Open SQL Console.
+It can be accessed by going to the [global menu](../../../Basic%20Concepts%20and%20Features/UI%20Elements) → Advanced → Open SQL Console.
 
 ![](SQL%20Console_image.png)
 

docs/User Guide/User Guide/Advanced Usage/Note source.md

@@ -30,7 +30,7 @@ Here's part of the HTML representation of this note, as it's stored in the datab
 
 ## Viewing the source code
 
-It is possible to view the source code of a note by pressing the contextual menu in [Note buttons](../Basic%20Concepts/UI%20Elements/Note%20buttons.md) and selecting _Note source_.
+It is possible to view the source code of a note by pressing the contextual menu in [Note buttons](../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20buttons.md) and selecting _Note source_.
 
 ![](Note%20source_image.png)
 

docs/User Guide/User Guide/Advanced Usage/Sharing.md

@@ -41,7 +41,7 @@ To protect shared notes with a username and password, you can use the `#shareCre
 The default shared page is basic in design, but you can customize it using your own CSS:
 
 *   **Custom CSS**: Link a CSS [code note](../Note%20Types/Code.md) to the shared page by adding a `~shareCss` relation to the note. If you want this style to apply to the entire subtree, make the label inheritable. You can hide the CSS code note from the tree navigation by adding the `#shareHiddenFromTree` label.
-*   **Omitting Default CSS**: For extensive styling changes, use the `#shareOmitDefaultCss` label to avoid conflicts with Trilium's [default stylesheet](../Basic%20Concepts/Themes.md).
+*   **Omitting Default CSS**: For extensive styling changes, use the `#shareOmitDefaultCss` label to avoid conflicts with Trilium's [default stylesheet](../Basic%20Concepts%20and%20Features/Themes.md).
 
 ### Adding JavaScript
 

docs/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.md

@@ -42,7 +42,7 @@ Only in desktop (electron build):
 *   <kbd>Shift</kbd>+<kbd><span>↑</span></kbd>, <kbd>Shift</kbd>`+`<kbd><span>↓</span></kbd> - multi-select note above/below
 *   <kbd>Ctrl</kbd>+<kbd>A</kbd> - select all notes in the current level
 *   <kbd>Shift</kbd>+<kbd>🖱 Left click</kbd> - multi select note which you clicked on
-*   <kbd>Ctrl</kbd>+<kbd>C</kbd> - copies current note (or current selection) into clipboard (used for [cloning](Note/Cloning%20Notes.md)
+*   <kbd>Ctrl</kbd>+<kbd>C</kbd> - copies current note (or current selection) into clipboard (used for [cloning](Notes/Cloning%20Notes.md)
 *   <kbd>Ctrl</kbd>+<kbd>X</kbd> - cuts current (or current selection) note into clipboard (used for moving notes)
 *   <kbd>Ctrl</kbd>+<kbd>V</kbd> - pastes note(s) as sub-note into current note (which is either move or clone depending on whether it was copied or cut into clipboard)
 *   <kbd>Del</kbd> - delete note / sub-tree

docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Tree Concepts.md

@@ -3,13 +3,13 @@ This page explains the basic concepts related to the tree structure of notes in
 
 ## Note
 
-A note is the central entity in TriliumNext. For more details, see [Note](../Note.md).
+A note is the central entity in TriliumNext. For more details, see [Note](../Notes.md).
 
 ## Branch
 
 A branch describes the placement of a note within the note tree. Essentially, it is a tuple of `parentNoteId` and `noteId`, indicating that the given note is placed as a child under the specified parent note.
 
-Each note can have multiple branches, meaning any note can be placed in multiple locations within the tree. This concept is referred to as " [cloning](../Note/Cloning%20Notes.md)."
+Each note can have multiple branches, meaning any note can be placed in multiple locations within the tree. This concept is referred to as " [cloning](../Notes/Cloning%20Notes.md)."
 
 ## Prefix
 

docs/User Guide/User Guide/Basic Concepts and Features/Notes.md

@@ -1,4 +1,4 @@
-# Note
+# Notes
 Note is a central entity in Trilium. Main attributes of note are title and content.
 
 ### Note types
@@ -22,7 +22,7 @@ There's one special note called "root note" which is root of the note tree. All
 
 ### Tree structure
 
-Importantly, note itself doesn't carry information on its placement in note tree. See [cloning](Note/Cloning%20Notes.md) for details.
+Importantly, note itself doesn't carry information on its placement in note tree. See [cloning](Notes/Cloning%20Notes.md) for details.
 
 Tree structure of notes can resemble file system - but compared to that notes in Trilium can act as both file and directory - meaning that note can both have its own content and have children. "Leaf note" is a note which doesn't have any children.
 
@@ -40,4 +40,4 @@ After the 7 days (configurable) the notes will be "erased" - their title, conten
 
 ## See also
 
-*   [Read-only note](Note/Read-Only%20Notes.md)
+*   [Read-only note](Notes/Read-Only%20Notes.md)

docs/User Guide/User Guide/Basic Concepts and Features/Notes/Attachments.md

@@ -1,5 +1,5 @@
 # Attachments
-A [note](../Note.md) in Trilium can _own_ one or more attachments, which can be either images or files. These attachments can be displayed or linked within the note that owns them.
+A [note](../Notes.md) in Trilium can _own_ one or more attachments, which can be either images or files. These attachments can be displayed or linked within the note that owns them.
 
 This can be especially useful to include dependencies for your [scripts](../../Note%20Types/Code/Scripts.md). The [Weight Tracker](../../Advanced%20Usage/Advanced%20Showcases/Weight%20Tracker.md) shows how to use [chartjs](https://chartjs.org/) which is attached to the [script note](#root/HcUYTojFohtb).
 

docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons.md

@@ -0,0 +1,6 @@
+# Note Icons
+Icons are useful for distinguishing notes. At the technical level, they are set by the `iconClass` attribute which adds a CSS class to the note. For example `#iconClass="bx bx-calendar"` will show a calendar instead of the default page or folder icon. Looking up and remembering the css class names is not necessary. While editing a note, click on the icon next to the title to bring up a chooser gallery:
+
+![change note icon](../../Attachments/note-icon-change.png)
+
+![note icon gallery](../../Attachments/note-icon-gallery.png)

docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.md

@@ -32,7 +32,7 @@ Drag-and-drop the items in the tree in order to change their order. See [Note
 
 ## Customizing the launcher
 
-*   The icon of a launcher can be changed just like a normal note. See [Note Icons](../Note/Note%20Icons.md) for more information.
+*   The icon of a launcher can be changed just like a normal note. See [Note Icons](../Notes/Note%20Icons.md) for more information.
 *   The title of the launcher can also be changed.
 
 ### Resetting

docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree.md

@@ -20,7 +20,7 @@ You can easily rearrange the note tree by dragging and dropping notes, as demons
 
 ## Context Menu
 
-You can also move notes using the familiar cut and paste functions available in the context menu, or with the associated keyboard [shortcuts](../Keyboard%20Shortcuts.md): `CTRL-C` ( [copy](../Note/Cloning%20Notes.md)), <kbd>Ctrl</kbd> + <kbd>X</kbd> (cut) and <kbd>Ctrl</kbd> + <kbd>V</kbd> (paste).
+You can also move notes using the familiar cut and paste functions available in the context menu, or with the associated keyboard [shortcuts](../Keyboard%20Shortcuts.md): `CTRL-C` ( [copy](../Notes/Cloning%20Notes.md)), <kbd>Ctrl</kbd> + <kbd>X</kbd> (cut) and <kbd>Ctrl</kbd> + <kbd>V</kbd> (paste).
 
 ## Multiple selection
 

docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons.md

@@ -1,5 +1,5 @@
 # Note buttons
 To the right of the [Ribbon](Ribbon.md) there are a few more buttons: ![](Note%20buttons_image.png)
 
-*   The Note Revisions button displays the [Note Revisions](../Note/Note%20Revisions.md) for that particular note.
+*   The Note Revisions button displays the [Note Revisions](../Notes/Note%20Revisions.md) for that particular note.
-*   The contextual menu offers commands for the note or its subtree, such as import, export, viewing the [Note source code](../../Advanced%20Usage/Note%20source.md) or [Attachments](../Note/Attachments.md).
+*   The contextual menu offers commands for the note or its subtree, such as import, export, viewing the [Note source code](../../Advanced%20Usage/Note%20source.md) or [Attachments](../Notes/Attachments.md).

docs/User Guide/User Guide/Basic Concepts/Note/Note Icons.md

@@ -1,6 +0,0 @@
-# Note Icons
-Icons are useful for distinguishing notes. At the technical level, they are set by the `**iconClass**` attribute which adds a CSS class to the note. For example `#iconClass="bx bx-calendar"` will show a calendar instead of the default page or folder icon. Looking up and remembering the css class names is not necessary. While editing a note, click on the icon next to the title to bring up a chooser gallery:
-
-![change note icon](../../Attachments/note-icon-change.png)
-
-![note icon gallery](../../Attachments/note-icon-gallery.png)

docs/User Guide/User Guide/Developer Guides/Widget Basics.md

@@ -22,10 +22,10 @@ module.exports = new MyWidget();
 To implement this widget:
 
 1.  Create a new `JS Frontend` note in Trilium and paste in the code above.
-2.  Assign the `#widget` [attribute](../Advanced%20Usage/Attributes.md) to the [note](../Basic%20Concepts/Note.md).
+2.  Assign the `#widget` [attribute](../Advanced%20Usage/Attributes.md) to the [note](../Basic%20Concepts%20and%20Features/Notes.md).
 3.  Restart Trilium or reload the window.
 
-To verify that the widget is working, open the developer tools (`Cmd` + `Shift` + `I`) and run `document.querySelector("#my-widget")`. If the element is found, the widget is functioning correctly. If `undefined` is returned, double-check that the [note](../Basic%20Concepts/Note.md) has the `#widget` [attribute](../Advanced%20Usage/Attributes.md).
+To verify that the widget is working, open the developer tools (`Cmd` + `Shift` + `I`) and run `document.querySelector("#my-widget")`. If the element is found, the widget is functioning correctly. If `undefined` is returned, double-check that the [note](../Basic%20Concepts%20and%20Features/Notes.md) has the `#widget` [attribute](../Advanced%20Usage/Attributes.md).
 
 ### Step 2: Adding an UI Element
 

docs/User Guide/User Guide/FAQ.md

@@ -49,7 +49,7 @@ Short answer is that file systems are simply not powerful enough for what we wan
 
 More detailed answer:
 
-*   [clones](Basic%20Concepts/Note/Cloning%20Notes.md) are what you might call "hard directory link" in filesystem lingo, but this concept is not implemented in any filesystem
+*   [clones](Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md) are what you might call "hard directory link" in filesystem lingo, but this concept is not implemented in any filesystem
 *   filesystems make a distinction between directory and file while there's intentionally no such difference in Trilium
 *   files are stored in no particular order and user can't change this
 *   Trilium allows storing note [attributes](Advanced%20Usage/Attributes.md) which could be represented in extended user attributes but their support differs greatly among different filesystems / operating systems

docs/User Guide/User Guide/Installation & Setup/Mobile Frontend.md

@@ -20,7 +20,7 @@ Note that this is not an Android/iOS app, this is just mobile friendly web page
 Mobile frontend provides only some of the features of the full desktop frontend:
 
 *   it is possible to browse the whole note tree, read and edit all types of notes, but you can create only text notes
-*   reading and editing [protected notes](../Basic%20Concepts/Note/Protected%20Notes.md) is possible, but creating them is not supported
+*   reading and editing [protected notes](../Basic%20Concepts%20and%20Features/Notes/Protected%20Notes.md) is possible, but creating them is not supported
 *   editing options is not supported
 *   cloning notes is not supported
 *   uploading file attachments is not supported

docs/User Guide/User Guide/Installation & Setup/Synchronization.md

@@ -63,7 +63,7 @@ This will disable TLS certificate verification, significantly reducing security
 
 ### Conflict Resolution
 
-If you edit the same note on multiple instances before synchronization, Trilium resolves conflicts by retaining the newer change and discarding the older one. The older version remains accessible in [note revisions](../Basic%20Concepts/Note/Note%20Revisions.md), allowing data recovery if needed.
+If you edit the same note on multiple instances before synchronization, Trilium resolves conflicts by retaining the newer change and discarding the older one. The older version remains accessible in [note revisions](../Basic%20Concepts%20and%20Features/Notes/Note%20Revisions.md), allowing data recovery if needed.
 
 ### Hash Check
 

docs/User Guide/User Guide/Note Types/Book.md

@@ -1,5 +1,5 @@
 # Book
-A **Book Note** in Trilium is a special type of [note](../Basic%20Concepts/Note.md) designed to display the contents of its child notes sequentially, creating a linear, book-like reading experience. This format is particularly useful for viewing multiple smaller notes in a cohesive, continuous manner.
+A **Book Note** in Trilium is a special type of [note](../Basic%20Concepts%20and%20Features/Notes.md) designed to display the contents of its child notes sequentially, creating a linear, book-like reading experience. This format is particularly useful for viewing multiple smaller notes in a cohesive, continuous manner.
 
 ![](1_Book_image.png)
 

docs/User Guide/User Guide/Note Types/Code.md

@@ -8,20 +8,20 @@ This can be useful for a few things:
     *   we call such JavaScript code notes "scripts" - see [Scripts](Code/Scripts.md)
 *   JSON, XML etc. can be used as storage for structured data (typically used in conjunction with scripting)
 
-For shorter snippets of code that can be embedded in [Text](Text.md) notes, see [Code blocks](Text/Code%20blocks.md).
+For shorter snippets of code that can be embedded in [Text](Text.md) notes, see [Code blocks](Text/Developer-specific%20formatting/Code%20blocks.md).
 
 ![](Code_image.png)
 
 ## Adjusting the language of a code note
 
-In the [Ribbon](../Basic%20Concepts/UI%20Elements/Ribbon.md), look for the _Note type_ selector and click it to reveal the possible note types. Inside of it there will be a section called _Code_, select any one of the languages.
+In the [Ribbon](../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md), look for the _Note type_ selector and click it to reveal the possible note types. Inside of it there will be a section called _Code_, select any one of the languages.
 
 ![](1_Code_image.png)
 
 ## Adjusting the list of languages
 
-Trilium supports syntax highlighting for many languages, but by default displays only some of them. The supported languages can be adjusted by going to [Options](../Basic%20Concepts/UI%20Elements/Options.md), then _Code Notes_ and looking for the _Available MIME types in the dropdown_ section. Simply check any of the items to add them to the list, or un-check them to remove them from the list.
+Trilium supports syntax highlighting for many languages, but by default displays only some of them. The supported languages can be adjusted by going to [Options](../Basic%20Concepts%20and%20Features/UI%20Elements/Options.md), then _Code Notes_ and looking for the _Available MIME types in the dropdown_ section. Simply check any of the items to add them to the list, or un-check them to remove them from the list.
 
 Note that the list of languages is not immediately refreshed, you'd have to manually [refresh the application](../Troubleshooting/Refreshing%20the%20application.md).
 
-The list of languages is also shared with the [Code blocks](Text/Code%20blocks.md) feature of [Text](Text.md) notes.
+The list of languages is also shared with the [Code blocks](Text/Developer-specific%20formatting/Code%20blocks.md) feature of [Text](Text.md) notes.

docs/User Guide/User Guide/Note Types/Relation Map.md

@@ -1,5 +1,5 @@
 # Relation Map
-Relation map is a type of [Note](../Basic%20Concepts/Note.md) which visualizes notes and their [relations](../Advanced%20Usage/Attributes.md). See an example:
+Relation map is a type of [Note](../Basic%20Concepts%20and%20Features/Notes.md) which visualizes notes and their [relations](../Advanced%20Usage/Attributes.md). See an example:
 
 ## Development process demo
 

docs/User Guide/User Guide/Note Types/Saved Search.md

@@ -5,4 +5,4 @@ Trilium allows you to save common searches as notes within the note tree. The se
 
 ## Location
 
-By default, saved searches are stored in the day note. However, you can designate a different note to store saved searches by marking it with the `#searchHome` label. Additionally, for [workspaces](../Basic%20Concepts/Navigation/Workspace.md), you can use the `#workspaceSearchHome` label to specify a storage location for saved searches within that workspace.
+By default, saved searches are stored in the day note. However, you can designate a different note to store saved searches by marking it with the `#searchHome` label. Additionally, for [workspaces](../Basic%20Concepts%20and%20Features/Navigation/Workspace.md), you can use the `#workspaceSearchHome` label to specify a storage location for saved searches within that workspace.

docs/User Guide/User Guide/Note Types/Text.md

@@ -20,7 +20,7 @@ Text notes are usually opened in edit mode. However, they may open in read-only
 
 In both cases, it is possible to switch back to editable mode using the ![](Text_bx-edit-alt.svg)button at top right of page.
 
-For more information, see [Read-Only Notes](../Basic%20Concepts/Note/Read-Only%20Notes.md).
+For more information, see [Read-Only Notes](../Basic%20Concepts%20and%20Features/Notes/Read-Only%20Notes.md).
 
 ## General Formatting
 
@@ -28,7 +28,6 @@ Since Trilium uses CKEditor, all of its formatting options are available here. Y
 
 *   **Bold**: Type `**text**` or `__text__`
 *   _Italic_: Type `*text*` or `_text_`
-*   `Code`: Type \`text\`
 *   ~~Strikethrough~~: Type `~~text~~`
 
 ### Lists
@@ -39,15 +38,14 @@ See [Lists](Text/Lists.md).
 
 *   Block quote: Start a line with `>` followed by a space
 
-### Multi-Line Code Blocks
+## Developer-specific formatting
 
-To create a multi-line code block, start a line with "\`\`\`\[lang\]", for example:
+The following features are supported:
 
-```
+*   Inline code
-if (1 > 2) {
+*   [Code blocks](Text/Developer-specific%20formatting/Code%20blocks.md)
-    console.log("Error in the matrix");
+
-}
+See [Developer-specific formatting](Text/Developer-specific%20formatting.md) for more information.
-```
 
 ### Headings
 

docs/User Guide/User Guide/Note Types/Text/Developer-specific formatting.md

@@ -0,0 +1,33 @@
+# Developer-specific formatting
+### Inline code
+
+Inline code formats text using a monospace font to indicate technical content in a sentence such as code, paths, etc.
+
+![](4_Developer-specific%20formatt.png)
+
+Example of inline code being used to illustrate file system paths as well as shell commands (`git` in this case).
+
+To insert an inline code:
+
+*   Via the [Formatting toolbar](Formatting%20toolbar.md), look for the ![](2_Developer-specific%20formatt.png) button.
+*   Type \`code\` where `code` is the desired text to be automatically formatted as inline code.
+
+### Code blocks
+
+Code blocks display a snippet of code as a dedicated block:
+
+![](3_Developer-specific%20formatt.png)
+
+A code block with JavaScript syntax highlight enabled.
+
+Note that these are not meant for very large portions of code. Use the dedicated [Code](../Code.md) note type instead.
+
+See the dedicated documentation for more information: [Code blocks](Developer-specific%20formatting/Code%20blocks.md)
+
+### Keyboard shortcuts
+
+This allows marking a portion of text as a shortcut key.
+
+![](Developer-specific%20formatt.png)
+
+To apply this style, press the ![](5_Developer-specific%20formatt.png) button in ![](1_Developer-specific%20formatt.png) group from the [Formatting toolbar](Formatting%20toolbar.md). On the floating toolbar, the buttons appear when selecting a text.

docs/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.md

@@ -3,11 +3,11 @@
 
 The code blocks feature allows entering pieces of code in text notes.
 
-Note that this feature is meant for generally small snippets of code. For larger files such as an entire log, see the dedicated [\[missing note\]](#root/pOsGYCXsbNQG/KSZ04uQ2D1St/FVuX89AJuFSw) note type instead.
+Note that this feature is meant for generally small snippets of code. For larger files such as an entire log, see the [Code blocks](Code%20blocks.md) note type instead.
 
 ## Inserting a code block
 
-*   Via the [Formatting toolbar](Formatting%20toolbar.md), look for the ![](Code%20blocks_image.png) button.
+*   Via the [Formatting toolbar](../Formatting%20toolbar.md), look for the ![](Code%20blocks_image.png) button.
     *   Pressing directly on the icon will insert a code block with the language that was selected most recently. If this is the first time a code block is inserted, the language will be “Auto-detected” by default.
     *   Pressing the arrow next to the icon, which will show a popup with the available languages.
 *   Type ` ``` ` (as in Markdown).
@@ -15,7 +15,7 @@ Note that this feature is meant for generally small snippets of code. For larger
 
 ## Syntax highlighting
 
-Since TriliumNext v0.90.12, Trilium will try to offer syntax highlighting to the code block. Note that the syntax highlighting mechanism is slightly different than the one in [Code Notes](../Code.md) notes as different technologies are involved.
+Since TriliumNext v0.90.12, Trilium will try to offer syntax highlighting to the code block. Note that the syntax highlighting mechanism is slightly different than the one in [Code Notes](../../Code.md) notes as different technologies are involved.
 
 When the language is set to _Auto-detected_, Trilium will try to identify the programming language (or similar) that corresponds to the given snippet of text and highlight it. If this is problematic, consider changing the language of the code block manually.
 
@@ -23,13 +23,13 @@ When the language is set to _Plain text_, there will be no syntax highlighting.
 
 ## Changing the language of a code block
 
-Simply click anywhere inside the code block and press again the code block button in the [Formatting toolbar](Formatting%20toolbar.md):  
+Simply click anywhere inside the code block and press again the code block button in the [Formatting toolbar](../Formatting%20toolbar.md):  
 ![](2_Code%20blocks_image.png)
 
 ## Adjusting the list of languages
 
-The code blocks feature shares the list of languages with the [Code Notes](../Code.md) note type.
+The code blocks feature shares the list of languages with the [Code Notes](../../Code.md) note type.
 
-The supported languages can be adjusted by going to [Options](../../Basic%20Concepts/UI%20Elements/Options.md), then _Code Notes_ and looking for the _Available MIME types in the dropdown_ section. Simply check any of the items to add them to the list, or uncheck them to remove them from the list.
+The supported languages can be adjusted by going to [Options](../../../Basic%20Concepts%20and%20Features/UI%20Elements/Options.md), then _Code Notes_ and looking for the _Available MIME types in the dropdown_ section. Simply check any of the items to add them to the list, or uncheck them to remove them from the list.
 
-Note that the list of languages is not immediately refreshed, you'd have to manually [refresh the application](../../Troubleshooting/Refreshing%20the%20application.md).
+Note that the list of languages is not immediately refreshed, you'd have to manually [refresh the application](../../../Troubleshooting/Refreshing%20the%20application.md).

docs/User Guide/User Guide/Note Types/Text/Formatting toolbar.md

@@ -1,7 +1,7 @@
 # Formatting toolbar
 Trilium allows two different editing experiences for text notes, based on your preference.
 
-To do so, go to [Options](../../Basic%20Concepts/UI%20Elements/Options.md) and look for the _Text Notes_ section. There is a corresponding section called _Formatting toolbar_.
+To do so, go to [Options](../../Basic%20Concepts%20and%20Features/UI%20Elements/Options.md) and look for the _Text Notes_ section. There is a corresponding section called _Formatting toolbar_.
 
 ## Floating
 
@@ -28,7 +28,7 @@ All the options here apply only to the selected portion of text, such as changin
 
 The fixed formatting offers a more traditional editing paradigm, usually useful if a lot of formatting is needed.
 
-All the options are combined into a single toolbar that will appear as part of the [Ribbon](../../Basic%20Concepts/UI%20Elements/Ribbon.md).
+All the options are combined into a single toolbar that will appear as part of the [Ribbon](../../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md).
 
 ![](2_Formatting%20toolbar_image.png)
 

docs/User Guide/User Guide/Note Types/Text/Formatting.md

@@ -1,10 +0,0 @@
-# Formatting
-## Developer-specific formatting
-
-### Keyboard shortcuts
-
-This allows marking a portion of text as a shortcut key.
-
-![](Formatting_image.png)
-
-To apply this style, press the ![](2_Formatting_image.png) button in ![](1_Formatting_image.png) group from the [Formatting toolbar](Formatting%20toolbar.md). On the floating toolbar, the buttons appear when selecting a text.

docs/User Guide/User Guide/Note Types/Text/Images.md

@@ -1,7 +1,7 @@
 # Images
 Trilium supports storing and displaying images. Supported formats are JPEG, PNG and GIF.
 
-An image can be uploaded in the form of note's [attachment](../../Basic%20Concepts/Note/Attachments.md) or as a standalone [note](../../Basic%20Concepts/Navigation/Tree%20Concepts.md) placed into the [note tree](../../Basic%20Concepts/Navigation/Tree%20Concepts.md). Its reference can be copied into a text note, in order to display it in the text itself.
+An image can be uploaded in the form of note's [attachment](../../Basic%20Concepts%20and%20Features/Notes/Attachments.md) or as a standalone [note](../../Basic%20Concepts%20and%20Features/Navigation/Tree%20Concepts.md) placed into the [note tree](../../Basic%20Concepts%20and%20Features/Navigation/Tree%20Concepts.md). Its reference can be copied into a text note, in order to display it in the text itself.
 
 ## Uploading images
 

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Advanced Showcases/Day Notes.html

@@ -27,7 +27,7 @@
         <p>
           <img src="1_Day Notes_image.png">
         </p>
-        <p>This pattern works well also because of <a href="../../Basic%20Concepts/Note/Cloning%20Notes.html">Cloning Notes</a> functionality
+        <p>This pattern works well also because of <a href="../../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.html">Cloning Notes</a> functionality
           - note can appear in multiple places in the note tree, so besides appearing
           under day note, it can also be categorized into other notes.</p>
         <h2>Demo</h2>

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Advanced Showcases/Task Manager.html

@@ -25,8 +25,8 @@
           and arbitrary tags - whenever you change tag attribute in the task note,
           this task is then automatically moved to appropriate location.</p>
         <p>Task Manager also integrates with <a href="Day%20Notes.html">day notes</a> -
-          notes are <a href="../../Basic%20Concepts/Note/Cloning%20Notes.html">cloned</a> into
+          notes are <a href="../../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.html">cloned</a> into
-          day note to both todoDate note and doneDate note (with <a href="../../Basic%20Concepts/Navigation/Tree%20Concepts.html">prefix</a> of
+          day note to both todoDate note and doneDate note (with <a href="../../Basic%20Concepts%20and%20Features/Navigation/Tree%20Concepts.html">prefix</a> of
           either "TODO" or "DONE").</p>
         <h2>Implementation</h2>
         <p>New tasks are created in the TODO note which has <code>~child:template</code> 

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes.html

@@ -72,7 +72,7 @@
           <li><code>**cssClass**</code>: Adds a CSS class to the note's representation
             in the tree</li>
           <li><code>**iconClass**</code>: Adds a CSS class to the note's icon, useful
-            for distinguishing notes visually. See <a href="../Basic%20Concepts/Note/Note%20Icons.html">note icons</a>
+            for distinguishing notes visually. See <a href="../Basic%20Concepts%20and%20Features/Notes/Note%20Icons.html">note icons</a>
           </li>
           <li><code>**pageSize**</code>: Specifies the number of items per page in note
             listings</li>
@@ -83,13 +83,13 @@
             component tree</li>
           <li><code>**workspace**</code>  <strong>and related attributes</strong>: See
             <a
-            href="../Basic%20Concepts/Navigation/Workspace.html">Workspace</a>for more details</li>
+            href="../Basic%20Concepts%20and%20Features/Navigation/Workspace.html">Workspace</a>for more details</li>
           <li><code>**searchHome**</code>: Specifies the parent for new search notes</li>
           <li><code>**inbox**</code>: Designates a default location for new notes created
             via the sidebar</li>
           <li><code>**sqlConsoleHome**</code>: Default location for SQL console notes</li>
           <li><code>**bookmarked**</code>  <strong>and</strong>  <code>**bookmarkFolder**</code>:
-            See <a href="../Basic%20Concepts/Navigation/Bookmarks.html">Bookmarks</a>
+            See <a href="../Basic%20Concepts%20and%20Features/Navigation/Bookmarks.html">Bookmarks</a>
           </li>
           <li><code>**shareXXX**</code>: See <a href="Sharing.html">Sharing</a>
           </li>

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Template.html

@@ -51,7 +51,7 @@
         </p>
         <p>For the template to appear in the menu, the template note must have the <code>#template</code> label.
           Do not confuse this with the <code>~template</code> relation, which links
-          the instance note to the template note. If you use <a href="../../Basic%20Concepts/Navigation/Workspace.html">workspaces</a>,
+          the instance note to the template note. If you use <a href="../../Basic%20Concepts%20and%20Features/Navigation/Workspace.html">workspaces</a>,
           you can also mark templates with <code>#workspaceTemplate</code> to display
           them only in the workspace.</p>
         <p>Templates can also be added or changed after note creation by creating

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Database.html

@@ -29,7 +29,7 @@
           </li>
           <li><a href="Advanced%20Showcases/Task%20Manager.html">Task Manager</a>
           </li>
-          <li><a href="../Basic%20Concepts/Themes.html">Custom CSS Themes</a>
+          <li><a href="../Basic%20Concepts%20and%20Features/Themes.html">Custom CSS Themes</a>
           </li>
         </ul>
         <h3>Restoring Demo Notes</h3>

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.html

@@ -14,7 +14,7 @@
 
       <div class="ck-content">
         <p>The SQL Console is Trilium's built-in database editor.</p>
-        <p>It can be accessed by going to the <a href="../../../Basic%20Concepts/UI%20Elements">global menu</a> →
+        <p>It can be accessed by going to the <a href="../../../Basic%20Concepts%20and%20Features/UI%20Elements">global menu</a> →
           Advanced → Open SQL Console.</p>
         <p>
           <img src="SQL Console_image.png">

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Note source.html

@@ -55,7 +55,7 @@
 &lt;/p&gt;</code></pre>
         <h2>Viewing the source code</h2>
         <p>It is possible to view the source code of a note by pressing the contextual
-          menu in&nbsp;<a class="reference-link" href="../Basic%20Concepts/UI%20Elements/Note%20buttons.html">Note buttons</a>&nbsp;and
+          menu in&nbsp;<a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20buttons.html">Note buttons</a>&nbsp;and
           selecting <em>Note source</em>.</p>
         <p>
           <img src="Note source_image.png" width="860" height="377">

src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Sharing.html

@@ -71,7 +71,7 @@
           <li><strong>Omitting Default CSS</strong>: For extensive styling changes,
             use the <code>#shareOmitDefaultCss</code> label to avoid conflicts with Trilium's
             <a
-            href="../Basic%20Concepts/Themes.html">default stylesheet</a>.</li>
+            href="../Basic%20Concepts%20and%20Features/Themes.html">default stylesheet</a>.</li>
         </ul>
         <h3>Adding JavaScript</h3>
         <p>You can inject custom JavaScript into the shared note using the <code>~shareJs</code> relation.