]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Standardize command usage messages:
authorterencehill <piuntn@gmail.com>
Wed, 10 Feb 2021 01:44:27 +0000 (02:44 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 10 Feb 2021 02:48:20 +0000 (03:48 +0100)
argument: keyword
<argument>: input parameter
"<arguments>": input string that can contain multiple words
When an argument is enclosed by [] it means it's optional

While at it fix cmd voice, improve menu_cmd, menu_cmd directmenu and cl_cmd hud

17 files changed:
qcsrc/client/command/cl_cmd.qc
qcsrc/common/command/generic.qc
qcsrc/common/command/rpn.qc
qcsrc/common/debug.qh
qcsrc/common/effects/effectinfo.qc
qcsrc/common/items/all.qh
qcsrc/common/notifications/all.qh
qcsrc/common/turrets/all.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/server/cheats.qc
qcsrc/server/command/banning.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc

index 15419f96697fe8f9b4e6aa22cb8710b1087fc13f..2df0b83724bae31a65b592694abf580290a8addf 100644 (file)
@@ -108,9 +108,9 @@ void LocalCommand_boxparticles(int request, int argc)
                case CMD_REQUEST_USAGE:
                {
                        LOG_HELP(
-                               "Usage:^3 cl_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n"
+                               "Usage:^3 cl_cmd boxparticles <effectname> <owner> <org_from> <org_to> <dir_from> <dir_to> <countmultiplier> <flags>\n"
                                "  'effectname' is the name of a particle effect in effectinfo.txt\n"
-                               "  'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n"
+                               "  'owner' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n"
                                "  'org_from' is the starting origin of the box\n"
                                "  'org_to' is the ending origin of the box\n"
                                "  'dir_from' is the minimum velocity\n"
@@ -160,7 +160,7 @@ void LocalCommand_create_scrshot_ent(int request)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd create_scrshot_ent [path]");
+                       LOG_HELP("Usage:^3 cl_cmd create_scrshot_ent [<path>]");
                        LOG_HELP("  Where 'path' can be the subdirectory of data/data in which the file is saved.");
                        return;
                }
@@ -190,7 +190,7 @@ void LocalCommand_debugmodel(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd debugmodel model");
+                       LOG_HELP("Usage:^3 cl_cmd debugmodel <model>");
                        LOG_HELP("  Where 'model' is a string of the model name to use for the debug model.");
                        return;
                }
@@ -238,7 +238,7 @@ void LocalCommand_handlevote(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd handlevote vote");
+                       LOG_HELP("Usage:^3 cl_cmd handlevote <vote>");
                        LOG_HELP("  Where 'vote' is the selection for either the current poll or uid2name.");
                        return;
                }
@@ -328,11 +328,11 @@ void LocalCommand_hud(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd hud action [configname | radartoggle | layout]");
+                       LOG_HELP("Usage:^3 cl_cmd hud <action> [<configname> | <radartoggle> | <layout>]");
                        LOG_HELP("  Where 'action' is the command to complete,");
                        LOG_HELP("  'configname' is the name to save to for \"save\" action,");
-                       LOG_HELP("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,");
-                       LOG_HELP("  and 'layout' is how to organize the scoreboard columns for the set action.");
+                       LOG_HELP("  'radartoggle' is to maximize/minimize radar for \"radar\" action,");
+                       LOG_HELP("  and 'layout' is how to organize the scoreboard columns for \"scoreboard_columns_set\" action.");
                        LOG_HELP("  Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"");
                        return;
                }
@@ -382,7 +382,7 @@ void LocalCommand_mv_download(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd mv_download mapid");
+                       LOG_HELP("Usage:^3 cl_cmd mv_download <mapid>");
                        LOG_HELP("  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.");
                        return;
                }
@@ -518,8 +518,8 @@ void GameCommand(string command)
                        LOG_HELP("\nGeneric commands shared by all programs:");
                        GenericCommand_macro_help();
 
-                       LOG_HELP("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.");
-                       LOG_HELP("For help about a specific command, type cl_cmd help COMMAND");
+                       LOG_HELP("\nUsage:^3 cl_cmd <command>^7, where possible commands are listed above.");
+                       LOG_HELP("For help about a specific command, type cl_cmd help <command>");
 
                        return;
                }
index e354a9a5915e119cabef6b00f7424f7bd4c70b7b..f8189b9a4f7829c69198cc38338df4946760541a 100644 (file)
@@ -89,8 +89,8 @@ void GenericCommand_addtolist(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " addtolist variable value");
-                       LOG_HELP("  Where 'variable' is what to add 'value' to.");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " addtolist <cvar> <value>");
+                       LOG_HELP("  Where 'cvar' is the cvar to add 'value' to.");
                        LOG_HELP("See also: ^2removefromlist^7");
                        return;
                }
