Updates for 3.7.3

1 files changed, 32 insertions, 41 deletions

diff --git a/cpp/README.md b/cpp/README.md
index bbe293bbea4..f980a5c5f75 100644
--- a/cpp/README.md
+++ b/cpp/README.md
@@ -10,10 +10,6 @@ unnecessary.
 * [C++ Build Requirements](#c-build-requirements)
   * [Operating Systems and Compilers](#operating-systems-and-compilers)
   * [Third-Party Libraries](#third-party-libraries)
-    * [AIX](#aix)
-    * [Linux](#linux)
-    * [macOS](#macos)
-    * [Windows](#windows)
 * [Building Ice for AIX](#building-ice-for-aix)
 * [Building Ice for Linux or macOS](#building-ice-for-linux-or-macos)
   * [Build configurations and platforms](#build-configurations-and-platforms)
@@ -61,10 +57,7 @@ bzip2 and bzip2-devel are included in the [IBM AIX Toolbox for Linux Application
 ZeroC provide RPM packages for expat, LDMB and mcpp. You can install these packages
 as shown below:
 ```
-wget https://zeroc.com/download/GPG-KEY-zeroc-release-B6391CB2CFBA643D
-sudo rpm --import GPG-KEY-zeroc-release-B6391CB2CFBA643D
-cd /opt/freeware/etc/yum/repos.d
-sudo wget https://zeroc.com/download/Ice/3.7/aix7.2/zeroc-ice3.7.repo
+sudo yum install https://zeroc.com/download/ice/3.7/aix7.2/ice-repo.3.7.aix7.2.noarch.rpm
 sudo yum install expat-devel lmdb-devel mcpp-devel
 ```
 
@@ -78,28 +71,26 @@ Bzip, Expat and OpenSSL are included with most Linux distributions.
 ZeroC supplies binary packages for LMDB and mcpp for several Linux distributions
 that do not include them. You can install these packages as shown below:
 
-##### Amazon Linux
+##### Amazon Linux 2
 ```
-wget https://zeroc.com/download/GPG-KEY-zeroc-release-B6391CB2CFBA643D
-sudo rpm --import GPG-KEY-zeroc-release-B6391CB2CFBA643D
-cd /etc/yum.repos.d
-sudo wget https://zeroc.com/download/Ice/3.7/amzn2/zeroc-ice3.7.repo
+sudo yum install https://zeroc.com/download/ice/3.7/amzn2/ice-repo.3.7.amzn2.noarch.rpm
+sudo yum install lmdb-devel mcpp-devel
+```
+##### RHEL 8
+```
+sudo yum install https://zeroc.com/download/ice/3.7/el8/ice-repo.3.7.el8.noarch.rpm
 sudo yum install lmdb-devel mcpp-devel
 ```
 ##### RHEL 7
 ```
-wget https://zeroc.com/download/GPG-KEY-zeroc-release-B6391CB2CFBA643D
-sudo rpm --import GPG-KEY-zeroc-release-B6391CB2CFBA643D
-cd /etc/yum.repos.d
-sudo wget https://zeroc.com/download/Ice/3.7/el7/zeroc-ice3.7.repo
+sudo yum install https://zeroc.com/download/ice/3.7/el7/ice-repo.3.7.el7.noarch.rpm
 sudo yum install lmdb-devel mcpp-devel
 ```
 ##### SLES 12
 ```
-wget https://zeroc.com/download/GPG-KEY-zeroc-release-B6391CB2CFBA643D
-sudo rpm --import GPG-KEY-zeroc-release-B6391CB2CFBA643D
-sudo wget https://zeroc.com/download/Ice/3.7/sles12/zeroc-ice3.7.repo
-sudo zypper ar -f --repo zeroc-ice3.7.repo
+wget https://zeroc.com/download/ice/3.7/suse/zeroc-ice3.7.repo
+sudo zypper addrepo zeroc-ice3.7.repo
+sudo sudo rpm --import https://zeroc.com/download/GPG-KEY-zeroc-release-B6391CB2CFBA643D
 sudo zypper install mcpp-devel
 ```
 
@@ -432,32 +423,14 @@ the Slice compilers.
 
 ## Running the Test Suite
 
+### AIX, Linux, macOS or Windows
+
 Python is required to run the test suite. Additionally, the Glacier2 tests
 require the Python module `passlib`, which you can install with the command:
 ```
 pip install passlib
 ```
 
-### iOS
-
-The test scripts require Ice for Python. You can build Ice for Python from
-the [python](../python) folder of this source distribution, or install the
-Python module `zeroc-ice`,  using the following command:
-```
-pip install zeroc-ice
-```
-
-In order to run the test suite on `iphoneos`, you need to build the
-C++98 Test Controller app or C++11 Test Controller app from Xcode:
- - Build the test suite with `make` for the `xcodedsk` or `cpp11-xcodesdk`
- configuration, and the `iphoneos` platform.
- - Open the C++ Test Controller project located in the
- `cpp/test/ios/controller` directory.
- - Build the `C++98 Test Controller` or the `C++11 Test Controller` app (it must
- match the configuration(s) selected when building the test suite).
-
-### AIX, Linux, macOS or Windows
-
 After a successful source build, you can run the tests as follows:
 ```
 python allTests.py # default config (C++98) and platform
@@ -483,6 +456,24 @@ python allTests.py --config Cpp11-Release
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
+### iOS
+
+The test scripts require Ice for Python. You can build Ice for Python from
+the [python](../python) folder of this source distribution, or install the
+Python module `zeroc-ice`,  using the following command:
+```
+pip install zeroc-ice
+```
+
+In order to run the test suite on `iphoneos`, you need to build the
+C++98 Test Controller app or C++11 Test Controller app from Xcode:
+ - Build the test suite with `make` for the `xcodedsk` or `cpp11-xcodesdk`
+ configuration, and the `iphoneos` platform.
+ - Open the C++ Test Controller project located in the
+ `cpp/test/ios/controller` directory.
+ - Build the `C++98 Test Controller` or the `C++11 Test Controller` app (it must
+ match the configuration(s) selected when building the test suite).
+
 #### iOS Simulator
  - C++98 controller
 ```