Merge branch 'NetHack-3.7' of https://github.com/RainRat/NetHack into NetHack-3.7

src/mon.c

@@ -2886,12 +2886,12 @@ logdeadmon(struct monst *mtmp, int mndx)
         shkdetail[0] = '\0';
         if (mtmp->isshk) {
             howmany = 1;
-            /* ", the <shoptype> priorietor" needs a trailing comma for
+            /* ", the <shoptype> proprietor" needs a trailing comma for
                the alternate phrasing "<shk>, shkdetails, has been killed"
                when hero isn't directly responsible */
             Snprintf(shkdetail, sizeof shkdetail, ", the %s %s%s",
                      shtypes[ESHK(mtmp)->shoptype - SHOPBASE].name,
-                     /* in case shk name doesn't include Mr or Ms honoric */
+                     /* in case shk name doesn't include Mr or Ms honorific */
                      mtmp->female ? "proprietrix" : "proprietor",
                      herodidit ? "" : ",");
         } else if (mndx == PM_HIGH_CLERIC) {

src/objnam.c

@@ -367,7 +367,7 @@ distant_name(
       html-dump (not implemented in nethack) to prevent object-on-map
       tooltips from including that extra text; also guards against a
       potential change to minimal_xname() [indirectly used by attribute
-      disclosure] that propogates o_id rather than leave it 0, and
+      disclosure] that propagates o_id rather than leave it 0, and
       against a potential extra chance to browse the map with getpos()
       during final disclosure (not currently implemented, nor planned) */
     save_oid = obj->o_id;

src/pline.c

@@ -658,7 +658,7 @@ execplinehandler(const char *line)
         ret = _spawnv(_P_NOWAIT, env, args);
     }
 #else
-#error MSGHANDLER is not implemented on this sysytem.
+#error MSGHANDLER is not implemented on this system.
 #endif
 }
 #endif /* MSGHANDLER */

src/strutil.c

@@ -53,7 +53,7 @@ strbuf_empty(strbuf_t *strbuf)
     strbuf_init(strbuf);
 }
 
-/* strbuf_nl_to_crlf() converts all occurences of \n to \r\n */
+/* strbuf_nl_to_crlf() converts all occurrences of \n to \r\n */
 void
 strbuf_nl_to_crlf(strbuf_t *strbuf)
 {