Skip to content

Commit d6fa952

Browse files
authored
Merge pull request #230 from Zettlr/docs-4.0
chore: Update English documentation in preparation for 4.0
2 parents b6cc9e2 + b932afc commit d6fa952

285 files changed

Lines changed: 4884 additions & 3216 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
# For setup, see https://www.mkdocs.org/#installation
1515
steps:
1616
- uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0 # Needed for the revisions plugin to work
1719
- name: Set up Python 3.10
1820
uses: actions/setup-python@v5
1921
with:
@@ -22,6 +24,7 @@ jobs:
2224
run: |
2325
python -m pip install --upgrade pip
2426
pip install mkdocs
27+
pip install mkdocs-git-revision-date-localized-plugin
2528
2629
# Now we can build the thing
2730
- name: Build the documentation
@@ -32,7 +35,7 @@ jobs:
3235
uses: easingthemes/ssh-deploy@v5.1.0
3336
env:
3437
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
35-
ARGS: "-vzhr"
38+
ARGS: "-vzhr --delete" # verbose, compress, human-readble, recursive, delete
3639
SOURCE: "build/"
3740
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
3841
REMOTE_USER: ${{ secrets.REMOTE_USER }}

assets/app.css

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,11 @@ nav.my-nav-top a:active {
4545
}
4646

4747
/*
48-
* Blockquotes are "misused" as info blocks
48+
* Blockquote styling
4949
*/
5050
div[role="main"] blockquote {
51-
color: #0e5a3f;
52-
border-left: 5px solid #1cb27e;
53-
padding: 10px;
54-
position: relative;
55-
padding-left: 10px;
56-
}
57-
58-
/*
59-
* As the theme is using Font Awesome either way we can make use of it for
60-
* displaying a small (i) icon.
61-
*/
62-
div[role="main"] blockquote::before {
63-
font-family: "FontAwesome";
64-
position: absolute;
65-
top: 10px;
66-
left: -30px;
67-
color: #127e58;
68-
font-style: normal;
69-
content: "\f05a";
70-
}
71-
72-
/*
73-
* The parser adds a paragraph inside the blockquote, so we have to remove the
74-
* bottom margin on these.
75-
*/
76-
div[role="main"] blockquote p { margin-bottom: 0px; }
77-
78-
/*
79-
* Links in these boxes should have different colours.
80-
*/
81-
div[role="main"] blockquote a {
82-
color: inherit;
83-
text-decoration: underline;
84-
}
85-
86-
div[role="main"] blockquote a:hover {
87-
color: inherit;
88-
text-decoration: none;
51+
border-left: 2px solid #1cb27e;
52+
padding-left: 20px;
8953
}
9054

