diff --git a/ChangeLog.md b/ChangeLog.md index c54b5da1..8475f61d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -408,7 +408,7 @@ In detail, these are: ### awaystore -* Fix loading old configs which refered to "away" module +* Fix loading old configs which referred to "away" module * Fix displaying IPv6 addresses ### crypt @@ -899,7 +899,7 @@ To fix this, remove any user:pass@host portions from your bookmarks, remove all * Moved some modules into/out of extra. (r1919) (r1922) (r1923) * Added ./configure --enable-run-from-script, without it ZNC will no longer look for modules in ./modules/. (r1927) (r1928) (r2001) * Made a dedicated page to confirm user deletion in webadmin. (r1937) (r1939) (r1941) (r1943) -* Use spaces for seperating ip addresses from ports. (r1955) +* Use spaces for separating ip addresses from ports. (r1955) * ZNC's built-in MOTD now goes through ExpandString. (r1956) * Check for root before generating a new config file. (r1988) * Added a flag for adding irc-only / http-only ports via /znc addport. (r1990) (r1992) @@ -1400,7 +1400,7 @@ Thanks to cnu for finding and reporting this bug. * Add ShowMOTD and reorder the HELP output of *status. (r1175) * Add /msg *status restart . Thanks to kroimon. (r1174) * Make --makeconf more userfriendly. Thanks to kroimon. (r1173) -* Dont start a new znc process after --makeconf. Thanks to kroimon. (r1171) +* Don't start a new znc process after --makeconf. Thanks to kroimon. (r1171) * Add CModule::PutModule(const CTable&). (r1168) (r1169) * Unify some preprocessor macros in Modules.cpp. (r1166) * Catch a throw UNLOAD from CModule::OnLoad(). (r1164) diff --git a/Doxyfile b/Doxyfile index 2d91051d..89c9e21f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1665,7 +1665,7 @@ UML_LOOK = NO # the class node. If there are many fields or methods and many nodes the # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS # threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# manageable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 diff --git a/README.md b/README.md index c7526f2e..4c8e3f3e 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Core: SSL/TLS support: * openssl 0.9.7d or later * try installing openssl-dev, openssl-devel or libssl-dev - * Mac OS X: OpenSSL from Homebrew is prefered over system + * Mac OS X: OpenSSL from Homebrew is preferred over system modperl: * perl and its bundled libperl diff --git a/include/znc/Modules.h b/include/znc/Modules.h index 22c44917..64d7196f 100644 --- a/include/znc/Modules.h +++ b/include/znc/Modules.h @@ -510,7 +510,7 @@ class CModule { * @param sPass The server password that will be used. * @param sNick The nick that will be used. * @param sIdent The protocol identity that will be used. This is not - * the ident string that is transfered via e.g. oidentd! + * the ident string that is transferred via e.g. oidentd! * @param sRealName The real name that will be used. * @return See CModule::EModRet. */ diff --git a/include/znc/ZNCString.h b/include/znc/ZNCString.h index cd08b809..9ab0f631 100644 --- a/include/znc/ZNCString.h +++ b/include/znc/ZNCString.h @@ -326,7 +326,7 @@ class CString : public std::string { /** Split up this string into tokens. * Via sLeft and sRight you can define "markers" like with Replace(). * Anything in such a marked section is treated as a single token. All - * occurences of sDelim in such a block are ignored. + * occurrences of sDelim in such a block are ignored. * @param sDelim Delimiter between tokens. * @param vsRet Vector for returning the result. * @param bAllowEmpty Do empty tokens count as a valid token? @@ -453,37 +453,37 @@ class CString : public std::string { /** @return The numerical value of this string similar to atoi(). */ double ToDouble() const; - /** Trim this string. All leading/trailing occurences of characters from + /** Trim this string. All leading/trailing occurrences of characters from * s are removed. * @param s A list of characters that should be trimmed. * @return true if this string was modified. */ bool Trim(const CString& s = " \t\r\n"); - /** Trim this string. All leading occurences of characters from s are + /** Trim this string. All leading occurrences of characters from s are * removed. * @param s A list of characters that should be trimmed. * @return true if this string was modified. */ bool TrimLeft(const CString& s = " \t\r\n"); - /** Trim this string. All trailing occurences of characters from s are + /** Trim this string. All trailing occurrences of characters from s are * removed. * @param s A list of characters that should be trimmed. * @return true if this string was modified. */ bool TrimRight(const CString& s = " \t\r\n"); - /** Trim this string. All leading/trailing occurences of characters from + /** Trim this string. All leading/trailing occurrences of characters from * s are removed. This CString instance is not modified. * @param s A list of characters that should be trimmed. * @return The trimmed string. */ CString Trim_n(const CString& s = " \t\r\n") const; - /** Trim this string. All leading occurences of characters from s are + /** Trim this string. All leading occurrences of characters from s are * removed. This CString instance is not modified. * @param s A list of characters that should be trimmed. * @return The trimmed string. */ CString TrimLeft_n(const CString& s = " \t\r\n") const; - /** Trim this string. All trailing occurences of characters from s are + /** Trim this string. All trailing occurrences of characters from s are * removed. This CString instance is not modified. * @param s A list of characters that should be trimmed. * @return The trimmed string. diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp index 6c76abcd..daa9f225 100644 --- a/modules/keepnick.cpp +++ b/modules/keepnick.cpp @@ -141,7 +141,7 @@ class CKeepNickMod : public CModule { } EModRet OnUserRaw(CString& sLine) override { - // We dont care if we are not connected to IRC + // We don't care if we are not connected to IRC if (!GetNetwork()->IsIRCConnected()) return CONTINUE; // We are trying to get the config nick and this is a /nick? diff --git a/modules/modtcl/binds.tcl b/modules/modtcl/binds.tcl index c243b4c1..723a0676 100644 --- a/modules/modtcl/binds.tcl +++ b/modules/modtcl/binds.tcl @@ -151,7 +151,7 @@ namespace eval Binds { } } if {!$match} { - PutModule "Error, dcc trigger '[string range [lindex $text 0] 1 end]' doesnt exist" + PutModule "Error, dcc trigger '[string range [lindex $text 0] 1 end]' doesn't exist" } } } diff --git a/modules/modtcl/modtcl.tcl b/modules/modtcl/modtcl.tcl index 9aa30292..c21b905b 100644 --- a/modules/modtcl/modtcl.tcl +++ b/modules/modtcl/modtcl.tcl @@ -128,4 +128,4 @@ proc matchattr {handle flags {channel ""}} {return 0} source [file dirname $::MasterFile]/binds.tcl -PutModule "Succesfully loaded modtcl with master file: [info script]" +PutModule "Successfully loaded modtcl with master file: [info script]" diff --git a/modules/watch.cpp b/modules/watch.cpp index a9bbdd70..e37fbb48 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -708,7 +708,7 @@ class CWatcherMod : public CModule { } void Load() { - // Just to make sure we dont mess up badly + // Just to make sure we don't mess up badly m_lsWatchers.clear(); bool bWarn = false; diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp index da9ce738..eb6aa605 100644 --- a/src/IRCSock.cpp +++ b/src/IRCSock.cpp @@ -938,7 +938,7 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) { } case 451: // :irc.server.com 451 CAP :You have not registered - // Servers that dont support CAP will give us this error, dont send + // Servers that don't support CAP will give us this error, don't send // it to the client if (sNick.Equals("CAP")) return true; case 470: { diff --git a/src/Modules.cpp b/src/Modules.cpp index f4079bf4..6caddd73 100644 --- a/src/Modules.cpp +++ b/src/Modules.cpp @@ -31,7 +31,7 @@ bool ZNC_NO_NEED_TO_DO_ANYTHING_ON_MODULE_CALL_EXITER; #ifndef RTLD_LOCAL #define RTLD_LOCAL 0 -#warning "your crap box doesnt define RTLD_LOCAL !?" +#warning "your crap box doesn't define RTLD_LOCAL !?" #endif #define MODUNLOADCHK(func) \ diff --git a/src/WebModules.cpp b/src/WebModules.cpp index d1ebf491..b9bf435a 100644 --- a/src/WebModules.cpp +++ b/src/WebModules.cpp @@ -195,7 +195,7 @@ void CWebAuth::RefusedLogin(const CString& sReason) { m_pWebSock->AddHeader("WWW-Authenticate", "Basic realm=\"ZNC\""); m_pWebSock->CHTTPSock::PrintErrorPage( 401, "Unauthorized", - "HTTP Basic authentication attemped with invalid credentials"); + "HTTP Basic authentication attempted with invalid credentials"); // Why CWebSock makes this function protected?.. } else { m_pWebSock->Redirect("/?cookie_check=true"); @@ -509,7 +509,7 @@ CWebSock::EPageReqResult CWebSock::PrintStaticFile(const CString& sPath, SetPaths(pModule); CString sFile = m_Template.ExpandFile(sPath.TrimLeft_n("/")); DEBUG("About to print [" + sFile + "]"); - // Either PrintFile() fails and sends an error page or it suceeds and + // Either PrintFile() fails and sends an error page or it succeeds and // sends a result. In both cases we don't have anything more to do. PrintFile(sFile); return PAGE_DONE; diff --git a/src/znc.cpp b/src/znc.cpp index 3d77feac..616ec25b 100644 --- a/src/znc.cpp +++ b/src/znc.cpp @@ -1042,7 +1042,7 @@ bool CZNC::ReadConfig(CConfig& config, CString& sError) { CUtils::PrintStatus(true); // check if config is from old ZNC version and - // create a backup file if neccessary + // create a backup file if necessary CString sSavedVersion; config.FindStringEntry("version", sSavedVersion); if (sSavedVersion.empty()) { @@ -1782,7 +1782,7 @@ bool CZNC::AddListener(CConfig* pConfig, CString& sError) { bool CZNC::AddListener(CListener* pListener) { if (!pListener->GetRealListener()) { - // Listener doesnt actually listen + // Listener doesn't actually listen delete pListener; return false; }