3 files changed, 10 insertions, 245 deletions
diff --git a/rb/INSTALL.LINUX b/rb/INSTALL.LINUX
index a6f128a1a26..212d3437cd7 100644
--- a/rb/INSTALL.LINUX
+++ b/rb/INSTALL.LINUX
@@ -9,14 +9,14 @@ Requirements
 ------------
 
 - Ice @ver@ for C++ development kit
-- Ruby 1.8.4 or 1.8.5
+- Ruby 1.8.1 or later
 
 You can build Ice for Ruby using a source or RPM installation of Ruby.
 If you prefer to use RPMs, the following components are required:
 
-  ruby-1.8.4
-  ruby-libs-1.8.4
-  ruby-devel-1.8.4
+  ruby
+  ruby-libs
+  ruby-devel
 
 
 Compiling Ice for Ruby
@@ -102,8 +102,8 @@ feature and wish to sponsor its development, please contact us at
 info@zeroc.com.
 
 
-SELinux Issue
--------------
+SELinux Issue on Red Hat Enterprise Linux
+-----------------------------------------
 
 If SELinux is enabled on your system, you may encounter this error
 message when Ruby attempts to load the Ice extension:
@@ -115,19 +115,19 @@ There are two ways to solve this problem:
 - Change the default security context for the Ice extension
   using the following command:
 
-  $ chcon -t texrel_shlib_t /opt/IceRuby-3.1.1/ruby/IceRuby.so
+  $ chcon -t texrel_shlib_t /opt/IceRuby-@ver@/ruby/IceRuby.so
 
-  Replace /opt/IceRuby-3.1.1 with your installation directory.
+  Replace /opt/IceRuby-@ver@ with your installation directory.
 
 - Disable SELinux completely by adding the following line to your
   /etc/sysconfig/selinux file:
 
   SELINUX=disabled
 
-For more information on SELinux in Fedora Core 5, refer to the FAQ at
+For more information on SELinux in Red Hat Enterprise Linux 4, refer to
 the link below:
 
-http://fedora.redhat.com/docs/selinux-faq-fc5/
+http://www.redhat.com/docs/manuals/enterprise/RHEL-4-Manual/selinux-guide/
 
 
 Running the demos
