Typos in comments and docs from Miod

Co-authored-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/pdns/recursordist/RECURSOR-MIB.in b/pdns/recursordist/RECURSOR-MIB.in
index a084385785bbd9f60eef4c11263f91705f438165..206faadd5bbf663572a3a88a7bd0dc4eb57a01c5 100644 (file)
--- a/pdns/recursordist/RECURSOR-MIB.in
+++ b/pdns/recursordist/RECURSOR-MIB.in
@@ -15,14 +15,23 @@ IMPORTS
         FROM SNMPv2-CONF;
 
 rec MODULE-IDENTITY
+<<<<<<< HEAD
     LAST-UPDATED "202505270000Z"
+=======
+    LAST-UPDATED "202504290000Z"
+>>>>>>> 86b0c8c41 (Typos in comments and docs from Miod)
     ORGANIZATION "PowerDNS BV"
     CONTACT-INFO "support@powerdns.com"
     DESCRIPTION
        "This MIB module describes information gathered through PowerDNS Recursor."
 
+<<<<<<< HEAD
     REVISION "202505270000Z"
     DESCRIPTION "Added metric for missing ECS in reply"
+=======
+    REVISION "202504290000Z"
+    DESCRIPTION "Added metrics related to cookies"
+>>>>>>> 86b0c8c41 (Typos in comments and docs from Miod)
 
     REVISION "202408280000Z"
     DESCRIPTION "Added metric for too many incoming TCP connections"

diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index 716da33ddef6d51f186939e5a67b5e09b72fabd7..11d2bbbf8c359cb61c40de7368dce0219b728e57 100644 (file)
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -15,14 +15,23 @@ IMPORTS
         FROM SNMPv2-CONF;
 
 rec MODULE-IDENTITY
+<<<<<<< HEAD
     LAST-UPDATED "202505270000Z"
+=======
+    LAST-UPDATED "202504290000Z"
+>>>>>>> 86b0c8c41 (Typos in comments and docs from Miod)
     ORGANIZATION "PowerDNS BV"
     CONTACT-INFO "support@powerdns.com"
     DESCRIPTION
        "This MIB module describes information gathered through PowerDNS Recursor."
 
+<<<<<<< HEAD
     REVISION "202505270000Z"
     DESCRIPTION "Added metric for missing ECS in reply"
+=======
+    REVISION "202504290000Z"
+    DESCRIPTION "Added metrics related to cookies"
+>>>>>>> 86b0c8c41 (Typos in comments and docs from Miod)
 
     REVISION "202408280000Z"
     DESCRIPTION "Added metric for too many incoming TCP connections"
@@ -1315,7 +1324,7 @@ cookieMatched OBJECT-TYPE
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION
-        "Matching cookies recieved"
+        "Matching cookies received"
     ::= { stats 155 }
 
 cookieMismatchTcp OBJECT-TYPE
@@ -1339,7 +1348,7 @@ cookieNotInReply OBJECT-TYPE
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION
-        "Authoritative serve sent a reply bnack without cookie"
+        "Authoritative server sent a reply back without cookie"
     ::= { stats 158 }
 
 cookieRetry OBJECT-TYPE

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 79637b97066c6f7bba2f37ff4285255dba187c11..3814ea544cf49480c44b90a77e463540c84262b8 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -10,7 +10,7 @@ When upgrading several versions, please read **all** notes applying to the upgra
 New Settings
 ^^^^^^^^^^^^
 
-- The :ref:`setting-yaml-outgoing.cookies` settings has been introduced to implement cookie support for contacting authoritative servers and forwarders. See :rfc:`7873` and :rfc:`9018`.
+- The :ref:`setting-yaml-outgoing.cookies` setting has been introduced to implement cookie support for contacting authoritative servers and forwarders. See :rfc:`7873` and :rfc:`9018`.
 
 :program:`rec_control`
 ^^^^^^^^^^^^^^^^^^^^^^

diff --git a/pdns/recursordist/metrics_table.py b/pdns/recursordist/metrics_table.py
index 42029702859d4de1af427cbcc108fca77b5cd839..52145199e181d2d42b58f0d93cd51754c3a4d8dd 100644 (file)
--- a/pdns/recursordist/metrics_table.py
+++ b/pdns/recursordist/metrics_table.py
@@ -1371,7 +1371,7 @@
     {
         'name': 'cookie-matched',
         'lambda': '[] { return g_Counters.sum(rec::Counter::cookieMatched); }',
-        'desc': 'Matching cookies recieved',
+        'desc': 'Matching cookies received',
         'snmp': 155,
     },
     {
@@ -1389,7 +1389,7 @@
     {
         'name': 'cookie-not-in-reply',
         'lambda': '[] { return g_Counters.sum(rec::Counter::cookieNotInReply); }',
-        'desc': 'Authoritative serve sent a reply bnack without cookie',
+        'desc': 'Authoritative server sent a reply back without cookie',
         'snmp': 158,
     },
     {

diff --git a/pdns/recursordist/rec-cookiestore.hh b/pdns/recursordist/rec-cookiestore.hh
index df7af278a0d43db10b70ed30ecf7b848fad6940d..76b56af9f3876ca71f9a96eab60f1f983575cd5b 100644 (file)
--- a/pdns/recursordist/rec-cookiestore.hh
+++ b/pdns/recursordist/rec-cookiestore.hh
@@ -27,15 +27,14 @@
 
   - Cookies are stored with an auth IP address as primary index and are generated randomly.
 
-  - If the the does not support cookies, this is marked as such and no cookies will be sent to it
+  - If an auth does not support cookies, it is marked as such and no cookies will be sent to it
     for a period of time. When a cookie is sent again, it must be a newly generated one.
 
-  - A cookie is stored together with the local IP (as rec can have many). If a server is to be
+  - A cookie is stored together with the local IP (as rec can have many). If an auth is to be
     contacted again, it should use the same bound IP.
 
   - Although it is perfectly fine for a client cookie to live for a long time, this design will
     flush entries older that a certain period of time, to avoid an ever growing CookieStore.
-
 */
 
 #include <boost/utility.hpp>

diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
index 7663492df471b06efe5e2024b49816f609252d33..9d6119aed0710c1bf0aa8d91ce54765d86999331 100644 (file)
--- a/pdns/recursordist/syncres.cc
+++ b/pdns/recursordist/syncres.cc
@@ -1518,7 +1518,7 @@ LWResult::Result SyncRes::asyncresolveWrapper(const OptLog& log, const ComboAddr
       if (ret == LWResult::Result::BindError) {
         // BindError is only generated when cookies are active and we failed to bind to a local
         // address associated with a cookie, see RFC9018 section 3 last paragraph. We assume the
-        // called code alread erased the cookie info.
+        // called code has already erased the cookie info.
         // This is the first path that re-iterates the loop
         continue;
       }