summaryrefslogtreecommitdiff
path: root/docs/installation
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-03 00:11:38 -0600
committerAlex Gleason <alex@alexgleason.me>2021-12-03 00:11:38 -0600
commit8286ceb46522069607cc0a0dec864022606bf19d (patch)
tree5270f50d3b6b00d3d2796d2e611a2606ffeb4ff1 /docs/installation
parent5da4f33bf136970706ddcf19bd701288acb141cf (diff)
parent235c4139d701f7d25dac2a152d8ab6e4afb1c20d (diff)
downloadpleroma-8286ceb46522069607cc0a0dec864022606bf19d.tar.gz
pleroma-8286ceb46522069607cc0a0dec864022606bf19d.zip
Merge remote-tracking branch 'origin/develop' into password-reset
Diffstat (limited to 'docs/installation')
-rw-r--r--docs/installation/generic_dependencies.include2
-rw-r--r--docs/installation/yunohost_en.md9
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include
index baed19de0..2dbd93e42 100644
--- a/docs/installation/generic_dependencies.include
+++ b/docs/installation/generic_dependencies.include
@@ -9,7 +9,7 @@
* GNU make
* CMake
-## Optionnal dependencies
+## Optional dependencies
* ImageMagick
* FFmpeg
diff --git a/docs/installation/yunohost_en.md b/docs/installation/yunohost_en.md
new file mode 100644
index 000000000..4c34e85d5
--- /dev/null
+++ b/docs/installation/yunohost_en.md
@@ -0,0 +1,9 @@
+# Installing on Yunohost
+
+[YunoHost](https://yunohost.org) is a server operating system aimed at self-hosting. The YunoHost community maintains a package of Pleroma which allows you to install Pleroma on YunoHost. You can install it via the normal way through the admin web interface, or through the CLI. More information can be found at [the repo of the package](https://github.com/YunoHost-Apps/pleroma_ynh).
+
+## Questions
+
+Questions and problems related to the YunoHost parts can be done through the [regular YunoHost channels](https://yunohost.org/en/help).
+
+For questions about Pleroma, ask in [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) via Matrix or **#pleroma** on **libera.chat** via IRC.