@@ -163,7 +163,7 @@ void GenericCommand_qc_curl(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key N] [--cvar] [--exec] URL [postargs...]");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key <n>] [--cvar] [--exec] <url> [<postargs>]");
                        return;
                }
        }
@@ -303,9 +303,9 @@ void GenericCommand_maplist(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " maplist action [map]");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " maplist <action> [<map>]");
                        LOG_HELP("  Where 'action' is the command to complete,");
-                       LOG_HELP("  and 'map' is what it acts upon (if required).");
+                       LOG_HELP("  and 'map' is what it acts upon (for the 'add' and 'remove' actions).");
                        LOG_HELP("  Full list of commands here: \"add, cleanup, remove, shuffle.\"");
                        return;
                }
@@ -325,8 +325,8 @@ void GenericCommand_nextframe(int request, string command)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " nextframe command...");
-                       LOG_HELP("  Where command will be executed next frame of this VM");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " nextframe <command>");
+                       LOG_HELP("  Where 'command' will be executed next frame of this VM");
                        return;
                }
        }
@@ -359,8 +359,8 @@ void GenericCommand_removefromlist(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value");
-                       LOG_HELP("  Where 'variable' is what cvar to remove 'value' from.");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist <cvar> <value>");
+                       LOG_HELP("  Where 'cvar' is the cvar to remove 'value' from.");
                        LOG_HELP("See also: ^2addtolist^7");
                        return;
                }
@@ -447,7 +447,7 @@ void GenericCommand_settemp(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\"");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp <cvar> \"<arguments>\"");
                        LOG_HELP("  Where 'cvar' is the cvar you want to temporarily set with 'arguments'.");
                        LOG_HELP("See also: ^2settemp_restore^7");
                        return;
@@ -502,7 +502,7 @@ void GenericCommand_runtest(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " [function to run]");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " <function>");
                        return;
                }
        }
index 467768269c8eeccd17912fafc10ba71322394651..7c944aa0feacc98e6875b38f31f563a769ff80e1 100644 (file)
@@ -570,7 +570,7 @@ LABEL(skip_difference)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " rpn EXPRESSION...");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " rpn <expression>");
                        LOG_HELP("    Operator description (x: string, s: set, f: float):");
                        LOG_HELP("    x pop ----------------------------->     : removes the top");
                        LOG_HELP("    x dup -----------------------------> x x : duplicates the top");
index 5d92a5a6391980fdfcfa7ac9ecb57695f238e75c..af173c61eb58221913cc1e9ff1cc49419c679c62 100644 (file)
@@ -213,7 +213,7 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object", false)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " bufstr_get bufhandle string_index");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " bufstr_get <bufhandle> <string_index>");
                        return;
                }
        }
@@ -358,7 +358,7 @@ GENERIC_COMMAND(findent, "Search through entities for matching classname", false
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 " GetProgramCommandPrefix() " find classname");
+                       LOG_HELP("Usage:^3 " GetProgramCommandPrefix() " find <classname>");
                        LOG_HELP("  Where 'classname' is the classname to search for.");
                        return;
                }
index 1e23bb46fbf9943547b66d76a7f81939967f1917..c0baddeb314de4b97fe2de90eaf32f7dd75e9f16 100644 (file)
@@ -313,7 +313,7 @@ GENERIC_COMMAND(dumpeffectinfo, "Dump all effectinfo to effectinfo_dump.txt", fa
         }
         default:
         case CMD_REQUEST_USAGE: {
-            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpeffectinfo [filename]");
+            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpeffectinfo [<filename>]");
             LOG_HELP("  Where 'filename' is the file to write (default is effectinfo_dump.txt),");
             LOG_HELP("  if supplied with '-' output to console as well as default,");
             LOG_HELP("  if left blank, it will only write to default.");
index bb2e387fb9cd7df3dad696d3401f06ea77e7aadb..3d3d62e4631c40e0b4516b25fe9de71e95c84427 100644 (file)
@@ -41,7 +41,7 @@ GENERIC_COMMAND(dumpitems, "Dump all items to the console", false) {
         }
         default:
         case CMD_REQUEST_USAGE: {
-            LOG_HELPF("Usage:^3 %s dumpitems", GetProgramCommandPrefix());
+            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpitems");
             return;
         }
     }
