diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
| commit | c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f (patch) | |
| tree | 0641fb03061bd783a15d06633408da4aa7592e76 /installation | |
| parent | 9fc6676d8c080dbd630434275363cc6536a35116 (diff) | |
| parent | 139057f346f5903e0ed21ea91e7d43fd906fe914 (diff) | |
| download | pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.tar.gz pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.zip | |
Merge remote-tracking branch 'origin/develop' into instance-contact-account
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) |