diff options
| author |  Sadie Powell | 2021-07-01 12:33:51 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-07-01 12:33:51 +0100 |
| commit | d95d7fc4f574b4ce3593b6684dd9fd738c40fcab (patch) | |
| tree | 88bc789896945fac5b82bc19dd4b8e440e590da6 /src/modules/m_spanningtree | |
| parent | Require that hideserver is set to a valid hostname. (diff) | |
| parent | Allow reloading SSL profiles on rehash. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/fjoin.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/ftopic.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 350145e23..5b2f83384 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -54,7 +54,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params) * When two sides of a split heal and this occurs, the following things * will happen: * - * If the timestamps are exactly equal, both sides merge their privilages + * If the timestamps are exactly equal, both sides merge their privileges * and users, as in InspIRCd 1.0 and ircd2.8. The channels have not been * re-created during a split, this is safe to do. * @@ -80,7 +80,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params) * [[<modes>,]<uuid>[:<membid>] * <modes> is a concatenation of the mode letters the user has on the channel * (e.g.: "ov" if the user is opped and voiced). The order of the mode letters - * are not important but if a server ecounters an unknown mode letter, it will + * are not important but if a server encounters an unknown mode letter, it will * drop the link to avoid desync. * * InspIRCd 2.0 and older required a comma before the uuid even if the user diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index cf124cb7b..8b365bec8 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -50,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, Params& params) /* * If the topics were updated at the exact same second, accept * the remote only when it's "bigger" than ours as defined by - * string comparison, so non-empty topics always overridde + * string comparison, so non-empty topics always override * empty topics if their timestamps are equal * * Similarly, if the topic texts are equal too, keep one topic diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 89c2b9aec..94b9df98e 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -34,7 +34,7 @@ /* * The server list in InspIRCd is maintained as two structures * which hold the data in different ways. Most of the time, we - * want to very quicky obtain three pieces of information: + * want to very quickly obtain three pieces of information: * * (1) The information on a server * (2) The information on the server we must send data through |