index 72017e3dc8a3efd83a2cebeb521ddd5a3b99ac50..009b76c0b9d4c54db393864afe820369bdacc72e 100644 (file)
@@ -198,7 +198,7 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt"
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]");
+                       LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [<filename>]");
                        LOG_HELP("  Where 'filename' is the file to write (default is notifications_dump.cfg),");
                        LOG_HELP("  if supplied with '-' output to console as well as default,");
                        LOG_HELP("  if left blank, it will only write to default.");
index e44c5d9b544d67b9c717580127fdb18f3cb1a14b..d9f5ce867ea22b699369789c8bf39e6b261ee00b 100644 (file)
@@ -100,7 +100,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt", false)
         default:
         case CMD_REQUEST_USAGE:
         {
-            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpturrets [filename]");
+            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpturrets [<filename>]");
             LOG_HELP("  Where 'filename' is the file to write (default is turrets_dump.cfg),");
             LOG_HELP("  if supplied with '-' output to console as well as default,");
             LOG_HELP("  if left blank, it will only write to default.");
index 50ee6a2ab5d19adc7a024b31451f1b53af87ad11..c146bc3f30fd21cefae3287db21460029fdabb54 100644 (file)
@@ -654,7 +654,7 @@ CLIENT_COMMAND(weapon_find, "Show spawn locations of a weapon")
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 cl_cmd weapon_find weapon");
+                       LOG_HELP("Usage:^3 cl_cmd weapon_find <weapon>");
                        LOG_HELP("  Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'.");
                        return;
                }
