Merge branch 'master' into faq

Author: nhooyr

README.md

@@ -33,18 +33,19 @@ systemctl --user enable --now code-server
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
 ```
 
-### npm
+### yarn, npm
 
-We recommend installing from `npm` if we don't have a precompiled release for your machine's
+We recommend installing with `yarn` or `npm` if we don't have a precompiled release for your machine's
 platform or architecture or your glibc < v2.19.
 
-**note:** Installing via `npm` builds native modules on install and so requires C dependencies.
+**note:** Installing via `yarn` or `npm` builds native modules on install and so requires C dependencies.
 See [./doc/npm.md](./doc/npm.md) for installing these dependencies.
 
 You will need at least node v12 installed. See [#1633](https://github.com/cdr/code-server/issues/1633).
 
 ```bash
-npm install -g code-server
+yarn global add code-server
+# Or: npm install -g code-server
 code-server
 # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
 ```

ci/build/build-release.sh

@@ -73,7 +73,7 @@ EOF
 
   # We remove the scripts field so that later on we can run
   # yarn to fetch node_modules if necessary without build scripts running.
-  # We cannot use --no-scripts because we still want dependant package scripts to run.
+  # We cannot use --no-scripts because we still want dependent package scripts to run.
   jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
 }
 

doc/guide.md

@@ -136,7 +136,7 @@ If you want to make the SSH port forwarding persistent we recommend using
 [mutagen](https://mutagen.io/documentation/introduction/installation).
 
 ```
-# Same as the above SSH command but runs in the background continously.
+# Same as the above SSH command but runs in the background continuously.
 # Add `mutagen daemon start` to your ~/.bashrc to start the mutagen daemon when you open a shell.
 mutagen forward create --name=code-server tcp:127.0.0.1:8080 <instance-ip>:tcp:127.0.0.1:8080
 ```