From 9a0f6ba8eb718869bd7a9d526fc76f9b5edd965a Mon Sep 17 00:00:00 2001
From: Bastien Dejean <nihilhill@gmail.com>
Date: Tue, 17 Sep 2013 17:55:37 +0200
Subject: [PATCH] Use `--remove` consistently

---
 doc/bspwm.1     | 2 +-
 doc/bspwm.1.txt | 2 +-
 messages.c      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index e8fa7c7..659c1e3 100644
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -805,7 +805,7 @@ rule \fIOPTIONS\fR
 Create a new rule (<pattern> must match the class or instance name)\&.
 .RE
 .PP
-\fB\-r\fR, \fB\-\-rm\fR <rule_uid>\&...
+\fB\-r\fR, \fB\-\-remove\fR <rule_uid>\&...
 .RS 4
 Remove the rules with the given UIDs\&.
 .RE
diff --git a/doc/bspwm.1.txt b/doc/bspwm.1.txt
index 31dab20..c5b1644 100644
--- a/doc/bspwm.1.txt
+++ b/doc/bspwm.1.txt
@@ -492,7 +492,7 @@ Options
 *-a*, *--add* <pattern> [-d 'DESKTOP_SEL' [--follow]] [--floating] [--focus] [--unmanage] [--one-shot]::
     Create a new rule (<pattern> must match the class or instance name).
 
-*-r*, *--rm* <rule_uid>...::
+*-r*, *--remove* <rule_uid>...::
     Remove the rules with the given UIDs.
 
 *-l*, *--list* [<pattern>]::
diff --git a/messages.c b/messages.c
index 27a286d..903f8b0 100644
--- a/messages.c
+++ b/messages.c
@@ -282,7 +282,7 @@ bool cmd_desktop(char **args, int num)
             strncpy(trg.desktop->name, *args, sizeof(trg.desktop->name));
             ewmh_update_desktop_names();
             put_status();
-        } else if (streq("-r", *args) || streq("--rm", *args)) {
+        } else if (streq("-r", *args) || streq("--remove", *args)) {
             if (trg.desktop->root == NULL
                     && trg.monitor->desk_head != trg.monitor->desk_tail) {
                 remove_desktop(trg.monitor, trg.desktop);
@@ -511,7 +511,7 @@ bool cmd_rule(char **args, int num, char *rsp) {
                 num--, args++;
             }
             add_rule(rule);
-        } else if (streq("-r", *args) || streq("--rm", *args)) {
+        } else if (streq("-r", *args) || streq("--remove", *args)) {
             num--, args++;
             if (num < 1)
                 return false;