minor edits

6 files changed, 79 insertions, 68 deletions

diff --git a/cppe/CHANGES b/cppe/CHANGES
index f251d12a9eb..17f4bf476db 100644
--- a/cppe/CHANGES
+++ b/cppe/CHANGES
@@ -9,26 +9,26 @@ Changes since version 1.0.0
   establish a new connection instead of throwing an exception, even if
   retries are disabled.
 
-- Added blocking client side concurrency model. The use of this model is
-  controlled by the Ice.Blocking property.
+- Added blocking client side concurrency model. The use of this model
+  is controlled by the Ice.Blocking property.
 
-- If a proxy is not configured with a -h paramater, Ice will now
-  attempt to connect using all local interfaces. The loopback interface 
-  (127.0.0.1) will only be tried if it is the only local interface present.
+- If a proxy is not configured with the -h parameter, Ice will now
+  attempt to connect using all local interfaces. The loopback
+  interface (127.0.0.1) will only be tried if it is the only local
+  interface present.
 
 - Fixed the marshalling of doubles on ARM/Linux.
 
-- Added the ability to specify other mappings for slice sequences other
-  than std::vector. This is done through metadata in a similar way to
-  which IceJ supports alternate sequence mappings. Please see the Ice 
-  manual for more details.
+- Added the ability to specify alternate mappings for Slice sequences
+  other than std::vector. Please see the README file for more
+  information.
 
 - Fixed a bug in slice2cpp that caused one-shot constructors for
   classes to incorrectly initialize base classes for class hierarchies
   three or more levels deep.
 
-- Fixed a bug in the Slice parser that caused problems if an
-  included file contained white space in the file name.
+- Fixed a bug in the Slice parser that caused problems if an included
+  file contained white space in the file name.
 
 - Fixed a deadlock during shutdown that could happen with
   bi-directional connections.
@@ -38,12 +38,12 @@ Changes since version 1.0.0
 - Connection::close(false) (i.e., graceful connection shutdown) now
   waits until all outstanding requests have completed.
 
-- Ice will now listen on all local interfaces if no -h parameter
-  is present in the endpoint configuration and no default host has
-  been set. It will also listen to all interfaces if the -h parameter
-  is set to *. In such configurations the endpoints published
-  in proxies will not contain the loopback interface (127.0.0.1)
-  unless it is the only local interface present.
+- Ice will now listen on all local interfaces if no -h parameter is
+  present in the endpoint configuration and no default host has been
+  set. It will also listen to all interfaces if the -h parameter is
+  set to 0.0.0.0. In such configurations the endpoints published in
+  proxies will not contain the loopback interface (127.0.0.1) unless
+  it is the only local interface present.
 
 - slice2cppe now provides the --add-header option. It adds a #include
   directive for the specified header at the beginning of the generated
@@ -51,8 +51,8 @@ Changes since version 1.0.0
 
       slice2cppe --add-header=precompiled.h x.ice
 
-  adds "#include <precompiled.h> to the beginning of x.cpp (before any
-  other include directives).
+  adds "#include <precompiled.h>" to the beginning of x.cpp (before
+  any other include directives).
 
   You can specify an optional guard, for example:
 
@@ -72,6 +72,6 @@ Changes since version 1.0.0
   Ice::AlreadyRegisteredException if it is called with the name of an
   object adapter that already exists.
 
-- GCC compiles now use -Os rather than -O3 for optimized builds.
+- Ice-E now uses -Os rather than -O3 for optimized GCC builds.
 
 - EVC++ release builds now use "Optimize Size".
diff --git a/cppe/INSTALL.LINUX b/cppe/INSTALL.LINUX
index ceb15c81284..b45726e0cce 100644
--- a/cppe/INSTALL.LINUX
+++ b/cppe/INSTALL.LINUX
@@ -91,9 +91,10 @@ $ export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
 32 bit builds on x86_64
 ======================================================================
 
-By default, builds on x86_64 are 64-bit. To perform a 32-bit build
-on a x86_64 Linux system, set the environment variable LP64 to no,
-as shown below:
+By default, builds on x86_64 are 64-bit. To perform a 32-bit build on
+an x86_64 Linux system, set the environment variable LP64 to no, as
+shown below:
+
   $ export LP64=no
 
 
@@ -105,10 +106,10 @@ Simply run "make install". This will install Ice-E in the directory
 specified by the "prefix" variable in config/Make.rules.
 
 After installation, make sure the <prefix>/lib directory is in your
-LD_LIBRARY_PATH. When compiling Ice-E programs, you must also make sure
-to pass the location of the <prefix>/include directory to the compiler
-with the -I option, and the location of the <prefix>/lib directory
-with the -L option.
+LD_LIBRARY_PATH. When compiling Ice-E programs, you must also make
+sure to pass the location of the <prefix>/include directory to the
+compiler with the -I option, and the location of the <prefix>/lib
+directory with the -L option.
 