diff --git a/rb/README.Linux b/rb/README.Linux
deleted file mode 100644
index a1c7519c05b..00000000000
--- a/rb/README.Linux
+++ /dev/null
@@ -1,119 +0,0 @@
-Ice for Ruby Preview Release
-----------------------------
-
-The archive you downloaded contains the Ice extension for Ruby, along
-with supporting libraries and sample programs. This binary
-distribution was compiled on Linux Fedora Core 5 (FC5) using FC5's
-default C++ compiler, GCC 4.1.1.
-
-Requirements:
-
-- Ice for C++ 3.1.1 run time
-- Ruby 1.8.4
-
-You can obtain RPMs or a Linux binary archive of Ice 3.1.1 from the
-ZeroC web site:
-
-  http://www.zeroc.com/download.html
-
-The Ice extension for Ruby was compiled using the following RPMs:
-
-  ruby-1.8.4
-  ruby-libs-1.8.4
-  ruby-devel-1.8.4
-
-
-Installation Instructions
--------------------------
-
-The steps below assume you have extracted this Ice for Ruby archive
-into the /opt/IceRuby-3.1.1 directory.
-
-1. Add /opt/IceRuby-3.1.1/bin to your PATH:
-
-   $ export PATH=/opt/IceRuby-3.1.1/bin:$PATH
-
-2. Add /opt/IceRuby-3.1.1/lib to your LD_LIBRARY_PATH:
-
-   $ export LD_LIBRARY_PATH=/opt/IceRuby-3.1.1/lib:$LD_LIBRARY_PATH
-
-3. Verify that the Ice run time is also in your PATH. If you installed
-   Ice using RPMs, no further action is necessary. If you installed
-   the Linux binary archive, then your PATH should include the bin
-   directory and LD_LIBRARY_PATH should include the lib directory, as
-   shown below:
-
-   $ export ICE_HOME=/opt/Ice-3.1.1
-   $ export PATH=$ICE_HOME/bin:$PATH
-   $ export LD_LIBRARY_PATH=$ICE_HOME/lib:$LD_LIBRARY_PATH
-   
-4. Define the RUBYLIB environment variable as follows:
-
-   $ export RUBYLIB=/opt/IceRuby-3.1.1/ruby
-
-   Note that there are other ways of informing the Ruby interpreter
-   about the location of the Ice extension and supporting files. See
-   the accompanying Ice for Ruby documentation for more information.
-
-
-Limitations
------------
-
-Ruby's lack of support for native threads makes it impractical for
-ZeroC to implement server-side functionality, therefore Ice for Ruby
-can only be used in client applications. If you have a need for this
-feature and wish to sponsor its development, please contact us at
-info@zeroc.com.
-
-
-SELinux Issue
--------------
-
-If SELinux is enabled on your system, you may encounter this error
-message when Ruby attempts to load the Ice extension:
-
-  "cannot restore segment prot after reloc: Permission denied"
-
-There are two ways to solve this problem:
-
-- Change the default security context for the Ice extension
-  using the following command:
-
-  $ chcon -t texrel_shlib_t /opt/IceRuby-3.1.1/ruby/IceRuby.so
-
-  Replace /opt/IceRuby-3.1.1 with your installation directory.
-
-- Disable SELinux completely by adding the following line to your
-  /etc/sysconfig/selinux file:
-
-  SELINUX=disabled
-
-For more information on SELinux in Fedora Core 5, refer to the FAQ at
-the link below:
-
-http://fedora.redhat.com/docs/selinux-faq-fc5/
-
-
-Running the demos
------------------
-
-The demos directory contains Ruby versions of the Ice sample programs.
-Note that only clients are provided, since Ice for Ruby does not
-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++.
-
-As an example, let's run the hello application in demo/Ice/hello using
-the C++ server. Assuming that you have already compiled the sample C++
-programs, we begin by starting the server:
-
-  $ cd $ICE_HOME/demo/Ice/hello
-  $ server
-
-In a separate window, start the client:
-
-  $ cd /opt/IceRuby-3.1.1/demo/Ice/hello
-  $ ruby Client.rb
-
-Some demo directories contain README files if additional requirements
-are necessary.
diff --git a/rb/README.txt b/rb/README.txt
deleted file mode 100755
index 1a9c5f4bf07..00000000000
--- a/rb/README.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Ice for Ruby Preview Release
-----------------------------
-
-This binary archive contains the Ice extension for Ruby, supporting
-libraries and sample programs. The executables and DLLs in this
-archive were compiled with Microsoft Visual C++ 6.0 for compatibility
-with Ruby.
-
-Requirements:
-
-- Ice for C++ 3.1.1 run time (Microsoft Visual C++ 6.0)
-- Ruby 1.8.5
-
-You can obtain a Windows installer for Ice 3.1.1 from the ZeroC
-web site:
-
-  http://www.zeroc.com/download.html
-
-An installer for Ruby is available here:
-
-  http://rubyforge.org/projects/rubyinstaller/
-
-
-Installation Instructions
--------------------------
-
-The steps below assume you have extracted this Ice for Ruby archive
-into the C:\IceRuby-3.1.1 directory.
-
-1. Add C:\IceRuby-3.1.1\bin to your PATH.
-
-2. Verify that the Ice run time is also in your PATH. For example, if
-   Ice is installed in C:\Ice, then PATH should include the C:\Ice\bin
-   directory.
-
-3. Define the RUBYLIB environment variable as follows:
-
-   set RUBYLIB=C:\IceRuby-3.1.1\ruby
-
-   Note that there are other ways of informing the Ruby interpreter
-   about the location of the Ice extension and supporting files. See
-   the accompanying Ice for Ruby documentation for more information.
-
-4. Verify that Ruby can load the Ice extension successfully. Open a
-   command window and start the interpreter using irb.bat, as shown
-   below:
-
-   > irb.bat
-   irb(main):001:0>
-
-   At the prompt, enter
-
-   require "Ice"
-
-   If the interpreter responds with the value "true", the Ice
-   extension was loaded successfully. Enter "exit" to quit the
-   interpreter.
-
-
-Limitations
------------
-
-Ruby's lack of support for native threads makes it impractical for
-ZeroC to implement server-side functionality, therefore Ice for Ruby
-can only be used in client applications. If you have a need for this
-feature and wish to sponsor its development, please contact us at
-info@zeroc.com.
-
-Ice for Ruby currently does not support the thread-per-connection
-concurrency model on Windows.
-
-
-OpenSSL Compatibility Issue
----------------------------
-
-The Ruby installer includes versions of the OpenSSL DLLs that are not
-compatible with the ones supplied with Ice. If you intend to use SSL
-in your Ice for Ruby applications, you will need to remove or rename
-the following files in the Ruby installation directory:
-
-  libeay32.dll
-  ssleay32.dll
-
-If you used the default installation directory, these files are
-located in C:\ruby\bin.
-
-Also be aware that the Ruby installer inserts C:\ruby\bin at the
-beginning of the system PATH, therefore the DLLs listed above can also
-have an adverse impact on other Ice language mappings that use
-OpenSSL, such as C++ and Python.
-
-
-Running the demos
------------------
-
-The demos directory contains Ruby versions of the Ice sample programs.
-Note that only clients are provided, since Ice for Ruby does not
-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++.
-
-As an example, let's run the hello application in demo\Ice\hello using
-the C++ server. Assuming that your Ice installation is located in
-C:\Ice, and that you have already compiled the sample C++ programs,
-we begin by starting the server:
-
-  > cd \Ice\demo\Ice\hello
-  > server
-
-In a separate window, start the client:
-
-  > cd \IceRuby-3.1.1\demo\Ice\hello
-  > ruby Client.rb
-
-Some demo directories contain README files if additional requirements
-are necessary.