Permalink
Browse files

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.
  • Loading branch information...
1 parent a7ecbb6 commit adccf1f520af547c36c5910f70db44c5a2b5bf1b @juliensf juliensf committed Apr 29, 2013
Showing with 8 additions and 9 deletions.
  1. +6 −6 .README.in
  2. +1 −2 README.MS-Windows
  3. +1 −1 README.MacOS
View
@@ -8,9 +8,9 @@ Mercury compiler, version @VERSION@.
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
View
@@ -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.
---------------------------
View
@@ -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

0 comments on commit adccf1f

Please sign in to comment.