Update website

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
+
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a>
+
+* * *
+
+|     |     |     |
+| :---: | :---: | :---: |
+| <img width="50" src="https://avatars3.githubusercontent.com/u/59133880?s=96&v=4"/></br>[Brandon D](https://github.com/bedwardly-down) | <img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br>[Devon Zuegel](https://github.com/devonzuegel) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[小西　孝宗](https://github.com/konishi-t)
+
 <!-- TOC -->
 # Table of contents
 
@@ -412,12 +422,6 @@ Current translations:
 
 # Contributors
 
-Thank you to our top sponsors!
-
-|     |     |     |
-| :---: | :---: | :---: |
-| <img width="50" src="https://avatars3.githubusercontent.com/u/59133880?s=96&v=4"/></br>[Brandon D](https://github.com/bedwardly-down) | <img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br>[Devon Zuegel](https://github.com/devonzuegel) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[小西　孝宗](https://github.com/konishi-t)
-
 Thank you to everyone who've contributed to Joplin's source code!
 
 <!-- CONTRIBUTORS-TABLE-AUTO-GENERATED -->

docs/api/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/api.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/changelog/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/changelog_cli/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/clipper/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/clipper.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/debugging/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/debugging.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/desktop/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/desktop.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/donate/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/donate.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/e2ee/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/e2ee.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/faq/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/faq.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>
@@ -354,8 +355,8 @@ https://github.com/laurent22/joplin/blob/master/readme/faq.md
 <p>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 -&gt; Text editor command.</p>
 <p>Some example configurations are: (comments after #)</p>
 <p>Linux/Mac:</p>
-<pre><code class="language-bash">subl -n       # Opens Sublime (subl) in a new window (-n)
+<pre><code class="language-bash">subl -n -w      # Opens Sublime (subl) in a new window (-n) and waits for close (-w)
-code -n       # Opens Visual Studio Code (code) in a new window (-n)
+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.) 
@@ -363,8 +364,8 @@ xterm -e vim  # Opens a new terminal and opens vim. Can be replaced with an
 open -a &lt;application&gt; # Mac only: opens a GUI application
 </code></pre>
 <p>Windows:</p>
-<pre><code class="language-bash">subl.exe -n   # Opens Sublime (subl) in a new window (-n)
+<pre><code class="language-bash">subl.exe -n -w      # Opens Sublime (subl) in a new window (-n) and waits for close (-w)
-code.exe -n   # Opens Visual Studio Code in a new window (-n)
+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
 </code></pre>

docs/gsoc2020/ideas/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/ideas.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/gsoc2020/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsoc2020/index.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/gsod2020/ideas/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/ideas.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/gsod2020/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/gsod2020/index.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/README.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>
@@ -436,6 +437,25 @@ https://github.com/laurent22/joplin/blob/master/README.md
 </table>
 <h2>Web Clipper<a name="web-clipper" href="#web-clipper" class="heading-anchor">🔗</a></h2>
 <p>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 <a href="https://joplinapp.org/clipper/">Web Clipper Help Page</a>.</p>
+<h1>Sponsors<a name="sponsors" href="#sponsors" class="heading-anchor">🔗</a></h1>
+<p><a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a></p>
+<hr>
+<table>
+<thead>
+<tr>
+<th style="text-align:center"></th>
+<th style="text-align:center"></th>
+<th style="text-align:center"></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align:center"><img width="50" src="https://avatars3.githubusercontent.com/u/59133880?s=96&v=4"/></br><a href="https://github.com/bedwardly-down">Brandon D</a></td>
+<td style="text-align:center"><img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br><a href="https://github.com/devonzuegel">Devon Zuegel</a></td>
+<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br><a href="https://github.com/konishi-t">小西　孝宗</a></td>
+</tr>
+</tbody>
+</table>
 <h1>Features<a name="features" href="#features" class="heading-anchor">🔗</a></h1>
 <ul>
 <li>Desktop, mobile and terminal applications.</li>
@@ -992,23 +1012,6 @@ Details:
 </table>
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 <h1>Contributors<a name="contributors" href="#contributors" class="heading-anchor">🔗</a></h1>
-<p>Thank you to our top sponsors!</p>
-<table>
-<thead>
-<tr>
-<th style="text-align:center"></th>
-<th style="text-align:center"></th>
-<th style="text-align:center"></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td style="text-align:center"><img width="50" src="https://avatars3.githubusercontent.com/u/59133880?s=96&v=4"/></br><a href="https://github.com/bedwardly-down">Brandon D</a></td>
-<td style="text-align:center"><img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br><a href="https://github.com/devonzuegel">Devon Zuegel</a></td>
-<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br><a href="https://github.com/konishi-t">小西　孝宗</a></td>
-</tr>
-</tbody>
-</table>
 <p>Thank you to everyone who've contributed to Joplin's source code!</p>
 <!-- CONTRIBUTORS-TABLE-AUTO-GENERATED -->
 <table>

docs/markdown/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/markdown.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/mobile/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/mobile.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/nextcloud_app/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/nextcloud_app.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/prereleases/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/prereleases.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/spec/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/spec.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/stats/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/stats.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>

docs/terminal/index.html

@@ -315,6 +315,7 @@ https://github.com/laurent22/joplin/blob/master/readme/terminal.md
 <li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
 <li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
 <li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
 <li><a href="https://joplinapp.org/spec/">End-to-end encryption spec</a></li>
 <li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
 <li><a href="https://joplinapp.org/api/">API documentation</a></li>