9155
/*

config/de.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ markdown_extensions:
6161
plugins:
6262
- search:
6363
lang: de
64+
- git-revision-date-localized
65+
validation:
66+
omitted_files: warn
67+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
68+
unrecognized_links: warn
69+
anchors: warn # New in MkDocs 1.6

config/en.yml

Lines changed: 88 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ site_description: >-
55
Our comprehensive documentation provides you with everything you need to
66
know about how to make the most of Zettlr.
77
site_author: Hendrik Erz
8-
copyright: "© 2017-2023 by Zettlr"
8+
copyright: "© 2017-2025 by Zettlr"
99
docs_dir: ../docs/en
1010
site_dir: ../build/en
1111
edit_uri: edit/master/docs/en
@@ -20,64 +20,106 @@ nav:
2020
- A Note on Security: getting-started/a-note-on-security.md
2121
- Get involved: getting-started/get-involved.md
2222
- Troubleshooting: getting-started/troubleshooting.md
23+
- FAQ: reference/faq.md
2324
- First Time Users:
24-
- The User Interface: core/user-interface.md
25-
- Importing Files: core/import.md
26-
- Basic Usage:
27-
- Workspaces and Folders: core/workspaces.md
28-
- Files: core/files.md
29-
- File Manager: core/file-manager.md
30-
- Split View: core/split-view.md
31-
- Sidebar: core/sidebar.md
32-
- Writing Markdown: core/writing-markdown.md
33-
- Working With Comments: core/comments.md
34-
- Style and Grammar: core/style-and-grammar.md
35-
- Readability: core/readability.md
36-
- Statusbar: core/statusbar.md
37-
- AutoCorrect and MagicQuotes: core/autocorrect.md
38-
- Citations: core/citations.md
39-
- Math: core/math.md
40-
- Code Blocks: core/code-blocks.md
41-
- Snippets: core/snippets.md
42-
- Searching: core/search.md
43-
- Table Editor: core/tables.md
44-
- Print and Preview: core/print-preview.md
45-
- Exporting: core/export.md
46-
- Writing Statistics: core/writing-statistics.md
47-
- Advanced Usage:
48-
- YAML Frontmatter: advanced/yaml-frontmatter.md
49-
- Text Transforms: advanced/text-transforms.md
50-
- Assets Manager: advanced/assets-manager.md
51-
- Defaults Files: advanced/defaults-files.md
52-
- Custom Templates: advanced/custom-templates.md
53-
- Custom CSS: advanced/custom-css.md
54-
- Tag Manager: advanced/tag-manager.md
55-
- Projects: advanced/projects.md
56-
- Pomodoro Timer: advanced/pomodoro.md
57-
- Zettelkasten Methods: advanced/zkn-method.md
58-
- Graph View: advanced/graph.md
25+
- First Steps: first-time-users/first-steps.md
26+
- Workspaces: first-time-users/workspaces.md
27+
- Creating Files and Folders: first-time-users/creating-files-and-folders.md
28+
- Writing Markdown: first-time-users/writing-markdown.md
29+
- Migrating from Word: first-time-users/import.md
30+
- Exporting files: first-time-users/exporting-files.md
31+
- File Manager:
32+
- File Manager: file-manager/index.md
33+
- Workspaces and Root Files: file-manager/workspaces-root-files.md
34+
- Choosing Which Files To Display: file-manager/choosing-files.md
35+
- Appearance (Modes): file-manager/appearance.md
36+
- File List: file-manager/file-list.md
37+
- Properties: file-manager/properties.md
38+
- Filtering: file-manager/filtering.md
39+
- Global Search: file-manager/search.md
40+
- Projects: file-manager/projects.md
41+
- Split View:
42+
- Split View: split-view/index.md
43+
- Document Tab Bar: split-view/document-tab-bar.md
44+
- Markdown Editor: split-view/markdown-editor.md
45+
- Code Editor: split-view/code-editor.md
46+
- Image Viewer: split-view/image-viewer.md
47+
- PDF Viewer: split-view/pdf-viewer.md
48+
- Sidebar:
49+
- Sidebar: sidebar/index.md
50+
- Table of Contents: sidebar/table-of-contents.md
51+
- References: sidebar/bibliography.md
52+
- Related Files: sidebar/related-files.md
53+
- Other Files: sidebar/other-files.md
54+
- Markdown Editor:
55+
- Markdown Editor: editor/index.md
56+
- Markdown Compendium: editor/markdown-compendium.md
57+
- Appearance: editor/appearance.md
58+
- Search: editor/search.md
59+
- Autocomplete: editor/autocomplete.md
60+
- Footnotes: editor/footnotes.md
61+
- Citations: editor/citations.md
62+
- Working With Comments: editor/comments.md
63+
- Status bar: editor/statusbar.md
64+
- Table Editor: editor/tables.md
65+
- Text Transforms: editor/text-transforms.md
66+
- Snippets: editor/snippets.md
67+
- YAML Front Matter: editor/yaml-frontmatter.md
68+
- Language & Style:
69+
- Language & Style: language-style/index.md
70+
- Spellchecking: language-style/spellchecking.md
71+
- LanguageTool: language-style/languagetool.md
72+
- Markdown Syntax: language-style/syntax.md
73+
- AutoCorrect and MagicQuotes: language-style/autocorrect.md
74+
- Readability: language-style/readability.md
75+
- Exporting:
76+
- Exporting: export/index.md
77+
- Workflow: export/workflow.md
78+
- Defaults Files (Profiles): export/defaults-files.md
79+
- Assets Manager: export/assets-manager.md
80+
- Custom Templates: export/custom-templates.md
81+
- Custom Commands: export/custom-commands.md
82+
- Print and Preview: export/print-preview.md
83+
- Lua Filters: export/lua-filters.md
84+
- Scientific & Technical:
85+
- Scientific & Technical: scientific-technical/index.md
86+
- Math: scientific-technical/math.md
87+
- Code Blocks: scientific-technical/code-blocks.md
88+
- Mermaid Diagrams: scientific-technical/mermaid.md
89+
- Pomodoro Timer: scientific-technical/pomodoro.md
90+
- Writing Statistics: scientific-technical/writing-statistics.md
91+
- PKMS/Zettelkasten:
92+
- PKMS/Zettelkasten: pkms/index.md
93+
- Zettelkasten Methods: pkms/zkn-method.md
94+
- Graph View: pkms/graph.md
95+
- Tag Manager: pkms/tag-manager.md
5996
- Guides:
97+
- Guides: guides/index.md
98+
- Customizing Zettlr with CSS: guides/custom-css.md
99+
- Zotero Integration: guides/reference-manager-integration.md
60100
- LanguageTool Locally: guides/languagetool-local.md
61101
- Presentations: guides/presentations.md
62102
- Submitting to a Journal using a LaTeX Template: guides/journal-latex-template.md
63103
- Portable App: guides/portable.md
64-
- References:
65-
- FAQ: reference/faq.md
104+
- Reference:
105+
- Reference: reference/index.md
66106
- Keyboard Shortcuts: reference/keyboard-shortcuts.md
67-
- Markdown Basics: reference/markdown-basics.md
68107
- Settings: reference/settings.md
69-
- Spell Checking: reference/spell-checking.md
70108
theme:
71109
name: readthedocs
72110
locale: en
73111
custom_dir: ../theme_override
74112
highlightjs: True
113+
hljs_style: github
114+
hljs_style_dark: github_dark
75115
prev_next_buttons_location: both
76116
hljs_languages:
77117
- javascript
118+
- markdown
78119
- css
79120
- yaml
80121
- latex
122+
- lua
81123
markdown_extensions:
82124
- def_list
83125
- admonition
@@ -86,3 +128,9 @@ markdown_extensions:
86128
plugins:
87129
- search:
88130
lang: en
131+
- git-revision-date-localized
132+
validation:
133+
omitted_files: warn
134+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
135+
unrecognized_links: warn
136+
anchors: warn # New in MkDocs 1.6

config/es.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,9 @@ markdown_extensions:
7474
plugins:
7575
- search:
7676
lang: es
77+
- git-revision-date-localized
78+
validation:
79+
omitted_files: warn
80+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
81+
unrecognized_links: warn
82+
anchors: warn # New in MkDocs 1.6

config/fr.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,9 @@ markdown_extensions:
7676
plugins:
7777
- search:
7878
lang: fr
79+
- git-revision-date-localized
80+
validation:
81+
omitted_files: warn
82+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
83+
unrecognized_links: warn
84+
anchors: warn # New in MkDocs 1.6

config/it.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ markdown_extensions:
6161
plugins:
6262
- search:
6363
lang: it
64+
- git-revision-date-localized
65+
validation:
66+
omitted_files: warn
67+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
68+
unrecognized_links: warn
69+
anchors: warn # New in MkDocs 1.6

config/ja.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,9 @@ markdown_extensions:
7373
plugins:
7474
- search:
7575
lang: jp
76+
- git-revision-date-localized
77+
validation:
78+
omitted_files: warn
79+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
80+
unrecognized_links: warn
81+
anchors: warn # New in MkDocs 1.6

config/ru.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,9 @@ markdown_extensions:
8484
plugins:
8585
- search:
8686
lang: ru
87+
- git-revision-date-localized
88+
validation:
89+
omitted_files: warn
90+
absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6
91+
unrecognized_links: warn
92+
anchors: warn # New in MkDocs 1.6

docs/en/advanced/assets-manager.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)