Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / docs / help / in / ignore.in

diff --git a/apps/irssi/docs/help/in/ignore.in b/apps/irssi/docs/help/in/ignore.in
index c5b5c342e1c3ab271b0e93a03dd7d63914db2c1c..26c269a458e69b3f5e4a335b77b3170ee391ef8b 100644 (file)
--- a/apps/irssi/docs/help/in/ignore.in
+++ b/apps/irssi/docs/help/in/ignore.in
@@ -4,15 +4,18 @@
     -regexp: <pattern> is a regular expression
     -full: <pattern> must match to full words
     -pattern: <pattern> must match to the message's text
+    -except: *DON'T* ignore - overrides an existing ignore.
     -replies: Ignore replies to nick in channels. For example
               "/IGNORE -replies *!*@*.fi PUBLIC" ignores everyone
               from Finland, but also anyone sending message
               "tofinnishnick: blahblah".
-    -except: *DON'T* ignore - overrides an existing ignore.
-    -channels: Ignore only in channels
+    -network: Ignore only on this network.
+    -ircnet: Same as -network. Deprecated. Do not use.
+    -channels: Ignore only in channels (comma separated list)
+    -time: <secs> seconds after the ignore is removed
     <mask>: Either a nick mask or list of channels
     <levels>: List of levels to ignore. You can use -<level> to remove levels
-              from ignore.
+              from ignore (/help levels for details).
     <^levels>: List of levels to NOT ignore
                (/ignore -except nick notices = /ignore nick ^notices)
 
@@ -26,6 +29,7 @@ The best match always wins, so you can have:
 
 Examples:
 
+    /IGNORE * JOINS                         - ignore joins in all channels
     /IGNORE #channel ALL -PUBLIC -ACTIONS   - ignore all but public/actions
     /IGNORE #channel -JOINS                 - don't ignore joins anymore
     /IGNORE -replies *!user@*.host.org ALL  - ignore user and all replies
@@ -38,5 +42,5 @@ Some suggestions for ignoring annoying public aways:
 
 For regular expressions, see `man 7 regex`.
 
-See also: UNIGNORE
+See also: UNIGNORE, SILENCE, ACCEPT