Revert "Allow space after space"

This reverts commit c9334c922de120a08e66cb3a8c340fc1a453bf55.

diff --git a/i3bar/doc/i3bar.man b/i3bar/doc/i3bar.man
index 2ff7494b255979c3637806829efd9c276b7a2b1c..44d5e8ac0e08c5e00bbcccd9e762110567c87b4e 100644 (file)
--- a/i3bar/doc/i3bar.man
+++ b/i3bar/doc/i3bar.man
@@ -9,7 +9,7 @@ i3bar - xcb-based status- and ws-bar
 
 == SYNOPSIS
 
-*i3bar* [*-s* 'sock_path'] [*-c* 'command'] [*-m*|*-d* ['pos']] [*-f* 'font'] [*-V*] [*-h*]
+*i3bar* [*-s* 'sock_path'] [*-c* 'command'] [*-m*|*-d*['pos']] [*-f* 'font'] [*-V*] [*-h*]
 
 == OPTIONS
 
@@ -24,7 +24,7 @@ Hide the bar, when 'mod4' is not pressed. With this, dockmode will not be set, a
 If *-c* is specified, the childprocess is sent a 'SIGSTOP' on hiding and a 'SIGCONT' on unhiding of the bars.
 This is the default behavior of i3bar.
 
-*-d* \['pos']*, --dock*[*=*'pos']::
+*-d*['pos']*, --dock*[*=*'pos']::
 Put i3bar in dockmode. This will reserve some space for it, so it does not overlap other clients.
 You can specify either *bottom* (default) or *top* as 'pos'.
 

diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index 1c3236432e6820d8e104eb4e31b3762a36b536c2..4a85925409e261ac928847bbb3e6e9980db9b442 100644 (file)
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -81,11 +81,11 @@ static void free_colors(struct xcb_color_strings_t *colors) {
 }
 
 void print_usage(char *elf_name) {
-    printf("Usage: %s [-s sock_path] [-c command] [-m|-d [pos]] [-f font] [-V] [-h]\n", elf_name);
+    printf("Usage: %s [-s sock_path] [-c command] [-m|-d[pos]] [-f font] [-V] [-h]\n", elf_name);
     printf("-s <sock_path>\tConnect to i3 via <sock_path>\n");
     printf("-c <command>\tExecute <command> to get stdin\n");
     printf("-m\t\tHide the bars, when mod4 is not pressed.\n");
-    printf("-d [<pos>]\tEnable dockmode. <pos> is \"top\" or \"bottom\". Default is bottom\n");
+    printf("-d[<pos>]\tEnable dockmode. <pos> is \"top\" or \"bottom\". Default is bottom\n");
     printf("\t\tIf -c is specified, the childprocess is sent a SIGSTOP on hiding,\n");
     printf("\t\tand a SIGCONT on unhiding of the bars\n");
     printf("-f <font>\tUse X-Core-Font <font> for display\n");
@@ -151,7 +151,7 @@ int main(int argc, char **argv) {
         { NULL,                   0,                 0, 0}
     };
 
-    while ((opt = getopt_long(argc, argv, "s:c:d:mf:whvVA:B:C:D:E:F:G:H:I:J:", long_opt, &option_index)) != -1) {
+    while ((opt = getopt_long(argc, argv, "s:c:d::mf:whvVA:B:C:D:E:F:G:H:I:J:", long_opt, &option_index)) != -1) {
         switch (opt) {
             case 's':
                 socket_path = expand_path(optarg);