diff --git a/README.md b/README.md index 52a5616543..64bdb8a787 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Three types of applications are available: for the **desktop** (Windows, macOS a Operating System | Download | Alternative -----------------|--------|------------------- Windows (32 and 64-bit) | Get it on Windows | or Get the Portable version
(to run from a USB key, etc.) -macOS | Get it on macOS | +macOS | Get it on macOS | Linux | Get it on Linux | An Arch Linux package
[is also available](#terminal-application). The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. @@ -81,7 +81,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr - [Donate](https://github.com/laurent22/joplin/blob/master/readme/donate.md) -# Features +# Features - Desktop, mobile and terminal applications. - [Web Clipper](https://github.com/laurent22/joplin/blob/master/readme/clipper.md) for Firefox and Chrome. @@ -102,7 +102,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr # Importing -## Importing from Evernote +## Importing from Evernote Joplin was designed as a replacement for Evernote and so can import complete Evernote notebooks, as well as notes, tags, resources (attached files) and note metadata (such as author, geo-location, etc.) via ENEX files. In terms of data, the only two things that might slightly differ are: @@ -174,6 +174,7 @@ Select the "WebDAV" synchronisation target and follow the same instructions as f WebDAV-compatible services that are known to work with Joplin: +- [Apache WebDAV Module](https://httpd.apache.org/docs/current/mod/mod_dav.html) - [Box.com](https://www.box.com/) - [DriveHQ](https://www.drivehq.com) - [Fastmail](https://www.fastmail.com/)