diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-07 03:00:52 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-07 03:00:52 +0000 |
| commit | d81acb5f6250766eef1dc8c51ed0c79e819ae2af (patch) | |
| tree | d54e27b8306f5323d434d54639ca38a5f9c874d5 /docs | |
| parent | 2a323d37971d364fefd46e840424c631cc4a7d2b (diff) | |
| parent | 58da575935f19b86c614717f4fe0d4b8508f395d (diff) | |
| download | pleroma-d81acb5f6250766eef1dc8c51ed0c79e819ae2af.tar.gz | |
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 2 | ||||
| -rw-r--r-- | docs/configuration/cheatsheet.md | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 72b5984ae..d2455d5d7 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -220,6 +220,8 @@ Has theses additional parameters (which are the same as in Pleroma-API): `GET /api/v1/instance` has additional fields - `max_toot_chars`: The maximum characters per post +- `chat_limit`: The maximum characters per chat message +- `description_limit`: The maximum characters per image description - `poll_limits`: The limits of polls - `upload_limit`: The maximum upload file size - `avatar_upload_limit`: The same for avatars diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 6759d5e93..6b640cebc 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -18,6 +18,7 @@ To add configuration to your config file, you can copy it from the base config. * `notify_email`: Email used for notifications. * `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``. * `limit`: Posts character limit (CW/Subject included in the counter). +* `discription_limit`: The character limit for image descriptions. * `chat_limit`: Character limit of the instance chat messages. * `remote_limit`: Hard character limit beyond which remote posts will be dropped. * `upload_limit`: File size limit of uploads (except for avatar, background, banner). |