summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-03-21 15:15:08 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-03-21 15:15:08 +0100
commite6ab7a128270594d5152f16263000d98a63ca439 (patch)
treef1f72ea2972a150ff6f863c61f094be575188d05
parent3bfd954a3b04ec00c195bc785a8f2ade6122fe60 (diff)
parentec2e8c68a2c052b0a34d95d70050b95de674159b (diff)
downloadmullvadvpn-e6ab7a128270594d5152f16263000d98a63ca439.tar.xz
mullvadvpn-e6ab7a128270594d5152f16263000d98a63ca439.zip
Merge branch 'add-vocabulary'
-rw-r--r--README.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/README.md b/README.md
index df2c1bd5d5..73b24d5e33 100644
--- a/README.md
+++ b/README.md
@@ -182,6 +182,22 @@ preserving features. The crates having `mullvad` in their name on the other hand
Rust crates.
- **mullvad-daemon/** - Main Rust crate building the daemon binary.
+
+## Vocabulary
+
+Explanations for some common words used in the documentation and code in this repository.
+
+- **App** - This entire product (everything in this repository) is the "Mullvad VPN App", or App for
+ short.
+ - **Daemon** - Refers to the `mullvad-daemon` Rust program. This headless program exposes a
+ management interface that can be used to control the daemon
+ - **Frontend** - Term used for any program or component that connects to the daemon management
+ interface and allows a user to control the daemon.
+ - **GUI** - The Electron + React program that is a graphical frontend for the Mullvad VPN App.
+ - **CLI** - The Rust program named `mullvad` that is a terminal based frontend for the Mullvad
+ VPN app.
+
+
## Quirks
- If you want to modify babel-configurations please note that `BABEL_ENV=development` must be used