Merge branch 'default-message-target'

2 files changed, 30 insertions, 26 deletions

diff --git a/documentation/mumctl.1 b/documentation/mumctl.1
index c50398f..8d8ba72 100644
--- a/documentation/mumctl.1
+++ b/documentation/mumctl.1
@@ -104,6 +104,21 @@ mumctl help
 Show a help message.
 .RE
 .sp
+mumctl message channel [\-r|\-\-recursive] <message> [<channel>...]
+Sends a message to all channels specified in the list of channels.
+If the recursive flag is set, the message is also sent to all subchannels in a recursive manner.
+If no channels are given the message is sent to the channel currently
+connected to.
+.sp
+mumctl message user <message> <users>
+Sends a message to all users specified in the list of users.
+.sp
+mumctl messages [\-f|\-\-follow]
+Prints all received messages since mumd was started, or since this command last was issued,
+whichever happens first.
+If the follow flag is set, mumctl will instead wait for new messages to come in and print
+them as they come in. To exit this loop, issue a Ctrl\-C.
+.sp
 mumctl mute [user]
 .RS 4
 Mute yourself or someone else.
@@ -162,19 +177,6 @@ mumctl volume <user> set <volume>
 Set the volume of another user\(cqs incoming audio.
 1.0 is the default.
 .RE
-.sp
-mumctl messages [\-f|\-\-follow]
-Prints all received messages since mumd was started, or since this command last was issued,
-whichever happens first.
-If the follow flag is set, mumctl will instead wait for new messages to come in and print
-them as they come in. To exit this loop, issue a Ctrl\-C.
-.sp
-mumctl message user <message> <users>
-Sends a message to all users specified in the list of users.
-.sp
-mumctl message channel [\-r|\-\-recursive] <message> <channels>
-Sends a message to all channels specified in the list of channels.
-If the recursive flag is set, the message is also sent to all subchannels in a recursive manner.
 .SH "AUTHORS"
 .sp
 Gustav Sörnäs and Eskil Queseth.
diff --git a/documentation/mumctl.txt b/documentation/mumctl.txt
index 68e4c0e..1c8ee8f 100644
--- a/documentation/mumctl.txt
+++ b/documentation/mumctl.txt
@@ -64,6 +64,21 @@ mumctl events ::
 mumctl help ::
     Show a help message.
 
+mumctl message channel [-r|--recursive] <message> [<channel>...]
+    Sends a message to all channels specified in the list of channels.
+    If the recursive flag is set, the message is also sent to all subchannels in a recursive manner.
+    If no channels are given the message is sent to the channel currently
+    connected to.
+
+mumctl message user <message> <users>
+    Sends a message to all users specified in the list of users.
+
+mumctl messages [-f|--follow]
+    Prints all received messages since mumd was started, or since this command last was issued,
+    whichever happens first.
+    If the follow flag is set, mumctl will instead wait for new messages to come in and print
+    them as they come in. To exit this loop, issue a Ctrl-C.
+
 mumctl mute [user] ::
     Mute yourself or someone else.
     If user is omitted, you mute yourself. Otherwise, the user with the username [user] is muted.
@@ -101,19 +116,6 @@ mumctl volume <user> set <volume> ::
     Set the volume of another user's incoming audio.
     1.0 is the default.
 
-mumctl messages [-f|--follow]
-    Prints all received messages since mumd was started, or since this command last was issued,
-    whichever happens first.
-    If the follow flag is set, mumctl will instead wait for new messages to come in and print
-    them as they come in. To exit this loop, issue a Ctrl-C.
-
-mumctl message user <message> <users>
-    Sends a message to all users specified in the list of users.
-
-mumctl message channel [-r|--recursive] <message> <channels>
-    Sends a message to all channels specified in the list of channels.
-    If the recursive flag is set, the message is also sent to all subchannels in a recursive manner.
-
 Authors
 -------