aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKian-Meng Ang <kianmeng@cpan.org>2022-01-24 08:01:39 +0800
committerKian-Meng Ang <kianmeng@cpan.org>2022-01-24 08:02:04 +0800
commitadf0f87e99310ea06925a4e88edeaf685d8d0cd5 (patch)
treed23de2e499b7116420a5f4f55fdabbb15f45f019 /src
parentmod_pubsub: Allow for limiting item_expire value (diff)
Fix typos
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_doc.erl4
-rw-r--r--src/ejabberd_options_doc.erl4
-rw-r--r--src/ejabberd_s2s.erl2
-rw-r--r--src/ejabberd_web_admin.erl4
-rw-r--r--src/mod_admin_extra.erl2
-rw-r--r--src/mod_avatar.erl4
-rw-r--r--src/mod_pubsub.erl2
-rw-r--r--src/mod_stream_mgmt.erl2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/ejabberd_doc.erl b/src/ejabberd_doc.erl
index 77f9fab48..b6369d968 100644
--- a/src/ejabberd_doc.erl
+++ b/src/ejabberd_doc.erl
@@ -231,9 +231,9 @@ man_header(Lang) ->
"indentation, or otherwise you will get pretty cryptic "
"configuration errors.")),
io_lib:nl(),
- tr(Lang, ?T("Logically, configuration options are splitted into 3 main categories: "
+ tr(Lang, ?T("Logically, configuration options are split into 3 main categories: "
"'Modules', 'Listeners' and everything else called 'Top Level' options. "
- "Thus this document is splitted into 3 main chapters describing each "
+ "Thus this document is split into 3 main chapters describing each "
"category separately. So, the contents of ejabberd.yml will typically "
"look like this:")),
io_lib:nl(),
diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
index a725f4572..ffb4caf32 100644
--- a/src/ejabberd_options_doc.erl
+++ b/src/ejabberd_options_doc.erl
@@ -387,7 +387,7 @@ doc() ->
{auth_scram_hash,
#{value => "sha | sha256 | sha512",
desc =>
- ?T("Hash algorith that should be used to store password in SCRAM format. "
+ ?T("Hash algorithm that should be used to store password in SCRAM format. "
"You shouldn't change this if you already have passwords generated with "
"a different algorithm - users that have such passwords will not be able "
"to authenticate. The default value is 'sha'.")}},
@@ -449,7 +449,7 @@ doc() ->
desc =>
[?T("Path to a file of CA root certificates. "
"The default is to use system defined file if possible."), "",
- ?T("For server conections, this 'ca_file' option is overriden by the http://../toplevel/#s2s-cafile[s2s_cafile] option."), ""
+ ?T("For server connections, this 'ca_file' option is overridden by the http://../toplevel/#s2s-cafile[s2s_cafile] option."), ""
]}},
{captcha_cmd,
#{value => ?T("Path"),
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index 04490071c..a5cf23d1e 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -387,7 +387,7 @@ start_connection(From, To, Opts) ->
MaxS2SConnectionsNumber,
MaxS2SConnectionsNumberPerNode, Opts);
true ->
- %% We choose a connexion from the pool of opened ones.
+ %% We choose a connection from the pool of opened ones.
{ok, choose_connection(From, L)}
end
end.
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index ee50a0031..85a639687 100644
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -1857,11 +1857,11 @@ build_elements_pages_list(Size, PageNumber, PageSize) ->
?C(<<" [", (integer_to_binary(PageNumber))/binary, "] ">>)).
calculate_pages_number(Size, PageSize) ->
- Remainer = case Size rem PageSize of
+ Remainder = case Size rem PageSize of
0 -> 0;
_ -> 1
end,
- case (Size div PageSize) + Remainer of
+ case (Size div PageSize) + Remainder of
1 -> 0;
Res -> Res
end.
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index 9834acf01..ea73c55d9 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -695,7 +695,7 @@ get_commands_spec() ->
args_example = [<<"group3">>, <<"myserver.com">>],
args_desc = ["Group identifier", "Group server name"],
result_example = [{<<"name">>, "Group 3"}, {<<"displayed_groups">>, "group1"}],
- result_desc = "List of group informations, as key and value",
+ result_desc = "List of group information, as key and value",
result = {informations, {list, {information, {tuple, [{key, string}, {value, string}]}}}}},
#ejabberd_commands{name = srg_get_members, tags = [shared_roster_group],
desc = "Get members of a Shared Roster Group",
diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
index 09329853d..19c82a6bf 100644
--- a/src/mod_avatar.erl
+++ b/src/mod_avatar.erl
@@ -475,7 +475,7 @@ mod_doc() ->
[{convert,
#{value => "{From: To}",
desc =>
- ?T("Defines image convertion rules: the format in 'From' "
+ ?T("Defines image conversion rules: the format in 'From' "
"will be converted to format in 'To'. The value of 'From' "
"can also be 'default', which is match-all rule. NOTE: "
"the list of supported formats is detected at compile time "
@@ -489,4 +489,4 @@ mod_doc() ->
desc =>
?T("Limit any given JID by the number of avatars it is able "
"to convert per minute. This is to protect the server from "
- "image convertion DoS. The default value is '10'.")}}]}.
+ "image conversion DoS. The default value is '10'.")}}]}.
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index d161ec10c..58aad47cb 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -4474,7 +4474,7 @@ mod_doc() ->
"to the 'create' stanza element."),
?T("- 'flat' plugin handles the default behaviour and "
"follows standard XEP-0060 implementation."),
- ?T("- 'pep' plugin adds extention to handle Personal "
+ ?T("- 'pep' plugin adds extension to handle Personal "
"Eventing Protocol (XEP-0163) to the PubSub engine. "
"Adding pep allows to handle PEP automatically.")]}},
{vcard,
diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
index f60f6722b..6d4c768c8 100644
--- a/src/mod_stream_mgmt.erl
+++ b/src/mod_stream_mgmt.erl
@@ -268,7 +268,7 @@ c2s_handle_info(State, {timeout, _, Timeout}) when Timeout == ack_timeout;
Timeout == pending_timeout ->
%% Late arrival of an already cancelled timer: we just ignore it.
%% This might happen because misc:cancel_timer/1 doesn't guarantee
- %% timer cancelation in the case when p1_server is used.
+ %% timer cancellation in the case when p1_server is used.
{stop, State};
c2s_handle_info(State, _) ->
State.