index 479c0b6b39069c7171f51ab969415dc6840414a9..9ca40e73d62b0e06d524de04559e323a43f4a9c2 100644 (file)
@@ -82,7 +82,7 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt", false) //
         default:
         case CMD_REQUEST_USAGE:
         {
-            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [filename]");
+            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [<filename>]");
             LOG_HELP("  Where 'filename' is the file to write (default is weapons_dump.cfg),");
             LOG_HELP("  if supplied with '-' output to console as well as default,");
             LOG_HELP("  if left blank, it will only write to default.");
index bb55a671bad802feb51cc1e4fb1dcd3be92ade08..6bab3ed8eb3be3248e937b292c0d88de15faeec9 100644 (file)
@@ -45,10 +45,11 @@ void GameCommand(string theCommand)
 
        if (argv(0) == "help" || argc == 0)
        {
-               LOG_HELP(_("Usage: menu_cmd command..., where possible commands are:"));
-               LOG_HELP(_("  sync - reloads all cvars on the current menu page"));
-               LOG_HELP(_("  directmenu ITEM - select a menu item as main item"));
-               LOG_HELP(_("  dumptree - dump the state of the menu as a tree to the console"));
+               LOG_HELP(_("Usage:^3 menu_cmd <command> [<item>], where possible commands are:"));
+               LOG_HELP(_("  'sync' reloads all cvars on the current menu page"));
+               LOG_HELP(_("  'directmenu' shows the menu window named 'item' (or the menu window containing an item named 'item')"));
+               LOG_HELP(_("   if 'item' is not specified it shows the list of available items in the console"));
+               LOG_HELP(_("  'dumptree' dumps the state of the menu as a tree to the console"));
 
                LOG_HELP("\nGeneric commands shared by all programs:");
                GenericCommand_macro_help();
@@ -77,7 +78,7 @@ void GameCommand(string theCommand)
 
                if (argc == 1)
                {
-                       LOG_HELP(_("Available options:"));
+                       LOG_HELP(_("Available items:"));
 
                        FOREACH_ENTITY_ORDERED(it.name != "", {
                                if (it.classname == "vtbl") continue;
index 3506aa7b799b9dc254cac14ac7ad09c71c4eaec6..edf15e473d97b040f35ad7c6671939a8e7875412 100644 (file)
@@ -300,11 +300,6 @@ float CheatCommand(entity this, int argc)
                        IS_CHEAT(this, 0, argc, 0);
                        if(argc == 5)
                        {
-                               // arguments:
-                               //   effectname
-                               //   origin (0..1, on crosshair line)
-                               //   velocity
-                               //   howmany
                                f = stof(argv(2));
                                crosshair_trace(this);
                                start = (1-f) * this.origin + f * trace_endpos;
@@ -314,7 +309,9 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd pointparticles effectname position(0..1) velocityvector multiplier\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd pointparticles <effectname> <position> <velocity> <countmultiplier>\n");
+                       sprint(this, "  Where 'position' is a number from 0 to 1 representing distance on the crosshair line,\n");
+                       sprint(this, "  and 'velocity' is a vector \"x y z\"\n");
                        break;
                case "trailparticles":
                        IS_CHEAT(this, 0, argc, 0);
@@ -329,14 +326,12 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd trailparticles effectname\n");
+                       sprint(this, "Usage: sv_cheats 1; restart; cmd trailparticles <effectname>\n");
                        break;
                case "make":
                        IS_CHEAT(this, 0, argc, 0);
                        if(argc == 3)
                        {
-                               // arguments:
-                               //   modelname mode
                                f = stof(argv(2));
                                W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0, 0);
                                traceline(w_shotorg, w_shotorg + w_shotdir * 2048, MOVE_NORMAL, this);
@@ -375,7 +370,10 @@ float CheatCommand(entity this, int argc)
                                }
                        }
                        else
-                               sprint(this, "Usage: sv_cheats 1; restart; cmd make models/... 0/1/2\n");
+                       {
+                               sprint(this, "Usage:^3 sv_cheats 1; restart; cmd make <modelname> <mode>\n");
+                               sprint(this, "  where 'mode' can be 0, 1 or 2\n");
+                       }
                        break;
                case "penalty":
                        IS_CHEAT(this, 0, argc, 0);
@@ -385,7 +383,7 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd penalty 5.0 AHAHAHAHAHAHAH))\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd penalty <duration> <reason>))\n");
                        break;
                case "dragbox_spawn": {
                        IS_CHEAT(this, 0, argc, 0);
@@ -510,7 +508,7 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_setcnt cnt\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_setcnt <cnt>\n");
                        break;
                case "drag_save":
                        IS_CHEAT(this, 0, argc, 0);
@@ -530,7 +528,7 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_save filename\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_save <filename>\n");
                        break;
                case "drag_saveraceent":
                        IS_CHEAT(this, 0, argc, 0);
@@ -599,7 +597,7 @@ float CheatCommand(entity this, int argc)
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_save filename\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_save <filename>\n");
                        break;
                case "drag_clear":
                        IS_CHEAT(this, 0, argc, 0);
index 99a7756e162138b36ece7a1b16ffe98ea6334296..728c344a1bf429f368fce23cad55c959eb59d7db 100644 (file)
@@ -41,7 +41,7 @@ void BanCommand_ban(int request, int argc, string command)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd ban address [bantime] [reason]");
+                       LOG_HELP("Usage:^3 sv_cmd ban <address> [<bantime>] [<reason>]");
                        LOG_HELP("  'address' is the IP address or range of the player to ban,");
                        LOG_HELP("  'bantime' is the amount of time that the ban is active (default if not provided),");
                        LOG_HELP("  and 'reason' is the string to label the ban with as reason for banning.");
@@ -108,7 +108,7 @@ void BanCommand_kickban(int request, int argc, string command)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd kickban client [bantime] [masksize] [reason]");
+                       LOG_HELP("Usage:^3 sv_cmd kickban <client> [<bantime>] [<masksize>] [<reason>]");
                        LOG_HELP("  'client' is the entity number or name of the player to ban,");
                        LOG_HELP("  'bantime' is the amount of time that the ban is active (default if not provided),");
                        LOG_HELP("  'masksize' is the range of the IP address (1-thru-4, default if not provided),");
@@ -146,7 +146,7 @@ void BanCommand_mute(int request, int argc, string command)  // TODO: Add a sort
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd mute client");
+                       LOG_HELP("Usage:^3 sv_cmd mute <client>");
                        LOG_HELP("  'client' is the entity number or name of the player to mute.");
                        LOG_HELP("See also: ^2unmute^7");
                        return;
@@ -192,7 +192,7 @@ void BanCommand_unban(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd unban banid");
+                       LOG_HELP("Usage:^3 sv_cmd unban <banid>");
                        LOG_HELP("  Where 'banid' is the ID of the ban of which to remove.");
                        LOG_HELP("See also: ^2ban, banlist, kickban^7");
                        return;
@@ -227,7 +227,7 @@ void BanCommand_unmute(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd unmute client");
+                       LOG_HELP("Usage:^3 sv_cmd unmute <client>");
                        LOG_HELP("  'client' is the entity number or name of the player to unmute.");
                        LOG_HELP("See also: ^2mute^7");
                        return;
index 362847554220cbdf6a095916475f9884f4d6499e..b9acbfddf93d819a38aa5c912230082046b81125 100644 (file)
@@ -83,7 +83,7 @@ void ClientCommand_autoswitch(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd autoswitch selection\n");
+                       sprint(caller, "\nUsage:^3 cmd autoswitch <selection>\n");
                        sprint(caller, "  Where 'selection' controls if autoswitch is on or off.\n");
                        return;
                }
@@ -126,7 +126,7 @@ void ClientCommand_clientversion(entity caller, int request, int argc)  // inter
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd clientversion version\n");
+                       sprint(caller, "\nUsage:^3 cmd clientversion <version>\n");
                        sprint(caller, "  Where 'version' is the game version reported by caller.\n");
                        return;
                }
@@ -151,7 +151,7 @@ void ClientCommand_mv_getpicture(entity caller, int request, int argc)  // inter
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd mv_getpicture mapid\n");
+                       sprint(caller, "\nUsage:^3 cmd mv_getpicture <mapid>\n");
                        sprint(caller, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
                        return;
                }
@@ -241,29 +241,29 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
+                       sprint(caller, "\nUsage:^3 cmd wpeditor <action>\n");
                        sprint(caller, "  Where 'action' can be:\n");
-                       sprint(caller, "   ^5spawn^7: spawns a waypoint at player's position\n");
-                       sprint(caller, "   ^5remove^7: removes player's nearest waypoint\n");
-                       sprint(caller, "   ^5unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
-                       sprint(caller, "   ^5saveall^7: saves all waypoints and links to file\n");
-                       sprint(caller, "   ^5relinkall^7: relinks all waypoints as if they were respawned\n");
-                       sprint(caller, "   ^5spawn crosshair^7: spawns a waypoint at crosshair's position\n");
+                       sprint(caller, "   ^2spawn^7: spawns a waypoint at player's position\n");
+                       sprint(caller, "   ^2remove^7: removes player's nearest waypoint\n");
+                       sprint(caller, "   ^2unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
+                       sprint(caller, "   ^2saveall^7: saves all waypoints and links to file\n");
+                       sprint(caller, "   ^2relinkall^7: relinks all waypoints as if they were respawned\n");
+                       sprint(caller, "   ^2spawn crosshair^7: spawns a waypoint at crosshair's position\n");
                        sprint(caller, "   ^7 in general useful to create special and hardwired links with ease from existing waypoints\n");
                        sprint(caller, "   ^7 in particular it's the only way to create custom jumppad waypoints (spawn another waypoint to create destination))\n");
-                       sprint(caller, "   ^5spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
-                       sprint(caller, "   ^5spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
-                       sprint(caller, "   ^5spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
+                       sprint(caller, "   ^2spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
+                       sprint(caller, "   ^2spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
+                       sprint(caller, "   ^2spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
                        sprint(caller, "   ^7 useful to replace links to problematic jumppad/teleport waypoints\n");
-                       sprint(caller, "   ^5hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
-                       sprint(caller, "   ^5hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
-                       sprint(caller, "   ^5lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
-                       sprint(caller, "   ^5symorigin get|set\n");
-                       sprint(caller, "   ^5symorigin get|set p1 p2 ... pX\n");
-                       sprint(caller, "   ^5symaxis get|set p1 p2\n");
-                       sprint(caller, "   ^7 where p1 p2 ... pX are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
+                       sprint(caller, "   ^2hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
+                       sprint(caller, "   ^2hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
+                       sprint(caller, "   ^2lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
+                       sprint(caller, "   ^2symorigin get|set\n");
+                       sprint(caller, "   ^2symorigin get|set <p1> <p2> ... <pX>\n");
+                       sprint(caller, "   ^2symaxis get|set <p1> <p2>\n");
+                       sprint(caller, "   ^7 where <p1> <p2> ... <pX> are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
                                                                " so you can determine origin/axis of symmetry of maps without ctf flags or where flags aren't perfectly symmetrical\n");
-                       sprint(caller, "  See 'wpeditor_menu' for a selectable list of various commands and useful settings to edit waypoints.\n");
+                       sprint(caller, "  See ^5wpeditor_menu^7 for a selectable list of various commands and useful settings to edit waypoints.\n");
                        return;
                }
        }
@@ -528,7 +528,7 @@ void ClientCommand_selectteam(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd selectteam team\n");
+                       sprint(caller, "\nUsage:^3 cmd selectteam <team>\n");
                        sprint(caller, "  Where 'team' is the prefered team to try and join.\n");
                        sprint(caller, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
                        return;
@@ -619,7 +619,7 @@ void ClientCommand_spectate(entity caller, int request)
                                                        sprint(caller, "Can't spectate ", argv(1), "^7\n");
                                        }
                                        else
-                                               sprint(caller, "cmd spectate client only works when you are spectator/observer\n");
+                                               sprint(caller, "cmd spectate <client> only works when you are spectator/observer\n");
                                        return;
                                }
 
@@ -637,7 +637,7 @@ void ClientCommand_spectate(entity caller, int request)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd spectate [client]\n");
+                       sprint(caller, "\nUsage:^3 cmd spectate [<client>]\n");
                        sprint(caller, "  Where 'client' can be the player to spectate.\n");
                        return;
                }
@@ -661,7 +661,7 @@ void ClientCommand_suggestmap(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd suggestmap map\n");
+                       sprint(caller, "\nUsage:^3 cmd suggestmap <map>\n");
                        sprint(caller, "  Where 'map' is the name of the map to suggest.\n");
                        return;
                }
@@ -718,7 +718,7 @@ void ClientCommand_tell(entity caller, int request, int argc, string command)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd tell client <message>\n");
+                       sprint(caller, "\nUsage:^3 cmd tell <client> <message>\n");
                        sprint(caller, "  Where 'client' is the entity number or name of the player to send 'message' to.\n");
                        return;
                }
@@ -764,9 +764,10 @@ void ClientCommand_voice(entity caller, int request, int argc, string command)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd voice messagetype <soundname>\n");
-                       sprint(caller, "  'messagetype' is the type of broadcast to do, like team only or such,\n");
-                       sprint(caller, "  and 'soundname' is the string/filename of the sound/voice message to play.\n");
+                       sprint(caller, "\nUsage:^3 cmd voice <voicetype> [<message>]\n");
+                       sprint(caller, "  'voicetype' is the type of voice message, it can be one of these:\n");
+                       sprint(caller, sprintf("   %s\n", allvoicesamples));
+                       sprint(caller, "  and 'message' is the text message to send.\n");
                        return;
                }
        }
@@ -918,8 +919,8 @@ void SV_ParseClientCommand(entity this, string command)
                        sprint(this, "\nCommon networked commands:\n");
                        CommonCommand_macro_help(this);
 
-                       sprint(this, "\nUsage:^3 cmd COMMAND...^7, where possible commands are listed above.\n");
-                       sprint(this, "For help about a specific command, type cmd help COMMAND\n");
+                       sprint(this, "\nUsage:^3 cmd <command>^7, where possible commands are listed above.\n");
+                       sprint(this, "For help about a specific command, type cmd help <command>\n");
                        return;
                }
                else if (CommonCommand_macro_usage(argc, this))  // Instead of trying to call a command, we're going to see detailed information about it
index 5dff9f5f5b370ed6bb0424c2a76133d49eb879cf..34088bd9da2c82c6b6bc30e0e561692c57c0806f 100644 (file)
@@ -463,7 +463,7 @@ void CommonCommand_editmob(int request, entity caller, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " editmob command [arguments]"));
+                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " editmob <command> [<arguments>]"));
                        print_to(caller, "  Where 'command' can be butcher spawn skin movetarget kill name");
                        print_to(caller, "  spawn, skin, movetarget and name require 'arguments'");
                        print_to(caller, "  spawn also takes arguments list and random");
@@ -831,7 +831,7 @@ void CommonCommand_who(int request, entity caller, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " who [separator]"));
+                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " who [<separator>]"));
                        print_to(caller, "  Where 'separator' is the optional string to separate the values with, default is a space.");
                        return;
                }
index 508b8b6b9b91b7238d89e684011f72ea170d29d3..a8f83956e753b4786a8afb0a76d0c76415b8aa3e 100644 (file)
@@ -144,7 +144,7 @@ void GameCommand_adminmsg(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd adminmsg clients \"message\" [infobartime]");
+                       LOG_HELP("Usage:^3 sv_cmd adminmsg <clients> \"<message>\" [<infobartime>]");
                        LOG_HELP("  'clients' is a list (separated by commas) of player entity ID's or nicknames");
                        LOG_HELP("  If infobartime is provided, the message will be sent to infobar.");
                        LOG_HELP("  Otherwise, it will just be sent as a centerprint message.");
@@ -196,7 +196,7 @@ void GameCommand_allspec(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd allspec [reason]");
+                       LOG_HELP("Usage:^3 sv_cmd allspec [<reason>]");
                        LOG_HELP("  Where 'reason' is an optional argument for explanation of allspec command.");
                        LOG_HELP("See also: ^2moveplayer, shuffleteams^7");
                        return;
@@ -228,7 +228,7 @@ void GameCommand_anticheat(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd anticheat client");
+                       LOG_HELP("Usage:^3 sv_cmd anticheat <client>");
                        LOG_HELP("  'client' is the entity number or name of the player.");
                        return;
                }
@@ -430,10 +430,10 @@ void GameCommand_bot_cmd(int request, int argc, string command)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd bot_cmd client command [argument]");
+                       LOG_HELP("Usage:^3 sv_cmd bot_cmd <client> <command> [<arguments>]");
                        LOG_HELP("  'client' can be either the name of the bot or a progressive number (not the entity number!)");
                        LOG_HELP("           can also be '*' or 'all' to allow sending the command to all the bots");
-                       LOG_HELP("  For full list of commands, see bot_cmd help [command].");
+                       LOG_HELP("  For full list of commands, see bot_cmd help [<command>].");
                        LOG_HELP("Examples: sv_cmd bot_cmd 1 cc \"say something\"");
                        LOG_HELP("          sv_cmd bot_cmd 1 presskey jump");
                        LOG_HELP("          sv_cmd bot_cmd * pause");
@@ -459,7 +459,7 @@ void GameCommand_cointoss(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd cointoss [result1 result2]");
+                       LOG_HELP("Usage:^3 sv_cmd cointoss [<result1> <result2>]");
                        LOG_HELP("  Where 'result1' and 'result2' are user created options.");
                        return;
                }
@@ -500,7 +500,7 @@ void GameCommand_database(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd database action filename");
+                       LOG_HELP("Usage:^3 sv_cmd database <action> <filename>");
                        LOG_HELP("  Where 'action' is the command to complete,");
                        LOG_HELP("  and 'filename' is what it acts upon.");
                        LOG_HELP("  Full list of commands here: \"save, dump, load.\"");
@@ -538,7 +538,7 @@ void GameCommand_defer_clear(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd defer_clear client");
+                       LOG_HELP("Usage:^3 sv_cmd defer_clear <client>");
                        LOG_HELP("  'client' is the entity number or name of the player.");
                        LOG_HELP("See also: ^2defer_clear_all^7");
                        return;
@@ -593,7 +593,7 @@ void GameCommand_delrec(int request, int argc)  // perhaps merge later with reco
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd delrec ranking [map]");
+                       LOG_HELP("Usage:^3 sv_cmd delrec <ranking> [<map>]");
                        LOG_HELP("  'ranking' is which ranking level to clear up to, ");
                        LOG_HELP("  it will clear all records up to nth place.");
                        LOG_HELP("  if 'map' is not provided it will use current map.");
@@ -751,7 +751,7 @@ void GameCommand_gametype(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gametype mode");
+                       LOG_HELP("Usage:^3 sv_cmd gametype <mode>");
                        LOG_HELP("  Where 'mode' is the gametype mode to switch to.");
                        LOG_HELP("See also: ^2gotomap^7");
                        return;
@@ -817,7 +817,7 @@ void GameCommand_gettaginfo(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]");
+                       LOG_HELP("Usage:^3 sv_cmd gettaginfo <model> <frame> <index> [<command1>] [<command2>]");
                        LOG_HELP("See also: ^2bbox, trace^7");
                        return;
                }
@@ -900,7 +900,7 @@ void GameCommand_gotomap(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gotomap map");
+                       LOG_HELP("Usage:^3 sv_cmd gotomap <map>");
                        LOG_HELP("  Where 'map' is the *.bsp file to change to.");
                        LOG_HELP("See also: ^2gametype^7");
                        return;
@@ -1097,7 +1097,7 @@ void GameCommand_moveplayer(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd moveplayer clients destination");
+                       LOG_HELP("Usage:^3 sv_cmd moveplayer <clients> <destination>");
                        LOG_HELP("  'clients' is a list (separated by commas) of player entity ID's or nicknames");
                        LOG_HELP("  'destination' is what to send the player to, be it team or spectating");
                        LOG_HELP("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"");
@@ -1222,7 +1222,7 @@ void GameCommand_setbots(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd setbots botnumber");
+                       LOG_HELP("Usage:^3 sv_cmd setbots <botnumber>");
                        LOG_HELP("  Where 'botnumber' is the amount of bots to set bot_number cvar to.");
                        LOG_HELP("See also: ^2bot_cmd^7");
                        return;
@@ -1333,7 +1333,7 @@ void GameCommand_stuffto(int request, int argc)
                                LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                        case CMD_REQUEST_USAGE:
                        {
-                               LOG_HELP("Usage:^3 sv_cmd stuffto client \"command\"");
+                               LOG_HELP("Usage:^3 sv_cmd stuffto <client> \"<command>\"");
                                LOG_HELP("  'client' is the entity number or name of the player,");
                                LOG_HELP("  and 'command' is the command to be sent to that player.");
                                return;
@@ -1514,9 +1514,9 @@ void GameCommand_trace(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd trace command [startpos endpos] [endpos_height]");
-                       LOG_HELP("  Where startpos and endpos are parameters for 'walk' and 'showline' commands,");
-                       LOG_HELP("  'endpos_height' is an optional parameter for 'walk' command,");
+                       LOG_HELP("Usage:^3 sv_cmd trace <command> [<startpos> <endpos>] [<endpos_height>]");
+                       LOG_HELP("  Where startpos and endpos are parameters for the 'walk' and 'showline' commands,");
+                       LOG_HELP("  'endpos_height' is an optional parameter for the 'walk' command,");
                        LOG_HELP("  Full list of commands here: \"debug, debug2, walk, showline.\"");
                        LOG_HELP("See also: ^2bbox, gettaginfo^7");
                        return;
@@ -1582,7 +1582,7 @@ void GameCommand_warp(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd warp [level]");
+                       LOG_HELP("Usage:^3 sv_cmd warp [<level>]");
                        LOG_HELP("  'level' is the level to change campaign mode to.");
                        LOG_HELP("  if 'level' is not provided it will change to the next level.");
                        return;
@@ -1711,8 +1711,8 @@ void GameCommand(string command)
                        LOG_HELP("\nGeneric commands shared by all programs:");
                        GenericCommand_macro_help();
 
-                       LOG_HELP("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n"
-                               "For help about a specific command, type sv_cmd help COMMAND");
+                       LOG_HELP("\nUsage:^3 sv_cmd <command>^7, where possible commands are listed above.\n"
+                               "For help about a specific command, type sv_cmd help <command>");
 
                        return;
                }
index 746630aec2b46f5bc0f62f7636175d32f9004ac7..48981090859ebcf03b8be90f6ce7009429dc9955 100644 (file)
@@ -897,7 +897,7 @@ void VoteCommand_call(int request, entity caller, int argc, string vote_command)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote call command"));
+                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote call <command>"));
                        print_to(caller, "  Where 'command' is the command to request a vote upon.");
                        print_to(caller, strcat("Examples: ", GetCommandPrefix(caller), " vote call gotomap dance"));
                        print_to(caller, strcat("          ", GetCommandPrefix(caller), " vote call endmatch"));
@@ -1013,9 +1013,9 @@ void VoteCommand_master(int request, entity caller, int argc, string vote_comman
                default:
                case CMD_REQUEST_USAGE:
                {
-                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote master [action [command | password]]"));
-                       print_to(caller, "  If action is left blank, it calls a vote for you to become master.");
-                       print_to(caller, "  Otherwise the actions are either 'do' a command or 'login' as master.");
+                       print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote master [<action> [<command> | <password>]]"));
+                       print_to(caller, "  If 'action' is left blank, it calls a vote for you to become master.");
+                       print_to(caller, "  Otherwise it can be either 'do' (to run 'command') or 'login' as master.");
                        return;
                }
        }
@@ -1189,8 +1189,8 @@ void VoteCommand_macro_help(entity caller, int argc)
                VOTE_COMMANDS(0, caller, 0, "");
 #undef VOTE_COMMAND
 
-               print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are listed above.\n"));
-               print_to(caller, strcat("For help about a specific command, type ", command_origin, " vote help COMMAND"));
+               print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote <command>^7, where possible commands are listed above.\n"));
+               print_to(caller, strcat("For help about a specific command, type ", command_origin, " vote help <command>"));
                print_to(caller, strcat("\n^7You can call a vote for or execute these commands: ^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
        }
        else  // usage for individual command