merge upstream

docs/operators/handbook.md

@@ -96,6 +96,8 @@ make link
 
 ## Configure `abra` with `abra.yml`
 
+You can place an `abra.yml`-file in the root of your .abra-project.
+
 There are few configuration options supported at this time but more can be added. We are open to requests!
 
 ### `$ABRA_DIR`
@@ -106,7 +108,7 @@ The lookup logic is defined like so.
 * look for config file and take value from there
 * $HOME/.abra as fallback
 
-If you create an `abra.yml` file in your `$PWD` with the following contents.
+If you create an `abra.yml` file in your `$PWD` (print working directory) with the following contents.
 
 ```
 abraDir: .
@@ -114,6 +116,12 @@ abraDir: .
 
 Then `$ABRA_DIR` will be automatically picked up as `$PWD`. This is useful when you maintain multiple project configurations and recipes in various state of chaos and would like to separate those. `abra` will create all the usual `$HOME/.abra` state (`servers`/`recipes`/etc.) under your chosen `abraDir` value. This allows you to have multiple independent versions of specific recipes which are relevant for specific projects vs. relying on a single `$ABRA_DIR/recipes/<recipe>` and constantly having to switch between different chaotic hacks.
 
+### `$EDITOR`
+
+When you edit .env.sample-files, you are asked to chose an editor. To avoid answering that question all the time, you can either set an environment variable (`export EDITOR=nano`), or you can set it as a config-option in abra.yml, like this:
+
+`editor: nano`
+
 ## Running abra server side
 
 If you're on an environment where it's hard to run Docker, or command-line programs in general, you might want to install `abra` on a server instead of your local computer.