-On a x86_64 system, the libraries are installed in <prefix>/lib64
+On an x86_64 system, the libraries are installed in <prefix>/lib64
 unless LP64 is set to no. No other changes are necessary.
diff --git a/cppe/INSTALL.WINCE.EVC++ b/cppe/INSTALL.WINCE.EVC++
index e2167d66b34..8af651a3af8 100644
--- a/cppe/INSTALL.WINCE.EVC++
+++ b/cppe/INSTALL.WINCE.EVC++
@@ -3,8 +3,8 @@ Requirements
 ======================================================================
 
 
-Version
--------
+Environment
+-----------
 
 Ice-E has been extensively tested with the standard WinCE SDK 4.2
 under the following environments:
@@ -51,11 +51,13 @@ The Microsoft Smartphone 2003 SDK can be be downloaded here:
 
 - http://www.microsoft.com/downloads/details.aspx?FamilyID=a6c4f799-ec5c-427c-807c-4c0f96765a81&DisplayLang=en
 
-The Pocket PC 2003 Run-time Type Information library can be downloaded here:
+The Pocket PC 2003 Run-time Type Information library can be downloaded
+here:
 
 - http://support.microsoft.com/default.aspx?scid=kb;%5BLN%5D;830482
 
-Information on the Microsoft Device Emulator 1.0 Preview can be found here:
+Information on the Microsoft Device Emulator 1.0 Preview can be found
+here:
 
 http://msdn.microsoft.com/mobility/windowsmobile/downloads/emulatorpreview/default.aspx
 
@@ -85,7 +87,7 @@ http://sourceforge.net/projects/stlport
 There is no need to compile STLport for use with Ice-E, since Ice-E
 does not require the iostream support provided by STLport.
 
-Users must configure Microsoft eMbedded Visual C++ to use STLPort:
+Users must configure Microsoft eMbedded Visual C++ to use STLport:
 
 - In the IDE, choose Tools->Options->Directories
 
@@ -120,8 +122,8 @@ Installing and Configuring Microsoft eMbedded Visual C++
 
   C:\Program Files\Windows CE Tools\wce420\STANDARDSDK_420\Lib
 
-- Unarchive the STLport distribution. Add the include directory as
-  described above.
+- Extract the STLport archive. Add the include directory as described
+  above.
 
 - Add the location of the slice2cppe compiler to your "Executable
   files" list in Tools->Options->Directories.
@@ -137,7 +139,7 @@ according to the instructions provided above. Finally, once EVC was
 working, we reinstalled Microsoft Visual Studio 6.0.
 
 If you want to compile and build for the Pocket PC 2003 SDK or
-Smartphone 2003 SDK you must install the appropriate SDK, and install
+Smartphone 2003 SDK, you must install the appropriate SDK and install
 the Run-time type information library. This will appear as "Pocket PC
 2003" or "Smartphone 2003" in the listed platforms.
 
diff --git a/cppe/INSTALL.WINCE.VC++ b/cppe/INSTALL.WINCE.VC++
index 09fbcefa27f..5ab95572088 100644
--- a/cppe/INSTALL.WINCE.VC++
+++ b/cppe/INSTALL.WINCE.VC++
@@ -2,8 +2,9 @@
 Requirements
 ======================================================================
 
-Version
--------
+
+Environment
+-----------
 
 Ice-E has been extensively tested under the following environments:
 
@@ -38,11 +39,13 @@ http://www.zeroc.com/download.html
 Installing and Configuring Microsoft Visual C++ 2005
 ======================================================================
 
-- Install Visual Studio 2005 making sure to include the Smart Device
+- Install Visual Studio 2005, making sure to include the Smart Device
   support (Language Tools->Visual C++->Smart Device Support)
 
 - Add the location of the slice2cppe compiler to your "Executable
-  files" list in Tools->Options->Projects and Solutions->VC++ Directories.
+  files" list in Tools->Options->Projects and
+  Solutions->VC++ Directories.
+
 
 ======================================================================
 Compilation and Testing
@@ -65,10 +68,10 @@ Configurations whose names end in "Static" generate static libraries
 for the Ice-E run time, whereas the other configurations generate
 DLLs.
 
-Set your active project to "all" to compile everything including the
-tests and demos. To set your active project click on "all" in the class
-view, then use Project->Set as StartUp Project. To start the compilation
-use Build->Build all.
+Set your active project to "all" to compile everything, including the
+tests and demos. To set your active project, click on "all" in the
+class view, then use Project->Set as StartUp Project. To start the
+compilation, use Build->Build all.
 
 In order to run the test suite, you must build all of the tests, and
 then manually run the server followed by the client. Any failures
