Index: roundup/scripts/roundup_server.py
===================================================================
--- roundup/scripts/roundup_server.py	(revision 4594)
+++ roundup/scripts/roundup_server.py	(working copy)
@@ -465,9 +465,14 @@
 
     SETTINGS = (
             ("main", (
-            (configuration.Option, "host", "",
+            (configuration.Option, "host", "localhost",
                 "Host name of the Roundup web server instance.\n"
-                "If empty, listen on all network interfaces."),
+                "If left unconfigured (no 'host' setting) the default\n"
+                "will be used.\n"
+                "If empty, listen on all network interfaces.\n"
+                "If you want to explicitly listen on all\n"
+                "network interfaces, the address 0.0.0.0 is a more\n"
+                "explicit way to achieve this."),
             (configuration.IntegerNumberOption, "port", DEFAULT_PORT,
                 "Port to listen on."),
             (configuration.NullableFilePathOption, "favicon", "favicon.ico",
@@ -734,7 +739,9 @@
  -h            print this text and exit
  -S            create or update configuration file and exit
  -C <fname>    use configuration file <fname>
- -n <name>     set the host name of the Roundup web server instance
+ -n <name>     set the host name of the Roundup web server instance,
+               specifies on which network interfaces to listen for
+               connections, defaults to localhost
  -p <port>     set the port to listen on (default: %(port)s)
  -l <fname>    log to the file indicated by fname instead of stderr/stdout
  -N            log client machine names instead of IP addresses (much slower)
Index: doc/upgrading.txt
===================================================================
--- doc/upgrading.txt	(revision 4594)
+++ doc/upgrading.txt	(working copy)
@@ -16,13 +16,20 @@
 Migrating from 1.4.x to 1.4.17
 ==============================
 
-There is a new config-option 'migrate_passwords' in section 'web' to
+There is a new config-option `migrate_passwords` in section `web` to
 auto-migrate passwords at web-login time to a more secure storage
 scheme. Default for the new option is "yes" so if you don't want that
 passwords are auto-migrated to a more secure password scheme on user
 login, set this to "no" before running your tracker(s) after the
 upgrade.
 
+The standalone roundup-server now defaults to listening on localhost (no
+longer on all network interfaces). This will not affect you if you're
+already using a configuration file for roundup-server. If you are
+starting the server without a configuration file and want to explicitly
+listen to all network interface, you should specify the -n option with
+either an empty string or the explicit address `0.0.0.0`.
+
 Searching now requires either read-permission without a check method, or
 you will have to add a "Search" permission for a class or a list of
 properties for a class (if you want to allow searching). For the classic
Index: doc/admin_guide.txt
===================================================================
--- doc/admin_guide.txt	(revision 4594)
+++ doc/admin_guide.txt	(working copy)
@@ -74,7 +74,7 @@
 
     [main]
     port = 8080
-    ;hostname =
+    ;host =
     ;user =
     ;group =
     ;log_ip = yes
@@ -93,9 +93,11 @@
 
 **port**
   Defines the local TCP port to listen for clients on.
-**hostname**
-  Defines the local hostname to listen for clients on. Only required if
-  "localhost" is not sufficient.
+**host**
+  Defines the hostname or IP number to listen for clients on. Only
+  required if `localhost` is not sufficient. If left empty (as opposed
+  to no `host` keyword in the config-file) this will listen to all
+  network interfaces and is equivalent to an explicit address `0.0.0.0`.
 **user** and **group**
   Defines the Unix user and group to run the server as. Only work if the
   server is started as root.