[m-rev.] diff: more documentation updates

Julien Fischer jfischer at opturion.com
Mon Apr 29 16:32:50 AEST 2013


More documentation updates.

.README.in:
 	The contents of java/runtime come under the LGPL as well.

 	Minor rewording.

README.MS-Windows:
 	We don't need to list every version of Windows we no longer
 	actively support.  (If the version is not on the list of those
 	we *do* support, then we don't support it.)

README.MacOS:
 	We will never support compiling Mercury with llvm-gcc on
 	Mac OS X 10.5 and 10.6.

Julien.

diff --git a/.README.in b/.README.in
index 2b11331..2d02fab 100644
--- a/.README.in
+++ b/.README.in
@@ -8,9 +8,9 @@ Mercury compiler, version @VERSION at .
  	General Public License.  See the file COPYING for copying permission.

  	The Mercury libraries and runtime (the files in the library, trace,
-	browser, ssdb, mdbcomp and runtime subdirectories) are distributed
-	under the terms of the GNU Library General Public License.  See the
-	file COPYING.LIB for copying permissions for those files.
+	browser, ssdb, mdbcomp, runtime and java/runtime subdirectories) are
+	distributed under the terms of the GNU Library General Public License.
+	See the file COPYING.LIB for copying permissions for those files.

  	If those licensing arrangements are not satisfactory, please
  	contact us.  We are willing to offer alternative arrangements,
@@ -60,9 +60,9 @@ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
  EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.  See the file COPYING.

  See the file INSTALL for installation instructions.
-But in some cases, additional steps may be needed for particular
-operating systems or particular architectures, so first read the
-README file for your particular platform, if there is one:
+In some cases, additional steps may be needed for particular operating systems
+or particular architectures, so first read the README file for your particular
+platform, if there is one:

  	README.AIX		RS/6000 systems running AIX
  	README.FreeBSD		The FreeBSD version of BSD Unix on Intel x86
diff --git a/README.MS-Windows b/README.MS-Windows
index b45e471..4ccf5eb 100644
--- a/README.MS-Windows
+++ b/README.MS-Windows
@@ -13,8 +13,7 @@ Mercury has been tested with the following versions of Windows:
  It should also work with Windows XP SP2 and Windows Vista but we have
  not tested it with those.

-In the past Mercury worked with Windows, 95, 98, ME, 2000, and NT but we no
-longer actively maintain support for those versions.
+We no longer actively maintain support for older versions of Windows.


  ---------------------------
diff --git a/README.MacOS b/README.MacOS
index 526b3ad..ca3b70e 100644
--- a/README.MacOS
+++ b/README.MacOS
@@ -64,7 +64,7 @@ Mmake.params at the top-level of the source tree:

      MCFLAGS = --cross-compiling

-Mercury cannot currently be compiled with llvm-gcc on Mac OS X.
+Mercury cannot be compiled with llvm-gcc on Mac OS X.

  If, after installing Mercury, you encounter errors about missing .mih files,
  and you have fink installed, then try removing the fink components from your



More information about the reviews mailing list