diff options
| author |  Sadie Powell | 2020-05-05 22:03:14 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-05-05 22:03:14 +0100 |
| commit | b755d2a778e0adb86c3b10757083c169eedb6de6 (patch) | |
| tree | 3d737ea47c535c4b60076feb26055e68f7d8aec5 /include/modules | |
| parent | Revert "Convert UserType to an enum class". (diff) | |
| parent | Fix shuns not being applied correctly. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'include/modules')
| -rw-r--r-- | include/modules/ircv3_batch.h | 2 | ||||
| -rw-r--r-- | include/modules/ircv3_replies.h | 2 | ||||
| -rw-r--r-- | include/modules/sql.h | 2 | ||||
| -rw-r--r-- | include/modules/ssl.h | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/include/modules/ircv3_batch.h b/include/modules/ircv3_batch.h index 9e64c4fcc..073fb535f 100644 --- a/include/modules/ircv3_batch.h +++ b/include/modules/ircv3_batch.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services> + * Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services> * Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com> * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h index 3ff462ad7..4666f002a 100644 --- a/include/modules/ircv3_replies.h +++ b/include/modules/ircv3_replies.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019 Sadie Powell <sadie@witchery.services> + * Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services> * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/include/modules/sql.h b/include/modules/sql.h index 927d54ee7..47da6f6bf 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -107,7 +107,7 @@ class SQL::Result : public classbase /** * Return the number of rows in the result. * - * Note that if you have perfomed an INSERT or UPDATE query or other + * Note that if you have performed an INSERT or UPDATE query or other * query which will not return rows, this will return the number of * affected rows. In this case you SHOULD NEVER access any of the result * set rows, as there aren't any! diff --git a/include/modules/ssl.h b/include/modules/ssl.h index bd418736b..bbee38867 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions> * Copyright (C) 2019 B00mX0r <b00mx0r@aureus.pw> * Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw> * Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services> @@ -66,7 +67,7 @@ class ssl_cert : public refcountbase return issuer; } - /** Get error string if an error has occured + /** Get error string if an error has occurred * @return The error associated with this users certificate, * or an empty string if there is no error. */ @@ -303,7 +304,7 @@ class UserCertificateAPIBase : public DataProvider } }; -/** API implemented by m_sslinfo that allows modules to retrive the TLS (SSL) certificate +/** API implemented by m_sslinfo that allows modules to retrieve the TLS (SSL) certificate * information of local and remote users. It can also be used to find out whether a * user is using TLS (SSL) or not. */ |