Squashed commit of the following:

commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:22:52 2008 +0800

    Cleanup some IceGrid configuration files.

commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:17:10 2008 +0800

    remove ttl setting.

commit c418b308ff7cc8e8a4296819938b88dfedc16a97
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:16:32 2008 +0800

    remove useless PopulateEmptyIndices config.

commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 13:59:51 2008 +0800

    - Removed interrupt handlers for interactive C++ demos.
    - Lots of cleanups to demos.

3 files changed, 33 insertions, 5 deletions

diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index c67036d149e..3fb455eeb5c 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -49,8 +49,7 @@ public class Client extends Ice.Application
         //
         setInterruptHook(new ShutdownHook());
 
-        NestedPrx nested = NestedPrxHelper.checkedCast(
-            communicator().propertyToProxy("Nested.NestedServer"));
+        NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.Proxy"));
         if(nested == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client
index 741856b4b3b..066f1dc8fd8 100644
--- a/java/demo/Ice/nested/config.client
+++ b/java/demo/Ice/nested/config.client
@@ -1,6 +1,23 @@
-Nested.NestedServer=nestedServer:default -p 10000 -t 10000
+#
+# The client reads this property to create the reference to the
+# "Nested" object in the server.
+#
+Nested.Proxy=nestedServer:default -p 10000 -t 10000
+
+#
+# The client creates one single object adapter with the name
+# "Nested.Client". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Client.Endpoints=default -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -8,7 +25,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
index e0073284155..94d3ca82be4 100644
--- a/java/demo/Ice/nested/config.server
+++ b/java/demo/Ice/nested/config.server
@@ -1,5 +1,17 @@
+#
+# The server creates one single object adapter with the name
+# "Nested.Server". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Server.Endpoints=default -p 10000 -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -7,7 +19,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing