summaryrefslogtreecommitdiffstatshomepage
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md35
1 files changed, 20 insertions, 15 deletions
diff --git a/README.md b/README.md
index 45a5bfd182e..56646f7ffff 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ make vs2017 MSBUILD=1
Where can I find out more?
=============
-* [Official MAME Development Team Site](http://mamedev.org/) (includes binary downloads for MAME and MESS, wiki, forums, and more)
+* [Official MAME Development Team Site](http://mamedev.org/) (includes binary downloads, wiki, forums, and more)
* [Official MESS Wiki](http://mess.redump.net/)
* [MAME Testers](http://mametesters.org/) (official bug tracker for MAME and MESS)
@@ -85,9 +85,17 @@ 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 [GNU General Public License, version 2](http://opensource.org/licenses/GPL-2.0) or later (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 registered trademark of Gregory Ember, and permission is required to use the "MAME" name, logo, or wordmark.
+The MAME project as a whole is made available under the terms of the
+[GNU General Public License, version 2](http://opensource.org/licenses/GPL-2.0)
+or later (GPL-2.0+), since it contains code made available under multiple
+GPL-compatible licenses. A great majority of the source files (over 90%
+including core files) are made available under the terms of the
+[3-clause BSD License](http://opensource.org/licenses/BSD-3-Clause), and we
+would encourage new contributors to make their contributions available under the
+terms of this license.
+
+Please note that MAME is a registered trademark of Gregory Ember, and permission
+is required to use the "MAME" name, logo, or wordmark.
<a href="http://opensource.org/licenses/GPL-2.0" target="_blank">
<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
@@ -95,16 +103,13 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission
Copyright (C) 1997-2020 MAMEDev and contributors
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2, as provided in
+ docs/legal/GPL-2.0.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Please see COPYING for more details.