diff --git a/cppe/INSTALL.WINDOWS b/cppe/INSTALL.WINDOWS
index ee333c905b3..4344305c62e 100644
--- a/cppe/INSTALL.WINDOWS
+++ b/cppe/INSTALL.WINDOWS
@@ -8,10 +8,11 @@ Windows version
 
 Ice-E has been extensively tested with Windows XP.
 
+
 C++ compiler
 ------------
 
-the following microsoft visual c++ compilers are supported:
+The following microsoft Visual C++ compilers are supported:
 
 - Visual C++ 6.0 SP5 with STLport 4.5 (or later)
 
@@ -43,17 +44,19 @@ http://www.zeroc.com/download.html
 STLport
 -------
 
-Ice-E requires STLport 4.5 or later for Visual C++ 6.0. You can download
-STLport at the following location:
+Ice-E requires STLport 4.5 or later for Visual C++ 6.0. You can
+download STLport at the following location:
 
 http://www.stlport.org/download.html
 
 For STLport installation instructions, please refer to
-http://www.stlport.org/doc/install.html. There is no need to compile 
-STLport for use with Ice-E, since Ice-E does not require the iostream 
-support provided by STLport.
 
-Users must configure Visual Studio to use STLPort:
+http://www.stlport.org/doc/install.html
+
+There is no need to compile STLport for use with Ice-E, since
+Ice-E does not require the iostream support provided by STLport.
+
+Users must configure Visual Studio to use STLport:
 
 - In the Visual C++ 6.0 IDE, choose Tools->Options->Directories
 
@@ -84,8 +87,8 @@ like, then start the Microsoft Visual C++ IDE. You are now ready to
 compile Ice-E.
 
 Open the "all.dsw" workspace. If you are using Visual C++ .NET 2003 or
-Visual C++ 2005, then the project files must first be converted from
-Visual C++ 6.0 to the new solution and project file format.
+Visual C++ 2005, you must first convert the project files from Visual
+C++ 6.0 to the new solution and project file format.
 
 Set your active project to "all" to compile everything including the
 tests and demos. To set your active project with Visual C++ 6.0,
@@ -103,18 +106,18 @@ Four build configurations are supported:
 The first two create DLLs for the Ice-E run time, whereas the last two
 generate only static libraries.
 
-For Visual C++ 2005 you should make sure maximum number of parallel
-builds setting is set to 1. Otherwise you may get failures which require
-you run the compilation multiple times. This setting can be found in
+For Visual C++ 2005, you should set the maximum number of parallel
+builds to 1. Otherwise you may get failures that require you to build
+the solution multiple times. This setting can be found in
 Tools->Options->Projects and Solutions->Build and Run.
 
 After selecting a build configuration, start the compilation using
 Build->Build for Visual C++ 6.0, or Build->Build all for Visual C++
 .NET 2003 or Visual C++ 2005.
 
-If you built the tests you can run the test suite, provided that you
-have installed Python. Open a command prompt and change to the top-
-level Ice-E directory. At the command prompt, execute:
+You can run the test suite if you compiled the tests and have
+installed Python. Open a command prompt and change to the top-level
+Ice-E directory. At the command prompt, execute:
 
 python allTests.py
 
@@ -130,7 +133,7 @@ Ice-E DLLs.
 Installation
 ======================================================================
 
-No automatic installation support is provided: you need to copy the
+No automatic installation support is provided; you need to copy the
 contents of the bin, include, and lib directories to your preferred
 location. The include directory contains all Ice-E include files, the
 lib directory contains all Ice-E libraries, and the bin directory
diff --git a/cppe/README b/cppe/README
index 6db6cb3bd6a..94596f758a3 100644
--- a/cppe/README
+++ b/cppe/README
@@ -17,9 +17,10 @@ Concurrency Models
 ------------------
 
 Ice-E supports only the thread-per-connection server-side concurrency
-model; the thread pool concurrency model is not supported. Applications
-that make nested callbacks must be aware of the following limitations of
-the thread-per-connection model:
+model; the thread pool concurrency model is not supported.
+
+Applications that make nested callbacks must be aware of the following
+limitations of the thread-per-connection model:
 
 * For bidirectional connections, the nested callback must be a oneway
   invocation.
@@ -29,11 +30,12 @@ the thread-per-connection model:
 
 * Only one level of nested callbacks is allowed.
 
-For the client-side, IceE supports a blocking concurrency model as well
-as the thread-per-connection model, which can provide better performance
-results. The Ice.Blocking configuration property is used to enable the
-blocking model. In addition to the limitations of the thread-per-connection
-model, the blocking model also disallows the use of bidirectional connections.
+For the client-side, Ice-E supports the thread-per-connection model as
+well as a blocking concurrency model that can provide better
+performance results. Set the configuration property Ice.Blocking=1 to
+enable the blocking model. In addition to the limitations of the
+thread-per-connection model described above, the blocking model also
+disallows the use of bidirectional connections.
 
 Transports
 ----------