diff --git a/docs/gsoc2021/pull_request_guidelines/index.html b/docs/gsoc2021/pull_request_guidelines/index.html index 9d23e8477..4b46ff2f6 100644 --- a/docs/gsoc2021/pull_request_guidelines/index.html +++ b/docs/gsoc2021/pull_request_guidelines/index.html @@ -410,7 +410,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel

Pull requests must be based on an issue that existed before GSoC was started, or based on an issue created by a moderator.

  • -

    Each contributor may only create one pull request at a time. In some rare cases, once your pull request has been merged, you may be allowed to post a second one, in which case we will let you know. We have this rule in place due to our limited resources - if everyone was allowed to post multiple pull requests we will not be able to review them properly. It is also better for you because you only need to care about one PR - so spend time making sure it is as good as it can be - make sure it works well, has test units, documentation and screenshots (if relevant).

    +

    Each contributor may only create one pull request at a time. Once your pull request has been merged, you can post a second one. We have this rule in place due to our limited resources - if everyone was allowed to post multiple pull requests we will not be able to review them properly. It is also better for you because you only need to care about one PR - so spend time making sure it is as good as it can be - make sure it works well, has test units, documentation and screenshots (if relevant).

  • If the pull request has serious issues, or would require a significant rewrite to be acceptable, we might closed it and you will not be allowed to open a new one. So please be careful when posting a PR.

    diff --git a/docs/terminal/index.html b/docs/terminal/index.html index 93e03f62f..a49253048 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -418,7 +418,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md macOS, Linux, or Windows (via WSL) -Important: First, install Node 10+.

    NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin
    sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin

    By default, the application binary will be installed under ~/.joplin-bin. You may change this directory if needed. Alternatively, if your npm permissions are setup as described here (Option 2) then simply running npm -g install joplin would work. +Important: First, install Node 12+.

    NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin
    sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin

    By default, the application binary will be installed under ~/.joplin-bin. You may change this directory if needed. Alternatively, if your npm permissions are setup as described here (Option 2) then simply running npm -g install joplin would work. @@ -817,7 +817,7 @@ Possible keys/values: fa (Persian), pl_PL (Polski), pt_PT (Português), pt_BR (Português (Brasil)), ro (Română), - sl_SI (Slovenian), sv (Svenska), + sl_SI (Slovenian), sv (Svenska), th_TH (Thai), vi (Tiếng Việt), tr_TR (Türkçe), el_GR (Ελληνικά), ru_RU (Русский), sr_RS (српски језик), diff --git a/readme/terminal.md b/readme/terminal.md index 1981bc1b3..499bbdfb0 100644 --- a/readme/terminal.md +++ b/readme/terminal.md @@ -12,7 +12,7 @@ The notes can be [synchronised](#synchronisation) with various targets including Operating system | Method -----------------|---------------- -macOS, Linux, or Windows (via [WSL](https://docs.microsoft.com/en-us/windows/wsl/faq)) | **Important:** First, [install Node 10+](https://nodejs.org/en/download/package-manager/).

    `NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin`
    `sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin`

    By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work. +macOS, Linux, or Windows (via [WSL](https://docs.microsoft.com/en-us/windows/wsl/faq)) | **Important:** First, [install Node 12+](https://nodejs.org/en/download/package-manager/).

    `NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin`
    `sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin`

    By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work. To start it, type `joplin`. @@ -364,7 +364,7 @@ The following commands are available in [command-line mode](#command-line-mode): fa (Persian), pl_PL (Polski), pt_PT (Português), pt_BR (Português (Brasil)), ro (Română), - sl_SI (Slovenian), sv (Svenska), + sl_SI (Slovenian), sv (Svenska), th_TH (Thai), vi (Tiếng Việt), tr_TR (Türkçe), el_GR (Ελληνικά), ru_RU (Русский), sr_RS (српски језик),