tidying

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2dab6775a986ef9683f45f27bd7d1a3911f60239..c261e13c7b75ba761087e5fc36240a1560c6325b 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -80,8 +80,8 @@ JH/16 Two-phase queue runs are now reported in the daemon startup log line and
       in exiwhat output.
 
 JH/17 Bug 3064: Fix combination of "-q<period> -R <recipients>". Introduction of
       in exiwhat output.
 
 JH/17 Bug 3064: Fix combination of "-q<period> -R <recipients>". Introduction of

-      the multiple-queue-runners facility for 4.97 broking this, giving only
-      a one-time run of the queue.
+      the multiple-queue-runners facility for 4.97 broke this, giving only a
+      one-time run of the queue.

 
 JH/18 Bug 3068: Log a warning for use of deprecated syntax in query-style
       lookups.
 
 JH/18 Bug 3068: Log a warning for use of deprecated syntax in query-style
       lookups.


@@ -89,7 +89,7 @@ JH/18 Bug 3068: Log a warning for use of deprecated syntax in query-style
 JH/19 Fix TLS startup. When the last expansion done before the initiation of a
       TLS session resulted in a forced-fail, a misleading error was logged for
       the expansino of tls_certificates.  This would affect the common case of
 JH/19 Fix TLS startup. When the last expansion done before the initiation of a
       TLS session resulted in a forced-fail, a misleading error was logged for
       the expansino of tls_certificates.  This would affect the common case of

-      that option being set (main-section options) but not having any vriable
+      that option being set (main-section options) but not having any variable

       parts.  It could also potentially affect tls_privatekeys.  The underlyding
       coding errors go back to 4.90 but were only exposed in 4.97.
 
       parts.  It could also potentially affect tls_privatekeys.  The underlyding
       coding errors go back to 4.90 but were only exposed in 4.97.
 

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 3c63c63681a24b15d59b90ccc3257c1a6a20cd38..88114d648122193bcf11e465813a56737515a89c 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1493,7 +1493,7 @@ if (is_multiple_qrun())                           /* we are managing periodic runs */
       }
     else
 #endif
       }
     else
 #endif

-      /* Normal periodic runL in order of run priority, find the first queue
+      /* Normal periodic run: in order of run priority, find the first queue

       for which we can start a runner */
 
       for (q = qrunners; q; q = q->next)
       for which we can start a runner */
 
       for (q = qrunners; q; q = q->next)

diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900
index 9e293c6aa112c518dc07f45afe3258973dd654af..49959a96fc0f11bc8f0b8b6fd181dc94dd5fe222 100644 (file)
--- a/test/scripts/0000-Basic/0900
+++ b/test/scripts/0000-Basic/0900
@@ -399,7 +399,7 @@ rcpt to:<CALLER@test.ex>
 bdat 86 last
 Subject: send me all your money!
 
 bdat 86 last
 Subject: send me all your money!
 

-All your bases are belong to us.  Send Bitcoins.
+All your base are belong to us.  Send Bitcoins.

 QUIT
 .
 ??? 250
 QUIT
 .
 ??? 250

diff --git a/test/stdout/0900 b/test/stdout/0900
index a5b8d91f802f3205fd27b001d61b29507632d545..0c8d7ea40ab4fac3daa7c9cb23634f3d9e3eec7b 100644 (file)
--- a/test/stdout/0900
+++ b/test/stdout/0900
@@ -563,7 +563,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> bdat 86 last
 >>> Subject: send me all your money!
 >>> 
 >>> bdat 86 last
 >>> Subject: send me all your money!
 >>> 

->>> All your bases are belong to us.  Send Bitcoins.
+>>> All your base are belong to us.  Send Bitcoins.

 >>> QUIT
 >>> .
 ??? 250
 >>> QUIT
 >>> .
 ??? 250