diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Note source.html b/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Note source.html
index f55ffaaba..1fcc4acbb 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Note source.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Note source.html
@@ -55,7 +55,7 @@
</p>
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Sharing.html b/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Sharing.html
index a8bf2a092..55d130b8c 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Sharing.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Advanced Usage/Sharing.html
@@ -71,7 +71,7 @@
Note
+Notes
Note is a central entity in Trilium. Main attributes of note are title @@ -47,7 +47,7 @@ tree. All other notes are placed below it in the structure.
Tree structure
Importantly, note itself doesn't carry information on its placement in - note tree. See cloning for details.
+ note tree. See cloning 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 @@ -73,7 +73,7 @@ anymore to recover them (unless you restore backup).
See also
Attachments
A note in Trilium can own one or more +
A note 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. diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Cloning Notes.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes.html similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Cloning Notes.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes.html diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Export as PDF.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF.html similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Export as PDF.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF.html diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Export as PDF_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF_image.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Export as PDF_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF_image.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Note Icons.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons.html similarity index 84% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Note Icons.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons.html index 9713f5fdb..2a8fa5696 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Note Icons.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons.html @@ -14,8 +14,8 @@
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
+ 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:
- The icon of a launcher can be changed just like a normal note. See Note Icons for more information. + href="../Notes/Note%20Icons.html">Note Icons for more information.
- The title of the launcher can also be changed.
Resetting
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar_image.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar_image.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note Tree.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree.html similarity index 95% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note Tree.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree.html index 687a689fc..d73b3b611 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note Tree.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree.html @@ -44,7 +44,7 @@You can also move notes using the familiar cut and paste functions available
in the context menu, or with the associated keyboard shortcuts: CTRL-C (
copy), Ctrl + X (cut) and Ctrl + V (paste).
Multiple selection
It is possible to select multiple notes at one time.
To do so, first select the note to start the selection with. Then hold diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note Tree_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree_image.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note Tree_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree_image.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note buttons.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons.html similarity index 83% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note buttons.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons.html index 8f238af6c..0a517e12a 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Note buttons.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons.html @@ -19,12 +19,12 @@
- The Note Revisions button displays the Note Revisions for that particular - note. + href="../Notes/Note%20Revisions.html">Note Revisions for that + particular note.
- The contextual menu offers commands for the note or its subtree, such as import, export, viewing the Note source code or Attachments. + class="reference-link" href="../Notes/Attachments.html">Attachments.
JS Frontend note in Trilium and paste in the code
above.#widget attribute to
- the note.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 has
+ returned, double-check that the note has
the #widget attribute.
Step 2: Adding an UI Element
Next, let's improve the widget by adding a button to it.
const template = ``;
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/FAQ.html b/src/public/app/doc_notes/en/User Guide/User Guide/FAQ.html
index b13b3f51b..8d2e43f4f 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/FAQ.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/FAQ.html
@@ -70,9 +70,9 @@
with probably more problems.
More detailed answer:
- - clones are what
- you might call "hard directory link" in filesystem lingo, but this concept
- is not implemented in any filesystem
+ - clones 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
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html
index 410840f42..3cb53e526 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html
@@ -36,7 +36,7 @@
- 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 is
+
- reading and editing protected notes is
possible, but creating them is not supported
- editing options is not supported
- cloning notes is not supported
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html
index 330e99a9c..49bc05d61 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Synchronization.html
@@ -97,7 +97,7 @@
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,
+ the older one. The older version remains accessible in note revisions,
allowing data recovery if needed.
Hash Check
After each synchronization, Trilium computes a hash of all synced data
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Book.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Book.html
index 171d2f9c5..fd5b0a005 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Book.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Book.html
@@ -13,7 +13,7 @@
Book
- A Book Note in Trilium is a special type of note designed
+
A Book Note in Trilium is a special type of note 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.
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Code.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Code.html
index c1c795055..7a478a9a5 100644
--- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Code.html
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Code.html
@@ -29,12 +29,12 @@
in conjunction with scripting)
For shorter snippets of code that can be embedded in Text notes,
- see Code blocks.
+ see Code blocks.
Adjusting the language of a code note
- In the Ribbon,
+
In the Ribbon,
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.
@@ -44,13 +44,13 @@
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,
+ going to Options,
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.
- The list of languages is also shared with the Code blocks feature
+
The list of languages is also shared with the Code blocks feature
of Text notes.
Relation Map
Relation map is a type of Note which +
Relation map is a type of Note which visualizes notes and their relations. See an example:
Development process demo
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Saved Search.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Saved Search.html index 254834834..25bb1c416 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Saved Search.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Saved Search.html @@ -22,7 +22,7 @@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,
+ Additionally, for workspaces,
you can use the #workspaceSearchHome label to specify a storage
location for saved searches within that workspace.
In both cases, it is possible to switch back to editable mode using the
button at top right of page.
For more information, see Read-Only Notes.
+For more information, see Read-Only Notes.
General Formatting
Since Trilium uses CKEditor, all of its formatting options are available here. You may use the graphical toolbar shown above, or enter formatting @@ -47,21 +47,24 @@
*text* or _text_
Code: Type `text`~~text~~
+ ~~text~~
Lists
-See Lists.
+See Lists.
Blocks
- Block quote: Start a line with
>followed by a space
Multi-Line Code Blocks
-To create a multi-line code block, start a line with "```[lang]", for - example:
if (1 > 2) {
- console.log("Error in the matrix");
-}Developer-specific formatting
+The following features are supported:
+-
+
- Inline code +
- Code blocks + +
See Developer-specific formatting for + more information.
Headings
Create headings by starting a line with ## for heading 2, ### for
heading 3, and so on up to heading 6. Note that # is reserved
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Developer-specific formatt.png
similarity index 100%
rename from src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Formatting_image.png
rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Developer-specific formatt.png
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Developer-specific formatt.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Developer-specific formatt.png
new file mode 100644
index 000000000..912f36d47
Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Developer-specific formatt.png differ
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Developer-specific formatt.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Developer-specific formatt.png
new file mode 100644
index 000000000..ef28ed50d
Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Developer-specific formatt.png differ
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Developer-specific formatt.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Developer-specific formatt.png
new file mode 100644
index 000000000..bf5085b4c
Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Developer-specific formatt.png differ
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/5_Developer-specific formatt.png
similarity index 100%
rename from src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Formatting_image.png
rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/5_Developer-specific formatt.png
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatt.png
similarity index 100%
rename from src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting_image.png
rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatt.png
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting.html
new file mode 100644
index 000000000..7fd394fce
--- /dev/null
+++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting.html
@@ -0,0 +1,60 @@
+
+
+
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.
+
+ git in this case).To insert an inline code:
+-
+
- Via the Formatting toolbar,
+ look for the
+
button.
+ - Type `code` where
codeis the desired text to be automatically + formatted as inline code.
+
Code blocks
+Code blocks display a snippet of code as a dedicated block:
+
+ Note that these are not meant for very large portions of code. Use the + dedicated Code note + type instead.
+See the dedicated documentation for more information: Code blocks +
+Keyboard shortcuts
+This allows marking a portion of text as a shortcut key.
+
+ 
+
To apply this style, press the
+ 
button in
+ 
group from the Formatting toolbar.
+ On the floating toolbar, the buttons appear when selecting a text.
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] note - type instead.
+ For larger files such as an entire log, see the Code blocks note type instead.Inserting a code block
-
-
- Via the Formatting toolbar, look - for the +
- Via the Formatting toolbar,
+ look for the
button.
- Pressing directly on the icon will insert a code block with the language
@@ -43,8 +43,8 @@
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 notes as - different technologies are involved.
+ different than the one in Code Notes 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 @@ -53,19 +53,20 @@ 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: + button in the Formatting toolbar:
Adjusting the list of languages
-The code blocks feature shares the list of languages with the Code Notes note - type.
-The supported languages can be adjusted by going to Options, +
The code blocks feature shares the list of languages with the + Code Notes note type.
+The supported languages can be adjusted by going to Options, 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.
+ to manually refresh the application.
- Pressing directly on the icon will insert a code block with the language
@@ -43,8 +43,8 @@
- 
button in
- 
group from the