diff --git a/CliClient/app/autocompletion.js b/CliClient/app/autocompletion.js
index ade05f5c1..20464127e 100644
--- a/CliClient/app/autocompletion.js
+++ b/CliClient/app/autocompletion.js
@@ -36,7 +36,7 @@ async function handleAutocompletionPromise(line) {
if (next[0] === '-') {
for (let i = 0; i
`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.
-Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild).
+Arch Linux | An Arch Linux package is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild).
To start it, type `joplin`.
diff --git a/ReactNativeClient/lib/file-api-driver-webdav.js b/ReactNativeClient/lib/file-api-driver-webdav.js
index 0e16b14ce..cec088d56 100644
--- a/ReactNativeClient/lib/file-api-driver-webdav.js
+++ b/ReactNativeClient/lib/file-api-driver-webdav.js
@@ -38,7 +38,7 @@ class FileApiDriverWebDav {
}
statFromResource_(resource, path) {
- // WebDAV implementations are always slighly different from one server to another but, at the minimum,
+ // WebDAV implementations are always slightly different from one server to another but, at the minimum,
// a resource should have a propstat key - if not it's probably an error.
const propStat = this.api().arrayFromJson(resource, ['d:propstat']);
if (!Array.isArray(propStat)) throw new Error('Invalid WebDAV resource format: ' + JSON.stringify(resource));
diff --git a/ReactNativeClient/lib/layout-utils.js b/ReactNativeClient/lib/layout-utils.js
index 69727577e..df7c97fbf 100644
--- a/ReactNativeClient/lib/layout-utils.js
+++ b/ReactNativeClient/lib/layout-utils.js
@@ -1,9 +1,9 @@
const layoutUtils = {};
-layoutUtils.size = function(prefered, min, max) {
- if (prefered < min) return min;
- if (typeof max !== 'undefined' && prefered > max) return max;
- return prefered;
+layoutUtils.size = function(preferred, min, max) {
+ if (preferred < min) return min;
+ if (typeof max !== 'undefined' && preferred > max) return max;
+ return preferred;
}
module.exports = layoutUtils;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/synchronizer.js b/ReactNativeClient/lib/synchronizer.js
index e0afc4d7c..9f19c37e5 100644
--- a/ReactNativeClient/lib/synchronizer.js
+++ b/ReactNativeClient/lib/synchronizer.js
@@ -263,7 +263,7 @@ class Synchronizer {
//
// TODO: assuming a particular sync target is guaranteed to have accurate timestamps, the driver maybe
// could expose this with a accurateTimestamps() method that returns "true". In that case, the test
- // could be done using the file timestamp and the potentially unecessary content loading could be skipped.
+ // could be done using the file timestamp and the potentially unnecessary content loading could be skipped.
// OneDrive does not appear to have accurate timestamps as lastModifiedDateTime would occasionally be
// a few seconds ahead of what it was set with setTimestamp()
remoteContent = await this.api().get(path);
@@ -567,7 +567,7 @@ class Synchronizer {
// If user has cancelled, don't record the new context (2) so that synchronisation
// can start again from the previous context (1) next time. It is ok if some items
// have been synced between (1) and (2) because the loop above will handle the same
- // items being synced twice as an update. If the local and remote items are indentical
+ // items being synced twice as an update. If the local and remote items are identical
// the update will simply be skipped.
if (!hasCancelled) {
if (!listResult.hasMore) {
diff --git a/docs/index.html b/docs/index.html
index ecf9b0766..ade14eb72 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -323,7 +323,7 @@
| Arch Linux |
-An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. |
+An Arch Linux package is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. |
diff --git a/docs/terminal/index.html b/docs/terminal/index.html
index 96ae44349..bd21ead91 100644
--- a/docs/terminal/index.html
+++ b/docs/terminal/index.html
@@ -269,7 +269,7 @@
| Arch Linux |
-An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. |
+An Arch Linux package is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. |
diff --git a/readme/terminal.md b/readme/terminal.md
index 91a44e7a7..d453a9062 100644
--- a/readme/terminal.md
+++ b/readme/terminal.md
@@ -14,7 +14,7 @@ Operating system | Method
-----------------|----------------
macOS | `brew install joplin`
Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)) | **Important:** First, [install Node 8+](https://nodejs.org/en/download/package-manager/). Node 8 is LTS but not yet available everywhere so you might need to manually install it.
`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.
-Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild).
+Arch Linux | An Arch Linux package is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild).
To start it, type `joplin`.