diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-18 13:50:25 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-18 13:50:25 +0100 |
| commit | 918c406a914d49b15beb3611e1c780d0e0d253cd (patch) | |
| tree | f54000d2e2f19ad97c75f71f443cff6b9810f5ca /installation | |
| parent | 90b442727e4e2e56b4b68a15172a5ef7516531df (diff) | |
| parent | cf0aa1238ccd137219253d76355f2dc0f89679ac (diff) | |
| download | pleroma-918c406a914d49b15beb3611e1c780d0e0d253cd.tar.gz pleroma-918c406a914d49b15beb3611e1c780d0e0d253cd.zip | |
Merge remote-tracking branch 'origin/develop' into instance_rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/pleroma-mongooseim.cfg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/installation/pleroma-mongooseim.cfg b/installation/pleroma-mongooseim.cfg index 3ecba5641..6b568fd03 100755 --- a/installation/pleroma-mongooseim.cfg +++ b/installation/pleroma-mongooseim.cfg @@ -204,7 +204,7 @@ ]} ]}, - %% Following HTTP API is deprected, the new one abouve should be used instead + %% Following HTTP API is deprecated, the new one above should be used instead { {5288, "127.0.0.1"} , ejabberd_cowboy, [ {num_acceptors, 10}, @@ -824,7 +824,7 @@ %% Enable archivization for private messages (default) % {pm, [ - %% Top-level options can be overriden here if needed, for example: + %% Top-level options can be overridden here if needed, for example: % {async_writer, false} % ]}, @@ -834,7 +834,7 @@ %% % {muc, [ % {host, "muc.@HOST@"} - %% As with pm, top-level options can be overriden for MUC archive + %% As with pm, top-level options can be overridden for MUC archive % ]}, % %% Do not use a <stanza-id/> element (by default stanzaid is used) |