diff --git a/README.md b/README.md index 953d0d8e9..299b09ced 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,16 @@ Arch Linux | An Arch Linux package is available [here](https://aur.archlin 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 [Web Clipper Help Page](https://github.com/laurent22/joplin/blob/master/readme/clipper.md). +# Sponsors + + + +* * * + +| | | | +| :---: | :---: | :---: | +|
[Brandon D](https://github.com/bedwardly-down) |
[Devon Zuegel](https://github.com/devonzuegel) |
[小西　孝宗](https://github.com/konishi-t) + # Table of contents @@ -412,12 +422,6 @@ Current translations: # Contributors -Thank you to our top sponsors! - -| | | | -| :---: | :---: | :---: | -|
[Brandon D](https://github.com/bedwardly-down) |
[Devon Zuegel](https://github.com/devonzuegel) |
[小西　孝宗](https://github.com/konishi-t) - Thank you to everyone who've contributed to Joplin's source code! diff --git a/docs/api/index.html b/docs/api/index.html index d8b9dce6a..d7983df8a 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/api.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/changelog/index.html b/docs/changelog/index.html index 3e9875a29..de338508a 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/changelog_cli/index.html b/docs/changelog_cli/index.html index c3bcb4c22..07d3b5cca 100644 --- a/docs/changelog_cli/index.html +++ b/docs/changelog_cli/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/clipper/index.html b/docs/clipper/index.html index 10f4dbe6e..025268a2c 100644 --- a/docs/clipper/index.html +++ b/docs/clipper/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/clipper.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/debugging/index.html b/docs/debugging/index.html index 3e8e4cadb..d87594971 100644 --- a/docs/debugging/index.html +++ b/docs/debugging/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/debugging.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/desktop/index.html b/docs/desktop/index.html index 4bf147231..8391c4744 100644 --- a/docs/desktop/index.html +++ b/docs/desktop/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/desktop.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/donate/index.html b/docs/donate/index.html index cfbc58f10..523553d59 100644 --- a/docs/donate/index.html +++ b/docs/donate/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/donate.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/e2ee/index.html b/docs/e2ee/index.html index 6ad7631bb..86174457c 100644 --- a/docs/e2ee/index.html +++ b/docs/e2ee/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/e2ee.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • diff --git a/docs/faq/index.html b/docs/faq/index.html index ace25baa9..ef682130f 100644 --- a/docs/faq/index.html +++ b/docs/faq/index.html @@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/faq.md
  • Joplin Forum
  • Markdown Guide
  • How to enable end-to-end encryption
    • +
  • What is a conflict?
  • End-to-end encryption spec
  • How to enable debug mode
  • API documentation
    • @@ -354,18 +355,18 @@ https://github.com/laurent22/joplin/blob/master/readme/faq.md

    The editor command (may include arguments) defines which editor will be used to open a note. If none is provided it will try to auto-detect the default editor. If this does nothing or you want to change it for Joplin, you need to configure it in the Preferences -> Text editor command.

    Some example configurations are: (comments after #)

    Linux/Mac:

    -
    subl -n       # Opens Sublime (subl) in a new window (-n)
-code -n       # Opens Visual Studio Code (code) in a new window (-n)
+
    subl -n -w      # Opens Sublime (subl) in a new window (-n) and waits for close (-w)
+code -n --wait  # Opens Visual Studio Code (code) in a new window (-n) and waits for close (--wait)
 gedit --new-window    # Opens gedit (Gnome Text Editor) in a new window
-xterm -e vim  # Opens a new terminal and opens vim. Can be replaced with an
-              # alternative terminal (gnome-terminal, terminator, etc.) 
-              # or terminal text-editor (emacs, nano, etc.)
+xterm -e vim    # Opens a new terminal and opens vim. Can be replaced with an
+                # alternative terminal (gnome-terminal, terminator, etc.) 
+                # or terminal text-editor (emacs, nano, etc.)
 open -a <application> # Mac only: opens a GUI application
 
    
 
    Windows:
    
-
    subl.exe -n   # Opens Sublime (subl) in a new window (-n)
-code.exe -n   # Opens Visual Studio Code in a new window (-n)
-notepad.exe   # Opens Notepad in a new window
+
    subl.exe -n -w      # Opens Sublime (subl) in a new window (-n) and waits for close (-w)
+code.exe -n --wait  # Opens Visual Studio Code in a new window (-n) and waits for close (--wait)
+notepad.exe         # Opens Notepad in a new window
 notepad++.exe --openSession   # Opens Notepad ++ in new window
 
    
 
    Note that the path to directory with your editor executable must exist in your PATH variable (Windows, Linux/Mac) If not, the full path to the executable must be provided.
    
diff --git a/docs/gsoc2020/ideas/index.html b/docs/gsoc2020/ideas/index.html
index fb86db7e8..a9f87f514 100644
--- a/docs/gsoc2020/ideas/index.html
+++ b/docs/gsoc2020/ideas/index.html
@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/ideas.md
 
  • Joplin Forum
    • 
 
  • Markdown Guide
    • 
 
  • How to enable end-to-end encryption
    • 
+
  • What is a conflict?
    • 
 
  • End-to-end encryption spec
    • 
 
  • How to enable debug mode
    • 
 
  • API documentation
    • 
diff --git a/docs/gsoc2020/index.html b/docs/gsoc2020/index.html
index 0018a8b88..3273a9425 100644
--- a/docs/gsoc2020/index.html
+++ b/docs/gsoc2020/index.html
@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/index.md
 
  • Joplin Forum
    • 
 
  • Markdown Guide
    • 
 
  • How to enable end-to-end encryption
    • 
+
  • What is a conflict?
    • 
 
  • End-to-end encryption spec
    • 
 
  • How to enable debug mode
    • 
 
  • API documentation
    • 
diff --git a/docs/gsod2020/ideas/index.html b/docs/gsod2020/ideas/index.html
index 1b3ca91dc..79c446e01 100644
--- a/docs/gsod2020/ideas/index.html
+++ b/docs/gsod2020/ideas/index.html
@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/ideas.md
 
  • Joplin Forum
    • 
 
  • Markdown Guide
    • 
 
  • How to enable end-to-end encryption
    • 
+
  • What is a conflict?
    • 
 
  • End-to-end encryption spec
    • 
 
  • How to enable debug mode
    • 
 
  • API documentation
    • 
diff --git a/docs/gsod2020/index.html b/docs/gsod2020/index.html
index 9f5c95124..e0bf9bad1 100644
--- a/docs/gsod2020/index.html
+++ b/docs/gsod2020/index.html
@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/index.md
 
  • Joplin Forum
    • 
 
  • Markdown Guide
    • 
 
  • How to enable end-to-end encryption
    • 
+
  • What is a conflict?
    • 
 
  • End-to-end encryption spec
    • 
 
  • How to enable debug mode
    • 
 
  • API documentation
    • 
diff --git a/docs/images/sponsors/SeireiNetwork.png b/docs/images/sponsors/SeireiNetwork.png
new file mode 100644
index 000000000..fff249166
Binary files /dev/null and b/docs/images/sponsors/SeireiNetwork.png differ
diff --git a/docs/index.html b/docs/index.html
index ae98df46d..bb1ae5b19 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/README.md
 
  • Joplin Forum
    • 
 
  • Markdown Guide
    • 
 
  • How to enable end-to-end encryption
    • 
+
  • What is a conflict?
    • 
 
  • End-to-end encryption spec
    • 
 
  • How to enable debug mode
    • 
 
  • API documentation
    • 
@@ -436,6 +437,25 @@ https://github.com/laurent22/joplin/blob/master/README.md
 
 
    Web Clipper🔗
    
 
    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 Web Clipper Help Page.
    
+
    Sponsors🔗
    
+
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

    Brandon D
    Devon Zuegel
    小西　孝宗
    
 
    Features🔗