From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Tue, 15 May 2018 09:08:56 +0000 (+0000)
Subject: Docs: fix many spelling mistakes (#206)
X-Git-Tag: M-staged-PR206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61beade21ef54f40390c4cd08fdaccab4bff7b7a;p=thirdparty%2Fsquid.git

Docs: fix many spelling mistakes (#206)

... identified by Debian lintian tool.

No logic changes in this patch. Just code comment,
documentation and display strings texts.
---

diff --git a/ChangeLog b/ChangeLog
index 5098d36736..098e148d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1638,7 +1638,7 @@ Changes to squid-3.2.0.7 (19 Apr 2011):
 Changes to squid-3.2.0.6 (04 Apr 2011):
 
 	- Regression fix: upgrade existing icons
-	- Regression fix: dont crash when accessing an SSL certificate with errors
+	- Regression fix: do not crash when accessing an SSL certificate with errors
 	- Regression fix: prevent stdio log module segfaults on rotate
 	- Regression fix: shutdown properly even if a worker process crashes on exit
 	- Regression Bug 3159: (partial fix) ICAP and --disable-auth compile problems
diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 36f88a4a2b..8caaa3d4bb 100644
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -82,7 +82,7 @@ done
 ])
 
 dnl remove duplicates out of a list.
-dnl dnl argument is the name of a variable to be checked and cleaned up
+dnl argument is the name of a variable to be checked and cleaned up
 AC_DEFUN([SQUID_CLEANUP_MODULES_LIST],[
 squid_cleanup_tmp_outlist=""
 for squid_cleanup_tmp in $$1
diff --git a/compat/os/solaris.h b/compat/os/solaris.h
index fdf5deb303..7b965c026c 100644
--- a/compat/os/solaris.h
+++ b/compat/os/solaris.h
@@ -50,7 +50,7 @@ SQUIDCEXTERN int getrusage(int, struct rusage *);
 
 #if defined(__SUNPRO_CC)
 // Solaris 11 needs this before <sys/socket.h> to get the definition for msg_control
-// and possibly other type definitions we dont know about specifically
+// and possibly other type definitions we do not know about specifically
 #define _XPG4_2 1
 #include <sys/socket.h>
 #endif
diff --git a/configure.ac b/configure.ac
index 5347cbf9a7..c75f0c26ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2863,7 +2863,7 @@ SQUID_DEFAULT_INCLUDES
 #endif
 )
 
-dnl *BSD dont include the dependencies for all their net/ and netinet/ files
+dnl *BSD do not include the dependencies for all their net/ and netinet/ files
 dnl We must include a few basic type headers for them to work.
 AC_CHECK_HEADERS( \
   net/if.h \
diff --git a/include/snmp_api.h b/include/snmp_api.h
index 919f4a358e..d359013ecf 100644
--- a/include/snmp_api.h
+++ b/include/snmp_api.h
@@ -97,7 +97,7 @@ int snmp_close(struct snmp_session *);
  * of outstanding requests on this session, then send the pdu.
  * Returns the request id of the generated packet if applicable, otherwise 1.
  * On any error, 0 is returned.
- * The pdu is freed by snmp_send() unless a failure occured.
+ * The pdu is freed by snmp_send() unless a failure occurred.
  */
 int snmp_send(struct snmp_session *, struct snmp_pdu *);
 
diff --git a/lib/getfullhostname.c b/lib/getfullhostname.c
index 1423d6c080..d58abb6eb6 100644
--- a/lib/getfullhostname.c
+++ b/lib/getfullhostname.c
@@ -25,21 +25,21 @@
 #include "util.h"
 
 /**
- \retval NULL  An error occured.
- \retval *    The fully qualified name (FQDN) of the current host.
- *            Pointer is only valid until the next call to the gethost*() functions.
- *
- \todo Make this a squid String result so the duration limit is flexible.
+ * \retval nullptr  An error occurred.
+ * \retval *        The fully qualified name (FQDN) of the current host.
+ *                  Pointer is only valid until the next call to the
+ *                  gethost*() functions.
  */
 const char *
 getfullhostname(void)
 {
     const struct hostent *hp = NULL;
+    // TODO: make this dynamic so the duration limit is flexible
     static char buf[RFC2181_MAXHOSTNAMELEN + 1];
 
     if (gethostname(buf, RFC2181_MAXHOSTNAMELEN) < 0)
         return NULL;
-    /** \todo convert this to a getaddrinfo() call */
+    // TODO: convert this to a getaddrinfo() call
     if ((hp = gethostbyname(buf)) != NULL)
         xstrncpy(buf, hp->h_name, RFC2181_MAXHOSTNAMELEN);
     return buf;
diff --git a/lib/ntlmauth/support_endian.h b/lib/ntlmauth/support_endian.h
index 1619697195..e85ecab96e 100644
--- a/lib/ntlmauth/support_endian.h
+++ b/lib/ntlmauth/support_endian.h
@@ -40,7 +40,7 @@
  * uint32_t le32toh(uint32_t);
  *
  * XXX: What about unusual byte orders like 3412 or 2143 ?
- *      Never had any problems reported, so we dont worry about them.
+ *      Never had any problems reported, so we do not worry about them.
  */
 
 #if !HAVE_HTOLE16 && !defined(htole16)
diff --git a/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h
index ecccb280c3..87a2b5089e 100644
--- a/lib/smblib/smblib-priv.h
+++ b/lib/smblib/smblib-priv.h
@@ -170,7 +170,7 @@ typedef unsigned char UCHAR;
 /* We define these as offsets into a char SMB[] array for the   */
 /* sake of portability                                          */
 
-/* NOTE!. Some of the lenght defines, SMB_<protreq>_len do not include */
+/* NOTE!. Some of the length defines, SMB_<protreq>_len do not include */
 /* the data that follows in the SMB packet, so the code will have to   */
 /* take that into account.                                             */
 
diff --git a/lib/snmplib/snmp_error.c b/lib/snmplib/snmp_error.c
index 80975352db..50489cdba9 100644
--- a/lib/snmplib/snmp_error.c
+++ b/lib/snmplib/snmp_error.c
@@ -44,7 +44,7 @@ static const char *error_string[25] = {
     "There is no such variable name in this MIB.",
     "The value given has the wrong type, length, or value",
     "This variable is read only",
-    "A general failure occured",
+    "A general failure occurred",
 
     /* 0x06 - 0x09 */
     /* SNMPv2 Errors */
diff --git a/src/AsyncEngine.h b/src/AsyncEngine.h
index c5f797e534..5782d2b898 100644
--- a/src/AsyncEngine.h
+++ b/src/AsyncEngine.h
@@ -28,7 +28,7 @@ public:
          * registered with it that can create events
          */
         EVENT_IDLE = -1,
-        /* some error has occured in this engine */
+        /* some error has occurred in this engine */
         EVENT_ERROR = -2
     };
 
diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 803b7ab628..4e2da9d63a 100644
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -284,7 +284,7 @@ uint32_t
 CacheDigest::CalcMaskSize(uint64_t cap, uint8_t bpe)
 {
     uint64_t bitCount = (cap * bpe) + 7;
-    assert(bitCount < INT_MAX); // dont 31-bit overflow later
+    assert(bitCount < INT_MAX); // do not 31-bit overflow later
     return static_cast<uint32_t>(bitCount / 8);
 }
 
diff --git a/src/CommCalls.h b/src/CommCalls.h
index 1fd21ee57b..85618564c8 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -17,7 +17,7 @@
 
 /* CommCalls implement AsyncCall interface for comm_* callbacks.
  * The classes cover two call dialer kinds:
- *     - A C-style call using a function pointer (depricated);
+ *     - A C-style call using a function pointer (deprecated);
  *     - A C++-style call to an AsyncJob child.
  * and several comm_* callback kinds:
  *     - accept (IOACB)
diff --git a/src/EventLoop.h b/src/EventLoop.h
index 87c5abaac3..74d194dd15 100644
--- a/src/EventLoop.h
+++ b/src/EventLoop.h
@@ -87,7 +87,7 @@ private:
     TimeEngine * timeService;
     AsyncEngine * primaryEngine;
     int loop_delay; /**< the delay to be given to the primary engine */
-    bool error; /**< has an error occured in this loop */
+    bool error; /**< has an error occurred in this loop */
     bool runOnceResult; /**< the result from runOnce */
 };
 
diff --git a/src/Parsing.cc b/src/Parsing.cc
index e6af8261b4..2a477585e7 100644
--- a/src/Parsing.cc
+++ b/src/Parsing.cc
@@ -286,7 +286,7 @@ GetHostWithPort(char *token, Ip::Address *ipa)
 
     if (NULL == host)
         ipa->setAnyAddr();
-    else if ( ipa->GetHostByName(host) ) /* dont use ipcache. Accept either FQDN or IPA. */
+    else if (ipa->GetHostByName(host)) /* do not use ipcache. Accept either FQDN or IPA. */
         (void) 0;
     else
         return false;
diff --git a/src/RequestFlags.h b/src/RequestFlags.h
index b8128d79d6..ba2568199c 100644
--- a/src/RequestFlags.h
+++ b/src/RequestFlags.h
@@ -90,7 +90,7 @@ public:
     bool noDirect = false;
     /** Reply with chunked transfer encoding */
     bool chunkedReply = false;
-    /** set if stream error has occured */
+    /** set if stream error has occurred */
     bool streamError = false;
     /** internal ssl-bump request to get server cert */
     bool sslPeek = false;
diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
index 9536deee8a..4608799a53 100644
--- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
+++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -1310,13 +1310,13 @@ const char
     case LDAP_ERR_NOTFOUND:
         return "Item or object has not been found";
     case LDAP_ERR_OTHER:
-        return "An unknown error has occured";
+        return "An unknown error has occurred";
     case LDAP_ERR_FAILED:
         return "Operation has failed";
     case LDAP_ERR_SUCCESS:
         return "Operation is successful";
     default:
-        return "An unknown error has occured";
+        return "An unknown error has occurred";
     }
 }
 
diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 95e58526cc..8a15e1be83 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -396,7 +396,7 @@ bool Adaptation::Icap::ModXact::virginBodyEndReached(const Adaptation::Icap::Vir
 {
     return
         !act.active() || // did all (assuming it was originally planned)
-        !virgin.body_pipe->expectMoreAfter(act.offset()); // wont have more
+        !virgin.body_pipe->expectMoreAfter(act.offset()); // will not have more
 }
 
 // the size of buffered virgin body data available for the specified activity
diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h
index 4b0dc6d36a..f24958e0bd 100644
--- a/src/adaptation/icap/ModXact.h
+++ b/src/adaptation/icap/ModXact.h
@@ -63,7 +63,7 @@ public:
     VirginBodyAct();
 
     void plan(); // the activity may happen; do not consume at or above offset
-    void disable(); // the activity wont continue; no consumption restrictions
+    void disable(); // the activity will not continue; no consumption restrictions
 
     bool active() const { return theState == stActive; }
     bool disabled() const { return theState == stDisabled; }
diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index 6afb4308ed..c262386e46 100644
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -585,8 +585,7 @@ void Adaptation::Icap::Xaction::noteInitiatorAborted()
 void Adaptation::Icap::Xaction::setOutcome(const Adaptation::Icap::XactOutcome &xo)
 {
     if (al.icap.outcome != xoUnknown) {
-        debugs(93, 3, HERE << "Warning: reseting outcome: from " <<
-               al.icap.outcome << " to " << xo);
+        debugs(93, 3, "WARNING: resetting outcome: from " << al.icap.outcome << " to " << xo);
     } else {
         debugs(93, 4, HERE << xo);
     }
diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h
index 00bcca6a67..b36f530619 100644
--- a/src/auth/CredentialsCache.h
+++ b/src/auth/CredentialsCache.h
@@ -51,7 +51,7 @@ public:
     void cleanup();
 
     /**
-     * Cleanup cache data after a reconfiguration has occured.
+     * Cleanup cache data after a reconfiguration has occurred.
      * Similar to cleanup() but also flushes stale config dependent
      * state from retained entries.
      */
diff --git a/src/auth/basic/UserRequest.cc b/src/auth/basic/UserRequest.cc
index 0c885b8d43..d4c3e2fe0a 100644
--- a/src/auth/basic/UserRequest.cc
+++ b/src/auth/basic/UserRequest.cc
@@ -171,7 +171,7 @@ Auth::Basic::UserRequest::HandleReply(void *data, const Helper::Reply &reply)
     r->auth_user_request->user()->notes.appendNewOnly(&reply.notes);
 
     /* this is okay since we only play with the Auth::Basic::User child fields below
-     * and dont pass the pointer itself anywhere */
+     * and do not pass the pointer itself anywhere */
     Auth::Basic::User *basic_auth = dynamic_cast<Auth::Basic::User *>(r->auth_user_request->user().getRaw());
 
     assert(basic_auth != NULL);
diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc
index 3dfd8ca31b..97106199a4 100644
--- a/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc
+++ b/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc
@@ -402,7 +402,7 @@ get_ad_groups(char *ad_groups, krb5_context context, krb5_pac pac)
 
     p = (unsigned char *)ad_data->data;
 
-    debug((char *) "%s| %s: INFO: Got PAC data of lengh %d\n",
+    debug((char *) "%s| %s: INFO: Got PAC data of length %d\n",
           LogTime(), PROGRAM, (int)ad_data->length);
 
     /* Skip 16 bytes icommon RPC header
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1bd43590bf..add5793147 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1436,7 +1436,7 @@ parse_address(Ip::Address *addr)
         addr->setNoAddr();
     else if ( (*addr = token) ) // try parse numeric/IPA
         (void) 0;
-    else if (addr->GetHostByName(token)) // dont use ipcache
+    else if (addr->GetHostByName(token)) // do not use ipcache
         (void) 0;
     else { // not an IP and not a hostname
         debugs(3, DBG_CRITICAL, "FATAL: invalid IP address or domain name '" << token << "'");
@@ -3505,7 +3505,7 @@ parsePortSpecification(const AnyP::PortCfgPointer &s, char *token)
             s->s.setIPv4();
         debugs(3, 3, portType << "_port: Listen on Host/IP: " << host << " --> " << s->s);
     } else if ( s->s.GetHostByName(host) ) { /* check/parse for FQDN */
-        /* dont use ipcache */
+        /* do not use ipcache */
         s->defaultsite = xstrdup(host);
         s->s.port(port);
         if (!Ip::EnableIpv6)
@@ -4361,7 +4361,7 @@ dump_icap_service_type(StoreEntry * entry, const char *name, const Adaptation::I
 static void
 parse_icap_class_type()
 {
-    debugs(93, DBG_CRITICAL, "WARNING: 'icap_class' is depricated. " <<
+    debugs(93, DBG_CRITICAL, "WARNING: 'icap_class' is deprecated. " <<
            "Use 'adaptation_service_set' instead");
     Adaptation::Config::ParseServiceSet();
 }
@@ -4369,7 +4369,7 @@ parse_icap_class_type()
 static void
 parse_icap_access_type()
 {
-    debugs(93, DBG_CRITICAL, "WARNING: 'icap_access' is depricated. " <<
+    debugs(93, DBG_CRITICAL, "WARNING: 'icap_access' is deprecated. " <<
            "Use 'adaptation_access' instead");
     Adaptation::Config::ParseAccess(LegacyParser);
 }
@@ -4886,14 +4886,14 @@ parse_UrlHelperTimeout(SquidConfig::UrlHelperTimeout *config)
             else if (strcasecmp(value, "use_configured_response") == 0) {
                 config->action = toutActUseConfiguredResponse;
             } else {
-                debugs(3, DBG_CRITICAL, "FATAL: unsuported \"on_timeout\"  action:" << value);
+                debugs(3, DBG_CRITICAL, "FATAL: unsupported \"on_timeout\" action: " << value);
                 self_destruct();
                 return;
             }
         } else if (strcasecmp(key, "response") == 0) {
             config->response = xstrdup(value);
         } else {
-            debugs(3, DBG_CRITICAL, "FATAL: unsuported option " << key);
+            debugs(3, DBG_CRITICAL, "FATAL: unsupported option " << key);
             self_destruct();
             return;
         }
@@ -4905,7 +4905,7 @@ parse_UrlHelperTimeout(SquidConfig::UrlHelperTimeout *config)
     }
 
     if (config->action != toutActUseConfiguredResponse && config->response) {
-        debugs(3, DBG_CRITICAL, "FATAL: 'response=' option is valid only when used with the  'on_timeout=use_configured_response' option");
+        debugs(3, DBG_CRITICAL, "FATAL: 'response=' option is valid only when used with the 'on_timeout=use_configured_response' option");
         self_destruct();
     }
 }
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 4286716e60..74747ad2d0 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -5636,7 +5636,7 @@ DOC_START
 		The default is to use HTTP request URL as the store ID.
 
 	  BH
-		An internal error occured in the helper, preventing
+		An internal error occurred in the helper, preventing
 		a result being identified.
 
 	In addition to the above kv-pairs Squid also understands the following
diff --git a/src/clientStream.cc b/src/clientStream.cc
index 5ddac7918a..adda3468c4 100644
--- a/src/clientStream.cc
+++ b/src/clientStream.cc
@@ -209,7 +209,7 @@ clientStreamDetach(clientStreamNode * thisObject, ClientHttpRequest * http)
 
     delete thisObject;
 
-    /* and tell the prev that the detach has occured */
+    /* and tell the prev that the detach has occurred */
     /*
      * We do it in thisObject order so that the detaching node is always
      * at the end of the list
diff --git a/src/client_side.cc b/src/client_side.cc
index 9a4766adfa..0ff258707e 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -792,7 +792,7 @@ void
 clientSocketRecipient(clientStreamNode * node, ClientHttpRequest * http,
                       HttpReply * rep, StoreIOBuffer receivedData)
 {
-    // dont tryt to deliver if client already ABORTED
+    // do not try to deliver if client already ABORTED
     if (!http->getConn() || !cbdataReferenceValid(http->getConn()) || !Comm::IsConnOpen(http->getConn()->clientConnection))
         return;
 
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index e89dc2b9b4..2fbbb41932 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1924,7 +1924,7 @@ clientReplyContext::sendStreamError(StoreIOBuffer const &result)
      * We call into the stream, because we don't know that there is a
      * client socket!
      */
-    debugs(88, 5, "clientReplyContext::sendStreamError: A stream error has occured, marking as complete and sending no data.");
+    debugs(88, 5, "A stream error has occurred, marking as complete and sending no data.");
     StoreIOBuffer localTempBuffer;
     flags.complete = 1;
     http->request->flags.streamError = true;
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 81eedaf807..5ca9180af9 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1385,8 +1385,8 @@ ClientRequestContext::checkNoCacheDone(const allow_t &answer)
 {
     acl_checklist = NULL;
     if (answer.denied()) {
-        http->request->flags.noCache = true; // dont read reply from cache
-        http->request->flags.cachable = false; // dont store reply into cache
+        http->request->flags.noCache = true; // do not read reply from cache
+        http->request->flags.cachable = false; // do not store reply into cache
     }
     http->doCallouts();
 }
diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc
index f9cb8321a5..620e68180a 100644
--- a/src/clients/FtpGateway.cc
+++ b/src/clients/FtpGateway.cc
@@ -1169,7 +1169,7 @@ Ftp::Gateway::start()
 {
     if (!checkAuth(&request->header)) {
         /* create appropriate reply */
-        SBuf realm(ftpRealm()); // local copy so SBuf wont disappear too early
+        SBuf realm(ftpRealm()); // local copy so SBuf will not disappear too early
         HttpReply *reply = ftpAuthRequired(request.getRaw(), realm);
         entry->replaceHttpReply(reply);
         serverComplete();
@@ -1272,7 +1272,7 @@ Ftp::Gateway::loginFailed()
 #if HAVE_AUTH_MODULE_BASIC
     /* add Authenticate header */
     // XXX: performance regression. c_str() may reallocate
-    SBuf realm(ftpRealm()); // local copy so SBuf wont disappear too early
+    SBuf realm(ftpRealm()); // local copy so SBuf will not disappear too early
     newrep->header.putAuth("Basic", realm.c_str());
 #endif
 
@@ -2093,7 +2093,7 @@ void Ftp::Gateway::readStor()
         debugs(9, 3, HERE << "starting data transfer");
         switchTimeoutToDataChannel();
         sendMoreRequestBody();
-        fwd->dontRetry(true); // dont permit re-trying if the body was sent.
+        fwd->dontRetry(true); // do not permit re-trying if the body was sent.
         state = WRITING_DATA;
         debugs(9, 3, HERE << "writing data channel");
     } else if (code == 150) {
diff --git a/src/comm/Read.h b/src/comm/Read.h
index b27cfac54d..514d03f634 100644
--- a/src/comm/Read.h
+++ b/src/comm/Read.h
@@ -37,9 +37,9 @@ bool MonitorsRead(int fd);
  * The returned flag is also placed in params.flag.
  *
  * \retval Comm::OK          data has been read and placed in buf, amount in params.size
- * \retval Comm::COMM_ERROR  an error occured, the code is placed in params.xerrno
- * \retval Comm::INPROGRESS  unable to read at this time, or a minor error occured
- * \retval Comm::ENDFILE     0-byte read has occured.
+ * \retval Comm::COMM_ERROR  an error occurred, the code is placed in params.xerrno
+ * \retval Comm::INPROGRESS  unable to read at this time, or a minor error occurred
+ * \retval Comm::ENDFILE     0-byte read has occurred.
  *                           Usually indicates the remote end has disconnected.
  */
 Comm::Flag ReadNow(CommIoCbParams &params, SBuf &buf);
diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 3dc2953e63..2973ba0031 100644
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -345,10 +345,10 @@ Comm::TcpAcceptor::notify(const Comm::Flag flag, const Comm::ConnectionPointer &
  * accept() and process
  * Wait for an incoming connection on our listener socket.
  *
- * \retval Comm::OK         success. details parameter filled.
- * \retval Comm::NOMESSAGE  attempted accept() but nothing useful came in.
- * \retval Comm::COMM_ERROR      an outright failure occured.
- *                         Or if this client has too many connections already.
+ * \retval Comm::OK          success. details parameter filled.
+ * \retval Comm::NOMESSAGE   attempted accept() but nothing useful came in.
+ * \retval Comm::COMM_ERROR  an outright failure occurred.
+ *                           Or this client has too many connections already.
  */
 Comm::Flag
 Comm::TcpAcceptor::oldAccept(Comm::ConnectionPointer &details)
diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 8c1f92d929..ab26575448 100644
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1558,7 +1558,7 @@ Dns::Init(void)
     static int init = 0;
 
     if (DnsSocketA < 0 && DnsSocketB < 0) {
-        Ip::Address addrV6; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
+        Ip::Address addrV6; // since we do not want to alter Config.Addrs.udp_* and do not have one of our own.
 
         if (!Config.Addrs.udp_outgoing.isNoAddr())
             addrV6 = Config.Addrs.udp_outgoing;
diff --git a/src/enums.h b/src/enums.h
index bc320f367e..c3bff07f11 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -95,12 +95,12 @@ enum {
 typedef enum {
     STREAM_NONE,        /* No particular status */
     STREAM_COMPLETE,        /* All data has been flushed, no more reads allowed */
-    /* an unpredicted end has occured, no more
-     * reads occured, but no need to tell
-     * downstream that an error occured
+    /* an unpredicted end has occurred, no more
+     * reads occurred, but no need to tell
+     * downstream that an error occurred
      */
     STREAM_UNPLANNED_COMPLETE,
-    /* An error has occured in this node or an above one,
+    /* An error has occurred in this node or an above one,
      * and the node is not generating an error body / it's
      * midstream
      */
diff --git a/src/esi/Context.h b/src/esi/Context.h
index 9a79552d7c..9d71044f71 100644
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -78,7 +78,7 @@ public:
         int oktosend:1;
         int finished:1;
 
-        /* an error has occured, send full body replies
+        /* an error has occurred, send full body replies
          * regardless. Note that we don't fail midstream
          * because we buffer until we can not fail
          */
diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 1ee42e75bb..d8353f5c8f 100644
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -308,7 +308,7 @@ ESIContext::kick ()
         /* we've been detached from - we can't do anything more */
         return ESI_KICK_FAILED;
 
-    /* Something has occured. Process any remaining nodes */
+    /* Something has occurred. Process any remaining nodes */
     if (!flags.finished)
         /* Process some of our data */
         switch (process ()) {
@@ -1666,7 +1666,7 @@ esiTry::addElement(ESIElement::Pointer element)
 
     if (dynamic_cast<esiAttempt*>(element.getRaw())) {
         if (attempt.getRaw()) {
-            debugs(86, DBG_IMPORTANT, "esiTryAdd: Failed for " << this << " - try allready has an attempt node (section 3.4)");
+            debugs(86, DBG_IMPORTANT, "esiTryAdd: Failed for " << this << " - try already has an attempt node (section 3.4)");
             return false;
         }
 
diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc
index f1deb80420..b05a242203 100644
--- a/src/eui/Eui48.cc
+++ b/src/eui/Eui48.cc
@@ -20,7 +20,7 @@
 #include <cerrno>
 
 /* START Legacy includes pattern */
-/* TODO: clean this up so we dont have per-OS requirements.
+/* TODO: clean this up so we do not have per-OS requirements.
          The files are checked for existence individually
          and can be wrapped
  */
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 1b3ea43a88..97613ea06f 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -285,7 +285,7 @@ parse_externalAclHelper(external_acl ** list)
         (*fmt)->quote = a->quote;
 
         // compatibility for old tokens incompatible with Format::Token syntax
-#if USE_OPENSSL // dont bother if we dont have to.
+#if USE_OPENSSL // do not bother unless we have to.
         if (strncmp(token, "%USER_CERT_", 11) == 0) {
             (*fmt)->type = Format::LFT_EXT_ACL_USER_CERT;
             (*fmt)->data.string = xstrdup(token + 11);
@@ -610,7 +610,7 @@ aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch)
             if (!key)
                 return ACCESS_DUNNO; // insufficent data to continue
             if (strcmp(key, (char*)entry->key) != 0) {
-                debugs(82, 9, "entry key='" << (char *)entry->key << "', our key='" << key << "' dont match. Discarded.");
+                debugs(82, 9, "entry key='" << (char *)entry->key << "', our key='" << key << "' do not match. Discarded.");
                 // too bad. need a new lookup.
                 entry = ch->extacl_entry = NULL;
             }
diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc
index ddbd5afb13..bdf82d9c9d 100644
--- a/src/fs/ufs/UFSStoreState.cc
+++ b/src/fs/ufs/UFSStoreState.cc
@@ -55,7 +55,7 @@ Fs::Ufs::UFSStoreState::ioCompletedNotification()
            std::setfill('0') << std::hex << std::setw(8) << swap_filen  <<
            " status "<< std::setfill(' ') << std::dec << theFile->error());
 
-    /* Ok, notification past open means an error has occured */
+    /* Ok, notification past open means an error has occurred */
     assert (theFile->error());
     tryClosing();
 }
diff --git a/src/helper/ChildConfig.cc b/src/helper/ChildConfig.cc
index 2561527274..1eb34da41b 100644
--- a/src/helper/ChildConfig.cc
+++ b/src/helper/ChildConfig.cc
@@ -64,7 +64,7 @@ Helper::ChildConfig::needNew() const
     /* keep a minimum of n_idle helpers free... */
     if ( (n_active + n_idle) < n_max) return n_idle;
 
-    /* dont ever start more than n_max processes. */
+    /* do not ever start more than n_max processes. */
     return (n_max - n_active);
 }
 
@@ -94,7 +94,7 @@ Helper::ChildConfig::parseConfig()
         } else if (strncmp(token, "idle=", 5) == 0) {
             n_idle = xatoui(token + 5);
             if (n_idle < 1) {
-                debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Using idle=0 for helpers causes request failures. Overiding to use idle=1 instead.");
+                debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Using idle=0 for helpers causes request failures. Overriding to use idle=1 instead.");
                 n_idle = 1;
             }
         } else if (strncmp(token, "concurrency=", 12) == 0) {
@@ -123,12 +123,12 @@ Helper::ChildConfig::parseConfig()
     /* simple sanity. */
 
     if (n_startup > n_max) {
-        debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Capping startup=" << n_startup << " to the defined maximum (" << n_max <<")");
+        debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Capping startup=" << n_startup << " to the defined maximum (" << n_max <<")");
         n_startup = n_max;
     }
 
     if (n_idle > n_max) {
-        debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Capping idle=" << n_idle << " to the defined maximum (" << n_max <<")");
+        debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Capping idle=" << n_idle << " to the defined maximum (" << n_max <<")");
         n_idle = n_max;
     }
 
diff --git a/src/http.cc b/src/http.cc
index 1ccd70ffe5..a44a8ef23f 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1545,7 +1545,7 @@ HttpStateData::maybeMakeSpaceAvailable(bool doGrow)
 
     if (limitBuffer < 0 || inBuf.length() >= (SBuf::size_type)limitBuffer) {
         // when buffer is at or over limit already
-        debugs(11, 7, "wont read up to " << limitBuffer << ". buffer has (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
+        debugs(11, 7, "will not read up to " << limitBuffer << ". buffer has (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
         debugs(11, DBG_DATA, "buffer has {" << inBuf << "}");
         // Process next response from buffer
         processReply();
@@ -1556,17 +1556,17 @@ HttpStateData::maybeMakeSpaceAvailable(bool doGrow)
     const size_t read_size = calcBufferSpaceToReserve(inBuf.spaceSize(), (limitBuffer - inBuf.length()));
 
     if (!read_size) {
-        debugs(11, 7, "wont read up to " << read_size << " into buffer (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
+        debugs(11, 7, "will not read up to " << read_size << " into buffer (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
         return false;
     }
 
-    // just report whether we could grow or not, dont actually do it
+    // just report whether we could grow or not, do not actually do it
     if (doGrow)
         return (read_size >= 2);
 
     // we may need to grow the buffer
     inBuf.reserveSpace(read_size);
-    debugs(11, 8, (!flags.do_next_read ? "wont" : "may") <<
+    debugs(11, 8, (!flags.do_next_read ? "will not" : "may") <<
            " read up to " << read_size << " bytes info buf(" << inBuf.length() << "/" << inBuf.spaceSize() <<
            ") from " << serverConnection);
 
diff --git a/src/http/StatusLine.cc b/src/http/StatusLine.cc
index 6ec9ce8c73..3a20ba5cd2 100644
--- a/src/http/StatusLine.cc
+++ b/src/http/StatusLine.cc
@@ -80,7 +80,7 @@ Http::StatusLine::parse(const String &protoPrefix, const char *start, const char
     // casesensitive comparison (which is required by HTTP errata?)
 
     if (protoPrefix.cmp("ICY", 3) == 0) {
-        debugs(57, 3, "Invalid HTTP identifier. Detected ICY protocol istead.");
+        debugs(57, 3, "Invalid HTTP identifier. Detected ICY protocol instead.");
         protocol = AnyP::PROTO_ICY;
         start += protoPrefix.size();
     } else if (protoPrefix.caseCmp(start, protoPrefix.size()) == 0) {
diff --git a/src/http/Stream.cc b/src/http/Stream.cc
index 3bcc4227e2..a49693e326 100644
--- a/src/http/Stream.cc
+++ b/src/http/Stream.cc
@@ -268,7 +268,7 @@ Http::Stream::sendStartOfMessage(HttpReply *rep, StoreIOBuffer bodyData)
     assert(rep);
     MemBuf *mb = rep->pack();
 
-    // dump now, so we dont output any body.
+    // dump now, so we do not output any body.
     debugs(11, 2, "HTTP Client " << clientConnection);
     debugs(11, 2, "HTTP Client REPLY:\n---------\n" << mb->buf << "\n----------");
 
diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h
index baebe05342..0410b290fa 100644
--- a/src/http/one/Parser.h
+++ b/src/http/one/Parser.h
@@ -135,7 +135,7 @@ protected:
      *                identified accurately within limit characters.
      *                mimeHeaderBlock_ has been updated and buf_ consumed.
      *
-     * \retval false  An error occured, or no mime terminator found within limit.
+     * \retval false  An error occurred, or no mime terminator found within limit.
      */
     bool grabMimeBlock(const char *which, const size_t limit);
 
diff --git a/src/http/one/TeChunkedParser.h b/src/http/one/TeChunkedParser.h
index dca7825735..8ea64f3f80 100644
--- a/src/http/one/TeChunkedParser.h
+++ b/src/http/one/TeChunkedParser.h
@@ -32,7 +32,7 @@ class TeChunkedParser : public Http1::Parser
 {
 public:
     TeChunkedParser();
-    virtual ~TeChunkedParser() {theOut=NULL;/* we dont own this object */}
+    virtual ~TeChunkedParser() { theOut=nullptr; /* we do not own this object */ }
 
     /// set the buffer to be used to store decoded chunk data
     void setPayloadBuffer(MemBuf *parsedContent) {theOut = parsedContent;}
diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc
index ea4a432207..aa514ba22d 100644
--- a/src/ident/Ident.cc
+++ b/src/ident/Ident.cc
@@ -256,7 +256,7 @@ Ident::Start(const Comm::ConnectionPointer &conn, IDCB * callback, void *data)
     state = new IdentStateData;
     state->hash.key = xstrdup(key);
 
-    // copy the conn details. We dont want the original FD to be re-used by IDENT.
+    // copy the conn details. We do not want the original FD to be re-used by IDENT.
     state->conn = conn->copyDetails();
     // NP: use random port for secure outbound to IDENT_PORT
     state->conn->local.port(0);
diff --git a/src/ip/Address.h b/src/ip/Address.h
index 3bb01f1fc1..d20bb9ab15 100644
--- a/src/ip/Address.h
+++ b/src/ip/Address.h
@@ -137,7 +137,7 @@ public:
     /*@}*/
 
     /** Retrieve the Port if stored.
-     \retval 0 Port is unset or an error occured.
+     \retval 0 Port is unset or an error occurred.
      \retval n Port associated with this address in host native -endian.
      */
     unsigned short port() const;
@@ -145,7 +145,7 @@ public:
     /** Set the Port value for an address.
      *  Replaces any previously existing Port value.
      \param port Port being assigned in host native -endian.
-     \retval 0 Port is unset or an error occured.
+     \retval 0 Port is unset or an error occurred.
      \retval n Port associated with this address in host native -endian.
      */
     unsigned short port(unsigned short port);
diff --git a/src/ipcache.cc b/src/ipcache.cc
index a28b9d494c..2f39f1cc29 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -712,7 +712,7 @@ ipcache_init(void)
  \param flags       Default is NULL, set to IP_LOOKUP_IF_MISS
  *          to explicitly perform DNS lookups.
  *
- \retval NULL   An error occured during lookup
+ \retval NULL   An error occurred during lookup
  \retval NULL   No results available in cache and no lookup specified
  \retval *  Pointer to the ipcahce_addrs structure containing the lookup results
  */
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 72dccf67f5..07299129b4 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1308,7 +1308,7 @@ void
 peerConnectSucceded(CachePeer * p)
 {
     if (!p->tcp_up) {
-        debugs(15, 2, "TCP connection to " << p->host << "/" << p->http_port << " succeded");
+        debugs(15, 2, "TCP connection to " << p->host << "/" << p->http_port << " succeeded");
         p->tcp_up = p->connect_fail_limit; // NP: so peerAlive(p) works properly.
         peerAlive(p);
         if (!p->n_addresses)
diff --git a/src/pconn.cc b/src/pconn.cc
index 436456ea2b..d8ae568fa3 100644
--- a/src/pconn.cc
+++ b/src/pconn.cc
@@ -255,7 +255,7 @@ IdleConnList::findUseable(const Comm::ConnectionPointer &aKey)
         if (!isAvailable(i))
             continue;
 
-        // local end port is required, but dont match.
+        // local end port is required, but do not match.
         if (keyCheckPort && aKey->local.port() != theList_[i]->local.port())
             continue;
 
diff --git a/src/redirect.cc b/src/redirect.cc
index 15cb0266c9..ca596e324e 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -35,7 +35,7 @@
 #include "ssl/support.h"
 #endif
 
-/// url maximum lengh + extra informations passed to redirector
+/// url maximum length + extra informations passed to redirector
 #define MAX_REDIRECTOR_REQUEST_STRLEN (MAX_URL + 1024)
 
 class RedirectStateData
diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc
index ccba1dd847..d6db76920f 100644
--- a/src/security/PeerOptions.cc
+++ b/src/security/PeerOptions.cc
@@ -230,7 +230,7 @@ Security::PeerOptions::updateTlsVersionLimits()
             break;
         }
         if (add) {
-#if USE_GNUTLS // dont bother otherwise
+#if USE_GNUTLS // do not bother otherwise
             if (sslOptions.isEmpty())
                 sslOptions.append(add+1, strlen(add+1));
             else
diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index 79508351a9..0a1ee43ec6 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -1821,13 +1821,13 @@ void Ftp::Server::userDataCompletionCheckpoint(int finalStatusCode)
         // because we want to signal the FTP user that we are not fully
         // done processing its data stream, even though all data bytes
         // have been sent or received already.
-        debugs(33, 5, "Transfering from FTP server is not complete");
+        debugs(33, 5, "Transferring from FTP server is not complete");
         return;
     }
 
     // Adjust our reply if the server aborted with an error before we are done.
     if (master->userDataDone == 226 && originDataDownloadAbortedOnError) {
-        debugs(33, 5, "Transfering from FTP server terminated with an error, adjust status code");
+        debugs(33, 5, "Transferring from FTP server terminated with an error, adjust status code");
         master->userDataDone = 451;
     }
     completeDataDownload();
diff --git a/src/servers/Http1Server.cc b/src/servers/Http1Server.cc
index aff5a272c2..f12a34c43b 100644
--- a/src/servers/Http1Server.cc
+++ b/src/servers/Http1Server.cc
@@ -75,7 +75,7 @@ Http::One::Server::parseOneRequest()
     PROF_start(HttpServer_parseOneRequest);
 
     // parser is incremental. Generate new parser state if we,
-    // a) dont have one already
+    // a) do not have one already
     // b) have completed the previous request parsing already
     if (!parser_ || !parser_->needsMoreData())
         parser_ = new Http1::RequestParser(mayTunnelUnsupportedProto());
diff --git a/src/stat.cc b/src/stat.cc
index 5e0e4160ed..d4e91b5f07 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1287,7 +1287,7 @@ statAvgTick(void *)
             i /= (int) dt;
 
             if (Config.warnings.high_pf < i)
-                debugs(18, DBG_CRITICAL, "WARNING: Page faults occuring at " << i << "/sec");
+                debugs(18, DBG_CRITICAL, "WARNING: Page faults occurring at " << i << "/sec");
         }
     }
 
diff --git a/src/store.cc b/src/store.cc
index 341abb140d..c0277c4422 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -216,8 +216,7 @@ StoreEntry::delayAwareRead(const Comm::ConnectionPointer &conn, char *buf, int l
         // readers appeared to care around 2009/12/14 as they skipped reading
         // for other reasons. Closing may already be true at the delyaAwareRead
         // call time or may happen while we wait after delayRead() above.
-        debugs(20, 3, HERE << "wont read from closing " << conn << " for " <<
-               callback);
+        debugs(20, 3, "will not read from closing " << conn << " for " << callback);
         return; // the read callback will never be called
     }
 
@@ -354,7 +353,7 @@ StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
     if (!deferredProducer)
         deferredProducer = producer;
     else
-        debugs(20, 5, HERE << "Deferred producer call is allready set to: " <<
+        debugs(20, 5, "Deferred producer call is already set to: " <<
                *deferredProducer << ", requested call: " << *producer);
 }
 
diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index 50b8c96bab..0edf69a35a 100644
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -48,7 +48,7 @@ Helper::ChildConfig::needNew() const
     /* keep a minimum of n_idle helpers free... */
     if ( (n_active + n_idle) < n_max) return n_idle;
 
-    /* dont ever start more than n_max processes. */
+    /* do not ever start more than n_max processes. */
     return (n_max - n_active);
 }
 
diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 3d6bb66ebc..082804d01a 100644
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -103,7 +103,7 @@ testEventLoop::testRunOnce()
  * This test works by having a customer dispatcher which shuts the loop down
  * once its been invoked twice.
  *
- * It also tests that loop.run() and loop.stop() work, because if they dont
+ * It also tests that loop.run() and loop.stop() work, because if they do not
  * work, this test will either hang, or fail.
  */
 
@@ -154,7 +154,7 @@ testEventLoop::testRegisterEngine()
 /* each AsyncEngine needs to be given a timeout. We want one engine in each
  * loop to be given the timeout value - and the rest to have a timeout of 0.
  * The last registered engine should be given this timeout, which will mean
- * that we dont block in the loop until the last engine. This will allow for
+ * that we do not block in the loop until the last engine. This will allow for
  * dynamic introduction and removal of engines, as long as the last engine
  * is one which can do a os call rather than busy waiting.
  *
diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 44c777b329..935a3c3777 100644
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -813,7 +813,7 @@ void
 testSBuf::testReserve()
 {
     SBufReservationRequirements requirements;
-    // use unusual numbers to ensure we dont hit a lucky boundary situation
+    // use unusual numbers to ensure we do not hit a lucky boundary situation
     requirements.minSpace = 10;
     requirements.idealSpace = 82;
     requirements.maxCapacity = 259;
diff --git a/src/tools.cc b/src/tools.cc
index 0fe5aadc48..b7a0194b95 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -603,7 +603,7 @@ no_suid(void)
     uid_t uid;
     leave_suid();
     uid = geteuid();
-    debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");
+    debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
 
     if (setuid(0) < 0) {
         int xerrno = errno;
diff --git a/src/unlinkd_daemon.cc b/src/unlinkd_daemon.cc
index 6de9d8e347..c9aa986932 100644
--- a/src/unlinkd_daemon.cc
+++ b/src/unlinkd_daemon.cc
@@ -45,7 +45,7 @@
  *
  \param argc Ignored.
  \param argv Ignored.
- \retval ERR An error occured removing the file.
+ \retval ERR An error occurred removing the file.
  \retval OK  The file has been removed.
  */
 int
diff --git a/test-suite/debug.cc b/test-suite/debug.cc
index da5d104819..425e7291a8 100644
--- a/test-suite/debug.cc
+++ b/test-suite/debug.cc
@@ -50,7 +50,7 @@ main(int, char *[])
 {
     Debug::Levels[1] = 8;
     debugs (1,1,"test" << "string");
-    debugs (1,9,"dont show this" << "string");
+    debugs (1,9,"do not show this" << "string");
     debugs (1,1,"test" << "string");
     debugs (1,1,"test" << "string");
     if (true)