5 files changed, 53 insertions, 32 deletions
diff --git a/cpp/README b/cpp/README
index 33d653706fb..e3aed92746c 100644
--- a/cpp/README
+++ b/cpp/README
@@ -1,2 +1,4 @@
 For installation instructions, please refer to the INSTALL.* file for
 your plaftorm.
+
+KNOWN_ISSUES.txt lists any known issues for this distribution.
diff --git a/cpp/install/vc71/doc/KNOWN_ISSUES.txt b/cpp/install/vc71/doc/KNOWN_ISSUES.txt
new file mode 100644
index 00000000000..a63c9539f43
--- /dev/null
+++ b/cpp/install/vc71/doc/KNOWN_ISSUES.txt
@@ -0,0 +1,42 @@
+Please let us know about any bugs, comments, or feeback in
+the Ice
+forum at http://www.zeroc.com.
+
+
+
+
+
+Binary compatibility on Mono
+
+------------------------------
+
+
+
+Mono currently has issues with forwarding requests to load a particular
+
+version of the runtime to a different version. Until this is resolved
+
+in Mono, you cannot run applications compiled with 2.1.0 against the
+
+2.1.1 runtime.
+
+
+
+
+
+Mono on Mac OS X
+
+----------------
+
+
+The Ice for C# slicing/objects test currently fails with Mono on Mac OS X.
+
+We believe that this is caused by a bug in the Mono runtime and we are
+
+working with the Mono developers to resolve this.
+
+
+
+Ice for Visual Basic uses the same runtime as Ice for C# and is therefore
+
+affected by this problem as well.
diff --git a/cpp/install/vc71/doc/README.txt b/cpp/install/vc71/doc/README.txt
index 88500f836eb..eb9a30d6ea8 100755
--- a/cpp/install/vc71/doc/README.txt
+++ b/cpp/install/vc71/doc/README.txt
@@ -21,38 +21,13 @@ instructions for building and running the sample programs.
 See doc/README.html for information on the documentation included with
 this distribution.
 
-Binary compatibility
---------------------
 
-Patch releases of Ice are binary compatible. For example, version 2.1.1
-is compatible with 2.1.0, so you can run applications compiled with
-2.1.0 with the 2.1.1 runtime without having to recompile.
+Known issues
+------------
 
-For C++ and Java, simply uninstall the previous version of Ice and
-install the new one. This replaces the dynamic libraries with the
-newer version.
+For a list of known bugs (for all platforms and languages), please see
+the file KNOWN_ISSUES.txt.
 
-For .NET, if you want to run already deployed applications with the
-newer Ice runtime, do the following:
-
-- Install the newer version of Ice.
-
-- Open a command window and change directory to the root of the icecs
-  source installation.
-
-- Run the bincompat.bat file installed there. (You need a machine that
-  has Visual Studio installed and has an installed source tree of Ice for C#.)
-
-  The batch file installs five DLLs into the GAC:
-
-  policy.2.1.icecs.dll
-  policy.2.1.glacier2cs.dll
-  policy.2.1.icepackcs.dll
-  policy.2.1.icepatch2cs.dll
-  policy.2.1.icestormcs.dll
-
-  These DLLs cause requests for a 2.1.0 runtime by an application to
-  load the 2.1.1 runtime instead.
 
 Setting up Visual Studio .NET
 -----------------------------
diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index 9e1870cebc5..3fa254ace78 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -232,9 +232,6 @@ os.system("tar cvf " + icever + "-bin-" + platform + ".tar " + icever)
 os.system("gzip -9 " + icever + "-bin-" + platform + ".tar")
 os.system("zip -9ry " + icever + "-bin-" + platform + ".zip " + icever)
 
-#
-# Copy files (README, etc.).
-#
 
 #
 # Done.
diff --git a/cpp/makedist.py b/cpp/makedist.py
index d449de3b8c4..d9b6c78223c 100755
--- a/cpp/makedist.py
+++ b/cpp/makedist.py
@@ -232,6 +232,11 @@ else:
 os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag + " ice")
 
 #
+# Copy KNOWN_ISSUES.txt.
+#
+shutil.copyfile(os.path.join("ice", "install", "vc71", "doc", "KNOWN_ISSUES.txt"), os.path.join("ice", "KNOWN_ISSUES.txt"))
+
+#
 # Remove files.
 #
 print "Removing unnecessary files..."