Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

4 files changed, 24 insertions, 19 deletions

diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index 41fa33136cf..ad4b5c732af 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -10,10 +10,12 @@ Ice is expected to build and run properly on any recent Linux
 distribution for x86 and x86_64. However, Ice is officially supported
 only on:
 
- - Red Hat Enterprise Linux Advanced Server 4 Update 4 for x86 or
+ - Red Hat Enterprise Linux Advanced Server 4 Update 4 for i386 or
    x86_64 (RHEL 4.4)
 
- - Novell SuSE Linux Enterprise Server 10 for x86 or x86_64 (SLES 10)
+ - Red Hat Enterprise Linux 5 for i386 or x86_64 (RHEL 5)
+
+ - Novell SuSE Linux Enterprise Server 10 for i586 or x86_64 (SLES 10)
 
 
 C++ compiler
@@ -23,6 +25,7 @@ Ice is expected to build properly with GCC 3.3 or later. However, only
 the following compilers are officially supported:
 
  - GCC 3.4.6 on RHEL 4.4
+ - GCC 4.1.1 on RHEL 5
  - GCC 4.1.x on SLES 10
 
 
@@ -31,7 +34,7 @@ Third-party libraries
 
 Ice has dependencies on a number of third-party libraries:
 
-- Berkeley DB 4.3.29 or 4.5.20 configured with --enable-cxx.
+- Berkeley DB 4.5.20 configured with --enable-cxx.
 
   If you intend to use Ice for Java with Berkeley DB, you must also
   include the option --enable-java.
@@ -51,7 +54,8 @@ expat          http://sourceforge.net/projects/expat/
 OpenSSL        http://www.openssl.org
 bzip2          http://sources.redhat.com/bzip2
 
-RHEL 4.4 RPMs for Berkeley DB 4.5.20 are available from:
+RPMs for Berkeley DB 4.5.20 on RHEL 4.4, RHEL 5 and SLES 10 are 
+available from:
 
 http://www.zeroc.com/download.html 
 
diff --git a/cpp/INSTALL.SOLARIS b/cpp/INSTALL.SOLARIS
index a9ae22edde7..e709de7d708 100644
--- a/cpp/INSTALL.SOLARIS
+++ b/cpp/INSTALL.SOLARIS
@@ -41,7 +41,7 @@ Ice has dependencies on a number of third-party libraries:
   If you intend to use Ice for Java with Berkeley DB, you must also
   include the option --enable-java.
 
-- expat 1.9x
+- expat 1.95.7 or later
 
 - OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended)
 
diff --git a/cpp/WINDOWS_SERVICE.txt b/cpp/WINDOWS_SERVICE.txt
index 83400d5183a..0aa9a8b20f0 100644
--- a/cpp/WINDOWS_SERVICE.txt
+++ b/cpp/WINDOWS_SERVICE.txt
@@ -65,8 +65,7 @@ Follow these steps to install a Glacier2 router as a service:
 

 1. In a command window, execute the following line:

 

-   > glacier2router --install Glacier2Router \

-     --Ice.Config=<ice-home>\config\glacier2router.cfg

+   > glacier2router --install Glacier2Router --Ice.Config=<ice-home>\config\glacier2router.cfg

 

    Installing the service on Windows Vista with UAC enabled requires

    administrator privileges. In this case, run the command shell as

@@ -114,11 +113,9 @@ services:
 

 1. In a command window, execute the following lines:

 

-   > icegridnode --install IceGridNode \

-     --Ice.Config=<ice-home>\config\icegridnode.cfg

+   > icegridnode --install IceGridNode --Ice.Config=<ice-home>\config\icegridnode.cfg

 

-   > icegridregistry --install IceGridRegistry \

-     --Ice.Config=<ice-home>\config\icegridregistry.cfg

+   > icegridregistry --install IceGridRegistry --Ice.Config=<ice-home>\config\icegridregistry.cfg

 

    Installing a service on Windows Vista with UAC enabled requires

    administrator privileges. In this case, run the command shell as

diff --git a/java/INSTALL b/java/INSTALL
index 9e3a558f4e5..46c5c5d3d79 100644
--- a/java/INSTALL
+++ b/java/INSTALL
@@ -82,14 +82,21 @@ Berkeley DB
 Freeze for Java uses Berkeley DB as its underlying database. It
 requires Berkeley DB 4.5.20.
 
-Even though Berkeley DB is included with many Linux distributions, the
-Java files for Berkeley DB are usually not available, which requires
-you to build Berkeley DB yourself.
+ZeroC provides Berkeley DB binary distributions (with Java support)
+for many platforms: 
 
-You can download the Berkeley DB source distribution from:
+  http://www.zeroc.com/download.html
+
+Alternatively, you can build Berkeley DB yourself; the Berkeley DB 
+source distribution is available at
 
   http://www.oracle.com/database/berkeley-db/index.html
 
+This source distribution, plus a number of patches, is also available
+at
+
+  http://www.zeroc.com/download.html#src_third_party
+
 When you build Berkeley DB, make sure to configure Berkeley DB with
 Java support. For Linux, this is done by specifying the --enable-java
 option when running the configure script. On Windows, you must select
@@ -102,9 +109,6 @@ LD_LIBRARY_PATH, for example:
 
 $ export LD_LIBRARY_PATH=/opt/db45/lib:$LD_LIBRARY_PATH
 
-Note that the Ice for Java distribution is compiled against Berkeley
-DB 4.5.20.
-
 
 bzip2
 -----
@@ -154,7 +158,7 @@ Python
 To run the automated test suite, you will need Python 2.2 or later. 
 If you have no interest in running the test scripts, Python is not 
 required. Linux distributions usually include Python. For Windows 
-2000/XP, you can download a Python distribution from:
+XP/Vista, you can download a Python distribution from:
 
   http://www.python.org/download