squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'

Browse Source 
Fix headers and add !929 docs to extras

See merge request pleroma/pleroma!940
This commit is contained in:
kaniini 2019-03-15 19:51:06 +00:00
commit b010f9733d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Custom-Emoji.md
View File

@ -1,3 +1,5 @@
# Custom emoji
To add custom emoji: To add custom emoji:
* Add the image file(s) to `priv/static/emoji/custom` * 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 * In case of conflicts: add the desired shortcode with the path to `config/custom_emoji.txt`, comma-separated and one per line

1
docs/Message-Rewrite-Facility-configuration.md
View File

@ -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. 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: Possible uses include:

9
mix.exs
View File

@ -23,11 +23,14 @@ defmodule Pleroma.Mixfile do
logo: "priv/static/static/logo.png", logo: "priv/static/static/logo.png",
extras: [ extras: [
"README.md", "README.md",
"docs/config.md",
"docs/Pleroma-API.md",
"docs/Admin-API.md", "docs/Admin-API.md",
"docs/Clients.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", main: "readme",
output: "priv/static/doc" output: "priv/static/doc"