diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-15 19:51:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-15 19:51:06 +0000 |
| commit | b010f9733d6ee5c65cef276284e4c9d702f2c8b7 (patch) | |
| tree | c9196e13794fefb9e4440a795a74ad51f9402550 | |
| parent | 41fc67aa4993c119dae82578df7309d3999ac47a (diff) | |
| parent | f5b54acc8160dc1ecf4523d98e971eff8bc983de (diff) | |
| download | pleroma-b010f9733d6ee5c65cef276284e4c9d702f2c8b7.tar.gz pleroma-b010f9733d6ee5c65cef276284e4c9d702f2c8b7.zip | |
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
Fix headers and add !929 docs to extras
See merge request pleroma/pleroma!940
| -rw-r--r-- | docs/Custom-Emoji.md | 2 | ||||
| -rw-r--r-- | docs/Message-Rewrite-Facility-configuration.md | 1 | ||||
| -rw-r--r-- | mix.exs | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/docs/Custom-Emoji.md b/docs/Custom-Emoji.md index d4af5c97c..9d90e5822 100644 --- a/docs/Custom-Emoji.md +++ b/docs/Custom-Emoji.md @@ -1,3 +1,5 @@ +# Custom emoji + To add custom emoji: * Add the image file(s) to `priv/static/emoji/custom` * In case of conflicts: add the desired shortcode with the path to `config/custom_emoji.txt`, comma-separated and one per line diff --git a/docs/Message-Rewrite-Facility-configuration.md b/docs/Message-Rewrite-Facility-configuration.md index 708098b41..35ce52ea9 100644 --- a/docs/Message-Rewrite-Facility-configuration.md +++ b/docs/Message-Rewrite-Facility-configuration.md @@ -1,3 +1,4 @@ +# Message Rewrite Facility configuration The Message Rewrite Facility (MRF) is a subsystem that is implemented as a series of hooks that allows the administrator to rewrite or discard messages. Possible uses include: @@ -23,11 +23,14 @@ defmodule Pleroma.Mixfile do logo: "priv/static/static/logo.png", extras: [ "README.md", - "docs/config.md", - "docs/Pleroma-API.md", "docs/Admin-API.md", "docs/Clients.md", - "docs/Differences-in-MastodonAPI-Responses.md" + "docs/config.md", + "docs/Custom-Emoji.md", + "docs/Differences-in-MastodonAPI-Responses.md", + "docs/Message-Rewrite-Facility-configuration.md", + "docs/Pleroma-API.md", + "docs/static_dir.md" ], main: "readme", output: "priv/static/doc" |