diff --git a/README.md b/README.md index 1d3cda40da5..6d2f694a7fc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ What is MAME? ============= -MAME stands for Multiple Arcade Machine Emulator. +MAME originally stood for Multiple Arcade Machine Emulator. MAME's purpose is to preserve decades of software history. As electronic technology continues to rush forward, MAME prevents this important "vintage" software from being lost and forgotten. This is achieved by documenting the hardware and how it functions. The source code to MAME serves as this documentation. The fact that the software is usable serves primarily to validate the accuracy of the documentation (how else can you prove that you have recreated the hardware faithfully?). Over time, MAME absorbed the sister-project MESS (Multi Emulator Super System), so MAME now documents a wide variety of (mostly vintage) computers, video game consoles and calculators, in addition to the arcade video games that were its initial focus. @@ -33,7 +33,9 @@ make SUBTARGET=mess for MESS build. -For Linux users we have provided you with all the [prerequisites](http://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=35138)). +For Linux users we have provided you with all the [prerequisites](http://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=35138). + +For recent versions of OSX you need to install [Xcode](https://developer.apple.com/xcode/) including command-line tools and [SDL 2.0](https://www.libsdl.org/download-2.0.php). For Windows users, we provide a ready-made [build environment](http://mamedev.org/tools/) based on MinGW-w64. @@ -71,7 +73,7 @@ All contributors need to either add a standard header for license info (on new f License ======= -The MAME project as a whole is distributed under the terms of the [GPL-2.0](http://opensource.org/licenses/GPL-2.0) license, since it contains code distributed under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new developers to distribute files under this license. +The MAME project as a whole is distributed under the terms of the [GNU General Public License, 2](http://opensource.org/licenses/GPL-2.0) (GPL-2.0), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause License](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new contributors to distribute files under this license. Please note that MAME is a registerd trademake of Nicola Salmoria, and permission is required to use the "MAME" name, logo or wordmark. @@ -83,7 +85,7 @@ Please note that MAME is a registerd trademake of Nicola Salmoria, and permissio
-MAME - Multiple Arcade Machine Emulator
+MAME
 Copyright (C) 1997-2016 Nicola Salmoria and the MAME team
 
 This program is free software; you can redistribute it and/or
diff --git a/docs/mame.txt b/docs/mame.txt
index 8aeb03a435e..1bb1b64ce1b 100644
--- a/docs/mame.txt
+++ b/docs/mame.txt
@@ -1,4 +1,4 @@
-MAME(tm), the Multiple Arcade Machine Emulator
+MAME(tm)
 Copyright (c) 1997-2013 by Nicola Salmoria and the MAME team
 MAME is a trademark owned by Nicola Salmoria
 
@@ -27,8 +27,9 @@ in the executable.
 II. Cost
 --------
 MAME is free. Its source code is free. The project as whole is under
-distributed under the GPL-2.0 license, but most of code (including core
-functionality) is available under the 3-clause BSD license.
+distributed under the GNU General Public License, version 2 (GPL-2.0),
+but most of code (including core functionality) is available under the
+BSD-3-~lause license.
 
 
 -------------------------