Merge with main repo.

1 files changed, 6 insertions, 2 deletions

diff --git a/dillorc b/dillorc
index 8ade389a..0ac2773a 100644
--- a/dillorc
+++ b/dillorc
@@ -76,8 +76,7 @@
 # Show tooltip popups for HTML title attributes
 #show_tooltip=YES
 
-# Set this to YES if you want to limit the word wrap width to the viewport
-# width (may be useful for iPAQ)
+# Set this to YES to limit the word wrap width to the viewport width
 #limit_text_width=NO
 
 
@@ -176,6 +175,11 @@ search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
 # Maximum number of simultaneous TCP connections to a single server or proxy.
 # http_max_conns=6
 
+# Change this if you want Dillo to reuse HTTP connections to a server or proxy
+# when possible instead of making a new connection for every request for a new
+# page/image/stylesheet. Currently, HTTPS connections are never reused.
+#http_persistent_conns=NO
+
 # Set the proxy information for http.
 # Note that the http_proxy environment variable overrides this setting.
 # WARNING: FTP and downloads plugins use wget. To use a proxy with them,