[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
Date: |
Wed, 06 Dec 2006 22:33:05 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/12/06 22:33:05
Modified files:
distrib : ChangeLog
src/daemon/driver: driverCommands.ml
src/networks/donkey: donkeyInteractive.ml
Log message:
patch #5613
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1131&r2=1.1132
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.144&r2=1.145
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -b -r1.1131 -r1.1132
--- distrib/ChangeLog 6 Dec 2006 00:49:11 -0000 1.1131
+++ distrib/ChangeLog 6 Dec 2006 22:33:04 -0000 1.1132
@@ -15,6 +15,7 @@
=========
2006/12/06
+5613: Another longhelp cleanup (anhi)
5615: EDK: Parse more fields from server.met files
2006/12/04
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- src/daemon/driver/driverCommands.ml 2 Dec 2006 16:01:13 -0000 1.207
+++ src/daemon/driver/driverCommands.ml 6 Dec 2006 22:33:04 -0000 1.208
@@ -343,7 +343,7 @@
web_infos_add kind period url;
CommonWeb.load_url true kind url;
"url added to web_infos. downloading now"
- ), "<kind> <url> [<period>]:\t\tload this file from the web\n"
+ ), "<kind> <url> [<period>] :\tload this file from the web\n"
^"\t\t\t\t\tkind is either server.met (if the downloaded file is a
server.met)\n"
^"\t\t\t\t\tperiod is the period between updates (in hours, default 0 =
only loaded at startup)";
@@ -433,7 +433,7 @@
client_print c o;
) args;
""
- ), "<num> :\t\t\t\tview client (use arg 'all' for all clients)";
+ ), "<num|all> :\t\t\t\tview client (use arg 'all' for all clients)";
"version", Arg_none (fun o ->
print_command_result o o.conn_buf (CommonGlobals.version ());
@@ -858,7 +858,7 @@
) args;
print_result !counter;
""
- ), "<server numbers|all> :\t\t\t\tdisconnect from server(s)";
+ ), "<server numbers|all> :\t\tdisconnect from server(s)";
]
@@ -906,7 +906,7 @@
) args;
Printf.sprintf (_b "%d friends removed") (List.length args)
end
- ), "<client numbers> :\tremove friend (use arg 'all' for all friends)";
+ ), "<client numbers|all> :\tremove friend (use arg 'all' for all friends)";
"friends", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -2677,7 +2677,7 @@
end
) !!files) args;
files_to_cancel o
- ), "<num> :\t\t\t\tcancel download (use arg 'all' for all files)";
+ ), "<num|all> :\t\t\tcancel download (use arg 'all' for all files)";
"downloaders", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -2746,7 +2746,7 @@
if (as_file_impl file).impl_file_num = num then
file_pause file o.conn_user.ui_user
) !!files) args; ""
- ), "<num> :\t\t\t\tpause a download (use arg 'all' for all files)";
+ ), "<num|all> :\t\t\tpause a download (use arg 'all' for all files)";
"resume", Arg_multiple (fun args o ->
if args = ["all"] && user2_is_admin o.conn_user.ui_user then
@@ -2760,7 +2760,7 @@
if (as_file_impl file).impl_file_num = num then
file_resume file o.conn_user.ui_user
) !!files) args; ""
- ), "<num> :\t\t\t\tresume a paused download (use arg 'all' for all files)";
+ ), "<num|all> :\t\t\tresume a paused download (use arg 'all' for all
files)";
"release", Arg_one (fun arg o ->
let num = int_of_string arg in
@@ -3101,7 +3101,7 @@
else
print_command_result o buf "You are not allowed to add a group";
_s ""
- ), "<group> <admin: true | false>: add new mldonkey group";
+ ), "<group> <admin: true|false> :\tadd new mldonkey group";
"groupdel", Arg_one (fun group o ->
let buf = o.conn_buf in
@@ -3366,22 +3366,22 @@
end
end else print_command_result o buf "You are not allowed to list users";
_s ""
- ), "\t\t\t\t\tprint users";
+ ), ":\t\t\t\t\tprint users";
"whoami", Arg_none (fun o ->
print_command_result o o.conn_buf o.conn_user.ui_user.user_name;
_s ""
- ), "\t\t\t\t\tprint logged-in user name";
+ ), ":\t\t\t\tprint logged-in user name";
"groups", Arg_none (fun o ->
print_command_result o o.conn_buf (user2_print_user_groups " "
o.conn_user.ui_user);
_s ""
- ), "\t\t\t\t\tprint groups of logged-in user";
+ ), ":\t\t\t\tprint groups of logged-in user";
"dgroup", Arg_none (fun o ->
print_command_result o o.conn_buf (user2_print_user_default_group
o.conn_user.ui_user);
_s ""
- ), "\t\t\t\t\tprint default group of logged-in user";
+ ), ":\t\t\t\tprint default group of logged-in user";
"chgrp", Arg_two (fun group filenum o ->
let num = int_of_string filenum in
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- src/networks/donkey/donkeyInteractive.ml 3 Dec 2006 20:57:56 -0000
1.144
+++ src/networks/donkey/donkeyInteractive.ml 6 Dec 2006 22:33:05 -0000
1.145
@@ -798,7 +798,7 @@
) !current_files
) args;
""
- ) , "<f1> < f2> ... :\t\ttry to recover these files at byte level";
+ ) , "<f1> <f2> ... :\t\ttry to recover these files at byte level";
"preferred", Arg_two (fun arg1 arg2 o ->
let preferred = bool_of_string arg1 in
@@ -810,7 +810,7 @@
end
) servers_by_key;
"ok"
- ), "<true/false> <ip> :\t\tset the server with this IP as preferred";
+ ), "<true|false> <ip> :\t\tset the server with this IP as preferred";
"bs", Arg_multiple (fun args o ->
List.iter (fun arg ->
@@ -818,7 +818,7 @@
server_black_list =:= range :: !!server_black_list;
) args;
"done"
- ), "<range1> <range2> ... :\t\t\tadd these IPs to the servers black list
(can be single IPs, CIDR ranges or begin-end ranges)";
+ ), "<range1> <range2> ... :\t\tadd these IPs to the servers black list
(can be single IPs, CIDR ranges or begin-end ranges)";
"port", Arg_one (fun arg o ->
donkey_port =:= int_of_string arg;