summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/demo/Glacier2/winrt/chat/README.txt4
-rw-r--r--cpp/demo/Ice/winrt/hello/README.txt8
-rw-r--r--cs/demo/IceBox/hello/README5
-rw-r--r--cs/demo/IceGrid/icebox/README4
4 files changed, 6 insertions, 15 deletions
diff --git a/cpp/demo/Glacier2/winrt/chat/README.txt b/cpp/demo/Glacier2/winrt/chat/README.txt
index e18320a441a..7385db7512f 100644
--- a/cpp/demo/Glacier2/winrt/chat/README.txt
+++ b/cpp/demo/Glacier2/winrt/chat/README.txt
@@ -1,5 +1,5 @@
-This demo demonstrates the use of a Glacier2 session helpers and how
-to create a graphical client for the simple chat server.
+This demo demonstrates the use of Glacier2 session helpers and how to
+create a graphical client for the simple chat server.
First follow the instructions from the C++ Glacier2 chat demo README
to start the server and the Glacier2 router.
diff --git a/cpp/demo/Ice/winrt/hello/README.txt b/cpp/demo/Ice/winrt/hello/README.txt
index 74d780f81f2..034be2d7a2e 100644
--- a/cpp/demo/Ice/winrt/hello/README.txt
+++ b/cpp/demo/Ice/winrt/hello/README.txt
@@ -1,8 +1,8 @@
This demo illustrates how to invoke ordinary (twoway) operations,
-as well as how to make oneway, datagram, secure, and batched
+as well as how to make oneway, datagram, secure, and batched
invocations.
-First follow the instructions from the C++ Ice hello demo README
+First follow the instructions from the C++ Ice hello demo README
to start the server.
Build and deploy the demo using "Deploy hello" from the "Build" menu.
@@ -11,12 +11,12 @@ Start the "Ice Hello Demo" application from the Windows Start screen
or right click on the project and select Debug -> Start new instance.
To test timeouts you can use the timeout slider to set a timeout in
-the client proxy. And the delay slider to set a delayed response in
+the client proxy and the delay slider to set a delayed response in
the server to cause a timeout.
You will notice that two "Hello World!" messages will be printed by
the server in this case. This is because the sayHello method is marked
-as idempotent in the slice, meaning that Ice does not need to follow
+as idempotent in the Slice, meaning that Ice does not need to follow
the at-most-once retry semantics.
See the manual for more information about retry behavior.
diff --git a/cs/demo/IceBox/hello/README b/cs/demo/IceBox/hello/README
index 17df37fdb0b..c31b2c1ec4d 100644
--- a/cs/demo/IceBox/hello/README
+++ b/cs/demo/IceBox/hello/README
@@ -17,8 +17,3 @@ Note for 64 bit Windows:
In order to run this demo under 64 bit Windows you must add
<ice-install-dir>\bin to your PATH, since that is where iceboxnet.exe
is located.
-
-Note for Visual Studio 2010 / .NET 4.0 users:
-
-You need to configure iceboxnet.exe to use the .NET 4.0 runtime. See
-the release notes for details.
diff --git a/cs/demo/IceGrid/icebox/README b/cs/demo/IceGrid/icebox/README
index 7d0d50546c6..a6c53e21474 100644
--- a/cs/demo/IceGrid/icebox/README
+++ b/cs/demo/IceGrid/icebox/README
@@ -37,10 +37,6 @@ In order to run this demo under 64 bit Windows you must add
<ice-install-dir>\bin to your PATH, since that is where iceboxnet.exe
is located.
-Note for Visual Studio 2010 / .NET 4.0 users:
-
-You need to configure iceboxnet.exe to use the .NET 4.0 runtime. See
-the release notes for details.
Setup
-----