diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index e0ddcbf46..5eb741f0d 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -6100,6 +6100,13 @@ "value": "nRhnJkTT8cPs", "isInheritable": false, "position": 50 + }, + { + "type": "relation", + "name": "internalLink", + "value": "oPVyFC7WL2Lp", + "isInheritable": false, + "position": 60 } ], "format": "markdown", @@ -6114,15 +6121,7 @@ "dataFileName": "Links_image.png" }, { - "attachmentId": "74XnfiCk2y9N", - "title": "create-link-to-note.gif", - "role": "image", - "mime": "image/gif", - "position": 10, - "dataFileName": "Links_create-link-to-note.gif" - }, - { - "attachmentId": "GH0rUFn6UUDY", + "attachmentId": "4OJh3ujbwosA", "title": "image.png", "role": "image", "mime": "image/png", @@ -6130,12 +6129,20 @@ "dataFileName": "1_Links_image.png" }, { - "attachmentId": "w1jpXjdAuL2B", + "attachmentId": "GH0rUFn6UUDY", "title": "image.png", "role": "image", "mime": "image/png", "position": 10, "dataFileName": "2_Links_image.png" + }, + { + "attachmentId": "w1jpXjdAuL2B", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "3_Links_image.png" } ] }, diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png index 03fdc6792..1bd071c53 100644 Binary files a/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png and b/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png index 72b2415d5..03fdc6792 100644 Binary files a/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png and b/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/3_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/3_Links_image.png new file mode 100644 index 000000000..72b2415d5 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/3_Links_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Links.md b/docs/User Guide/User Guide/Note Types/Text/Links.md index 39649ff91..828a88de2 100644 --- a/docs/User Guide/User Guide/Note Types/Text/Links.md +++ b/docs/User Guide/User Guide/Note Types/Text/Links.md @@ -5,7 +5,7 @@ An external link is a standard web link targeting for example a website. For exa To create a link without a custom text: -* Press in the Formatting toolbar: +* Press in the Formatting toolbar: * A popup will appear, type or paste the URL in the box. * Press Enter or the check mark icon to confirm. * Alternatively, press Ctrl+K to trigger the aforementioned popup. @@ -21,26 +21,43 @@ Once a link is inserted: * The text inside the link can be changed if needed but the link itself will remain. * To modify the link, click on the link to display the popup and press the _Edit link_ button. -* To remove a link, click on it and press the _Unlink_ button. +* To remove a link, click on it and press the _Unlink_ button. You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab". ## Internal links to notes -Links to internal notes are created a bit differently. To create link to note at current cursor position, press Ctrl + L. +Unlike external notes, internal links (links to other notes) can be created at the current position by : -In the dialog you can see radio button to choose from different types of linking: +1. Pressing Ctrl + L or the button from the Formatting toolbar. +2. Filling in the desired note to link. It's also possible to create notes from this dialog by typing a non-existing note title and selecting _Create and link child note_. -* link title mirrors the note's current title - this is sometimes also called "reference link". Title of such links cannot be changed, instead it is always mirroring the title of linked note. This way the link title is never outdated -* link title can be changed arbitrarily - this is the traditional hyperlink - you link to a particular note and can choose the link title +There are two link types, adjustable when creating the link to the note: -![](Links_create-link-to-note.gif) +1. _link title mirrors the note's current title_ + 1. This is sometimes also called "reference link". + 2. Title of such links cannot be changed, instead it is always mirroring the title of linked note. + 3. The icon of the note is also displayed. + 4. The link title will automatically update if the title of the note is changed. +2. _link title can be changed arbitrarily_ + 1. This is the traditional hyperlink, where the text of the link can be different to the note title. -You can follow the note link by double clicking it. +Once an internal link is created: -Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview. +* You can follow the note link by double clicking it. +* Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview. -### In-place linking +## Pasting links + +* For internal links (links to notes in Trilium), press Ctrl+C in the Note Tree: + * Pasting directly in a text note will create a reference link (with an icon to the note and the actual note title). + * Pasting over an existing text will create a traditional link. +* For external links: + * Paste the raw URL directly and press space to turn it into a link. + * Select a text and paste the URL over it to turn that text into a link. + * If you are pasting a formatted link (e.g. from the a webpage in a browser), simply paste it and it will keep the original text and URL. + +## In-place linking Trilium also provides "inline" linking - type `@` and you'll see an autocomplete, just type few characters from the desired note title, press enter and you have a link. diff --git a/docs/User Guide/User Guide/Note Types/Text/Links_create-link-to-note.gif b/docs/User Guide/User Guide/Note Types/Text/Links_create-link-to-note.gif deleted file mode 100644 index e2e2ab913..000000000 Binary files a/docs/User Guide/User Guide/Note Types/Text/Links_create-link-to-note.gif and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png index 03fdc6792..1bd071c53 100644 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png index 72b2415d5..03fdc6792 100644 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Links_image.png new file mode 100644 index 000000000..72b2415d5 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html index 17e3b4c06..5ed5cfeab 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html @@ -5,7 +5,7 @@

To create a link without a custom text: