bug 2348

1 files changed, 25 insertions, 15 deletions

diff --git a/cpp/install/common/README.DEMOS b/cpp/install/common/README.DEMOS
index 0b26c086a4e..3c91059a85c 100644
--- a/cpp/install/common/README.DEMOS
+++ b/cpp/install/common/README.DEMOS
@@ -11,8 +11,8 @@ distributions. Distributions for specific platform/tool combinations
 may not support every Ice language mapping.
 
 The build systems included in the demo distribution are either
-'makefile' based or 'ant' based. The C++ and C# demos use makefiles and
-the Java demos use the Apache Foundation's ant build tool.
+'makefile' based or 'ant' based. The C++ and C# demos use makefiles
+and the Java demos use the Apache Foundation's ant build tool.
 
 NOTE: The Ruby, Python and PHP demos do not need to be built.
 
@@ -134,11 +134,10 @@ on this to start a console window with your development environment
 already configured.
 
 
-Building the demos on Windows using Mono, Cygwin, etc.
-------------------------------------------------------
+Mono on Windows
+---------------
 
-Building the demos with Mono using the NMAKE makefiles or using
-Cygwin and the gmake makefiles is not currently supported.
+We do not currently support the use of Mono on Windows.
 
 
 Running the Ice Demos
@@ -156,12 +155,12 @@ Running the C++ demos
 To run a demo, open a terminal terminal window, change to the desired
 demo directory, and enter the following command to run the server:
 
-$ ./server
+$ server
 
 To run the client, open another terminal window, also change to the
 desired demo directory, and run:
 
-$ ./client
+$ client
 
 
 Running the Java demos
@@ -198,12 +197,23 @@ distributions.
 To run a demo, open a terminal window, change to the desired demo
 directory, and enter the following command to run the server:
 
-$ ./server.exe
+$ server.exe
 
 To run the client, open another terminal window, also change to the
 desired demo directory, and run:
 
-$ ./client.exe
+$ client.exe
+
+When using Mono on Linux, the compiled programs may not be directly
+executable unless you have configured Linux as described in the
+installation instructions included with the Ice distribution. As a
+result, you will need to start Mono executables as shown below:
+
+$ mono server.exe
+
+In another window:
+
+$ mono client.exe
 
 
 Running the Python demos
@@ -228,13 +238,13 @@ support server-side activities. In order to run a sample client, you
 must first start its corresponding server from another Ice language
 mapping, such as C++:
 
-# for example in the /tmp/Ice-@ver@/demo/Ice/hello directory
+# for example in $HOME/testing/Ice-@ver@-demos/demo/Ice/hello
 $ server
 
 To run the client, open another terminal window, change to the
 corresponding demo directory, and run:
 
-# for example in the /tmp/Ice-@ver@/demorb/Ice/hello directory
+# for example in $HOME/testing/Ice-@ver@-demos/demorb/Ice/hello
 $ ruby Client.rb
 
 
@@ -256,6 +266,6 @@ examples require that an Ice server be available; a matching server
 from any of the other language mappings can be used. A README file is
 provided in each of the example directories.
 
-Note that you must modify the php.ini files in each demo directory to
-match your PHP installation and ensure that the Ice extension is
-loaded properly.
+Note that you may need to modify the php.ini files in each demo
+directory to match your PHP installation and ensure that the Ice
+extension is loaded properly.