[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/06 22:19:04

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/networks/donkey: donkeyOptions.ml 

Log message:
        patch #5157

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.870&r2=1.871
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.42&r2=1.43

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -b -r1.870 -r1.871
--- distrib/ChangeLog   1 Jun 2006 01:41:11 -0000       1.870
+++ distrib/ChangeLog   6 Jun 2006 22:19:04 -0000       1.871
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/06/07
+5157: add some line breaks to option help text for shorter lines (schlumpf)
+
 2006/06/01
 5153: New command: force_web_infos to manually download web_infos URLs
 5152: Do not connect friends from disabled networks

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- src/daemon/common/commonOptions.ml  30 May 2006 11:41:12 -0000      1.147
+++ src/daemon/common/commonOptions.ml  6 Jun 2006 22:19:04 -0000       1.148
@@ -553,17 +553,20 @@
 
 let enable_overnet = define_option current_section
     ["enable_overnet"]
-  "Set to true if you also want mldonkey to run as an overnet client 
(enable_donkey must be true)"
+  "Set to true if you also want mldonkey to run as an overnet client
+   (enable_donkey must be true)"
     bool_option false
 
 let enable_kademlia = define_option current_section
     ["enable_kademlia"]
-  "Set to true if you also want mldonkey to run as an kademlia client 
(enable_donkey must be true, and only experimental)"
+  "Set to true if you also want mldonkey to run as an kademlia client
+   (enable_donkey must be true, and only experimental)"
     bool_option false
 
 let enable_servers = define_option current_section
     ["enable_servers"]
-  "Set to true if you also want mldonkey to run with edonkey servers 
(enable_donkey must be true, and only experimental)"
+  "Set to true if you also want mldonkey to run with edonkey servers
+   (enable_donkey must be true, and only experimental)"
     bool_option true
 
 let enable_bittorrent = define_option current_section
@@ -777,7 +780,8 @@
     ["html_mods_bw_refresh_delay"] "bw_stats refresh delay (seconds)" 
int_option 11
 
 let html_mods_theme = define_option current_section
-    ["html_mods_theme"] "html_mods_theme to use (located in relative 
html_themes/<theme_name> directory, leave blank to use internal theme"
+    ["html_mods_theme"] "html_mods_theme to use (located in relative 
html_themes/<theme_name> directory
+     leave blank to use internal theme"
     string_option ""
 
 let use_html_mods o =
@@ -989,12 +993,14 @@
 
 let auto_commit = define_option current_section
     ["auto_commit"]
-  "Set to false if you don't want mldonkey to automatically put completed 
files in incoming directory"
+  "Set to false if you don't want mldonkey to automatically put completed files
+   in incoming directory"
     bool_option true
 
 let pause_new_downloads = define_option current_section
     ["pause_new_downloads"]
-    "Set to true if you want all new downloads be paused immediatly, will be 
set to false on core start."
+    "Set to true if you want all new downloads be paused immediatly
+     will be set to false on core start."
     bool_option false
 
   (*

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/networks/donkey/donkeyOptions.ml        23 May 2006 17:37:12 -0000      
1.42
+++ src/networks/donkey/donkeyOptions.ml        6 Jun 2006 22:19:04 -0000       
1.43
@@ -213,7 +213,8 @@
 let max_server_age = define_expert_option donkey_section ["max_server_age"] 
"max number of days after which an unconnected server is removed" int_option 2
 
 let remove_old_servers_delay = define_expert_option donkey_section 
["remove_old_servers_delay"]
-  "How often should remove old donkey servers (see max_server_age) be called 
(in seconds, 0 to disable)"
+  "How often should remove old donkey servers (see max_server_age) be called
+   (in seconds, 0 to disable)"
     float_option 900.
 
 let min_left_servers = define_expert_option donkey_section ["min_left_servers"]