From 1598c88cfd85ac01ab26d5e9fd9a8391a1c4accb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:09:26 +0100
Subject: [PATCH] Merge pull request #77 from ailin-nemui/fix_ignore_help

Clarify the help for /ignore -time

(cherry picked from commit c62505386f19fd1a2310883f32535f36966f2803)
---
 docs/help/in/ignore.in         | 4 ++++
 src/fe-common/core/fe-ignore.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 0fbf970d..433490e1 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -14,6 +14,8 @@
     -network:     Ignores only on a specific network.
     -channels:    Ignores only on specific channels.
     -time:        The timeout to automatically remove the ignore.
+                  Accepts units specified in days, hours, minutes, seconds,
+                  milliseconds, or no unit for seconds.
 
     The mask, channels and levels to ignore; if no argument is provided, the
     list of ignores will be displayed.
@@ -44,6 +46,8 @@
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
     /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
+    /IGNORE -time 5days christmas PUBLICS
+    /IGNORE -time 300 mike PUBLICS
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 276169df..3594b6f6 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -115,9 +115,9 @@ static void cmd_ignore_show(void)
 }
 
 /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-                  [-network <network>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
+                  [-network <network>] [-channels <channel>] [-time <time>] <mask> [<levels>]
            IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-	          [-network <network>] [-time <secs>] <channels> [<levels>] */
+                  [-network <network>] [-time <time>] <channels> [<levels>] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_ignore(const char *data)
 {