diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-04 04:32:09 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-04 04:32:09 +0000 |
| commit | b9497ead3513ba3b93e9a4549e482f4a720aa83d (patch) | |
| tree | c23fe2d35bdf2f8aa3943ffe34eaa37cf8297eab | |
| parent | b1fb5b93aeea5ae95c9d4cfc3ded8e330f2b0a66 (diff) | |
| parent | 9b9453ceaf492ef3af18c12ce67e144a718fd65a (diff) | |
| download | pleroma-b9497ead3513ba3b93e9a4549e482f4a720aa83d.tar.gz | |
Merge branch 'develop' into 'develop'
Fix a stale link and a few typos
See merge request pleroma/pleroma!1529
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/config/howto_mediaproxy.md | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -21,7 +21,7 @@ If you want to run your own server, feel free to contact us at @lain@pleroma.soy Currently Pleroma is not packaged by any OS/Distros, but feel free to reach out to us at [#pleroma-dev on freenode](https://webchat.freenode.net/?channels=%23pleroma-dev) or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma-dev:matrix.org> for assistance. If you want to change default options in your Pleroma package, please **discuss it with us first**. ### Docker -While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://github.com/sn0w/pleroma-docker>. +While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>. ### Dependencies diff --git a/docs/config/howto_mediaproxy.md b/docs/config/howto_mediaproxy.md index ed70c3ed4..16c40c5db 100644 --- a/docs/config/howto_mediaproxy.md +++ b/docs/config/howto_mediaproxy.md @@ -1,8 +1,8 @@ # How to activate mediaproxy ## Explanation -Without the `mediaproxy` function, Pleroma don't store any remote content like pictures, video etc. locally. So every time you open Pleroma, the content is loaded from the source server, from where the post is coming. This can result in slowly loading content or/and increased bandwidth usage on the source server. -With the `mediaproxy` function you can use the cache ability of nginx, to cache these content, so user can access it faster, cause it's loaded from your server. +Without the `mediaproxy` function, Pleroma doesn't store any remote content like pictures, video etc. locally. So every time you open Pleroma, the content is loaded from the source server, from where the post is coming. This can result in slowly loading content or/and increased bandwidth usage on the source server. +With the `mediaproxy` function you can use nginx to cache this content, so users can access it faster, because it's loaded from your server. ## Activate it |