Merge b19d6a31b2 into 7b56ffdc2e

docs/help/in/ignore.in

@@ -38,7 +38,7 @@
     /IGNORE * JOINS
     /IGNORE * CTCPS
     /IGNORE -except *!*@*.irssi.org CTCPS
-    /IGNORE #irssi ALL -PUBLIC -ACTIONS
+    /IGNORE #irssi ALL -PUBLICS -ACTIONS
     /IGNORE -replies *!*@*.irssi.org ALL
     /IGNORE -regexp -pattern (away|gone|back|playing|returned) * ACTIONS
     /IGNORE -regexp -pattern (away|gone|back|playing|returned) #channel ACTIONS
@@ -47,7 +47,7 @@
     /IGNORE *away* NICKS
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
-    /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
+    /IGNORE mike HIDDEN PUBLICS JOINS PARTS QUITS
     /IGNORE -time 5days christmas PUBLICS
     /IGNORE -time 300 mike PUBLICS
 

docs/help/in/levels.in

@@ -22,7 +22,7 @@
         NICKS           A nickname changes to another nickname.
         NOTICES         Private notices.
         PARTS           A nickname leaves a channel.
-        PUBLIC          Public messages in a channel.
+        PUBLICS         Public messages in a channel.
         PUBNOTICES      Public notices in a channel.
         QUITS           A nickname disconnects from IRC.
         SNOTES          Notices sent from a server.
@@ -31,7 +31,7 @@
 
     These are the special levels you can use:
 
-        HILIGHT         The text is highlighted.
+        HILIGHTS        The text is highlighted.
         NEVER           Never ignores or logs the message.
         HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
         NO_ACT          Doesn't trigger any activity in the statusbar.