[Mldonkey-commits] mldonkey distribChangeLog src/daemon/driver/dri...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/27 10:26:49

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml driverControlers.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/networks/donkey: donkeyOvernet.ml 

Log message:
        patch #5204

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.902&r2=1.903
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.66&r2=1.67

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -b -r1.902 -r1.903
--- distrib/ChangeLog   27 Jun 2006 10:24:32 -0000      1.902
+++ distrib/ChangeLog   27 Jun 2006 10:26:48 -0000      1.903
@@ -15,6 +15,7 @@
 =========
 
 2006/06/27
+5204: Cleanup longhelp (anhi)
 5205: Telnet: Fix another UTF8.length exception in search results
 
 2006/06/22

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- src/daemon/driver/driverCommands.ml 15 Jun 2006 14:40:53 -0000      1.156
+++ src/daemon/driver/driverCommands.ml 27 Jun 2006 10:26:48 -0000      1.157
@@ -354,7 +354,7 @@
     "force_web_infos", Arg_none (fun o ->
        CommonWeb.load_web_infos false true;
         "downloading all web_infos URLs"
-    ), ":\t\t\t\tforce downloading all web_infos URLs";
+    ), ":\t\t\tforce downloading all web_infos URLs";
 
     "recover_temp", Arg_none (fun o ->
         networks_iter (fun r ->
@@ -640,7 +640,7 @@
             else
               _s "Usage: message <client num> <msg>\n";
 
-    ), ":\t\t\t\t[<client num> <msg>]";
+    ), "<client num> <msg> :\t\tsend a message to a client";
 
     "calendar_add", Arg_two (fun hour action o ->
         let buf = o.conn_buf in
@@ -1080,7 +1080,7 @@
         | [] ->
             _s "no command given"
         | _ -> "For arbitrary commands, you must set 'allowed_any_command'"
-    ), "<cmd> :\t\t\t\tstart command <cmd> (must be allowed in 
'allowed_commands' option or by 'allow_any_command' if arguments)";
+    ), "<cmd> :\t\t\t\tstart command <cmd>\n\t\t\t\t\tmust be allowed in 
'allowed_commands' option or by 'allow_any_command' if arguments";
 
 
   ]

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- src/networks/bittorrent/bTInteractive.ml    11 Jun 2006 17:37:38 -0000      
1.96
+++ src/networks/bittorrent/bTInteractive.ml    27 Jun 2006 10:26:48 -0000      
1.97
@@ -957,7 +957,7 @@
           Printf.bprintf buf "%s\n" result
        end;
       _s ""
-     ),  "<url>:\t [<URL|file>] start BT download";
+     ),  "<url|file> :\t\t\tstart BT download";
 
     "stop_all_bt", "Network/Bittorrent", Arg_none (fun o ->
       List.iter (fun file -> BTClients.file_stop file ) !current_files;
@@ -968,7 +968,7 @@
       else
         Printf.bprintf buf "started sending stops...\n";
        _s ""
-    ), _s ":\t\t\t\tstops all bittorrent downloads, use this if you want to 
make sure that the stop signal actualy gets to the tracker\n\t\t\t\t\twhen 
shuting mlnet down, but you have to wait till the stops get to the tracker and 
not wait too long,\n\t\t\t\t\tso mldonkey reconnects to the tracker :)";
+    ), _s ":\t\t\t\tstops all bittorrent downloads, use this if you want to 
make sure that the stop signal actually\n\t\t\t\t\tgets to the tracker when 
shuting mlnet down, but you have to wait till the stops get to 
the\n\t\t\t\t\ttracker and not wait too long, so mldonkey reconnects to the 
tracker :)";
 
     "tracker", "Network/Bittorrent", Arg_multiple (fun args o ->
         try

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/networks/donkey/donkeyOvernet.ml        19 May 2006 23:43:54 -0000      
1.66
+++ src/networks/donkey/donkeyOvernet.ml        27 Jun 2006 10:26:48 -0000      
1.67
@@ -1629,7 +1629,7 @@
            command_prefix_to_net ^ " store");
           ]);
         "";
-    ), (":\t\t\t" ^ command_prefix_to_net ^ " Stats commands");
+    ), (":\t\t\t" ^ command_prefix_to_net ^ " stats commands");
 
     "stats", Arg_none (fun o ->
         let buf = o.conn_buf in
@@ -1704,7 +1704,7 @@
           Printf.bprintf buf "\\</div\\>\n";
 
         "";
-    ), ":\t\t\t\t" ^ command_prefix_to_net ^ " Stats";
+    ), ":\t\t\t\t" ^ command_prefix_to_net ^ " stats";
 
     "web", Arg_multiple (fun args o ->
         let urls =