aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-12-13 01:51:52 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-12-13 01:51:52 +0700
commit7528322f83d5bee92a030e2e626436dab327df9b (patch)
treed3a69eec557a563ce89246c886e9c31687c8debf /docs/configuration
parentc6f2735ffa1db7871bcb56c00b6d19e4de346d18 (diff)
parent2f31cef71f377cf660f818e7e204436f2070bd78 (diff)
downloadpleroma-7528322f83d5bee92a030e2e626436dab327df9b.tar.gz
Merge branch 'develop' into feature/custom-runtime-modules
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/cheatsheet.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index b3a13833c..a214b6e2f 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -379,13 +379,19 @@ For each pool, the options are:
## Captcha
### Pleroma.Captcha
+
* `enabled`: Whether the captcha should be shown on registration.
* `method`: The method/service to use for captcha.
* `seconds_valid`: The time in seconds for which the captcha is valid.
### Captcha providers
+#### Pleroma.Captcha.Native
+
+A built-in captcha provider. Enabled by default.
+
#### Pleroma.Captcha.Kocaptcha
+
Kocaptcha is a very simple captcha service with a single API endpoint,
the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint
`https://captcha.kotobank.ch` is hosted by the developer.