summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2017-11-05 01:50:16 +0100
committer hap <happppp@users.noreply.github.com>2017-11-05 01:50:16 +0100
commit7d7c2c5507da242b79698ed80894e2cac8f440ab (patch)
tree74b01fe0f7a78722d194cc05ce52cec53a98cabe
parent036541f02c9b5a6e8b5f977379a832c6c6e63228 (diff)
make emulator description generic (nw)
-rw-r--r--README.md2
-rw-r--r--docs/man/mame.64
-rw-r--r--docs/man/mess.64
-rw-r--r--docs/source/conf.py2
-rw-r--r--docs/source/whatis.rst4
-rw-r--r--doxygen/README.md2
-rw-r--r--doxygen/doxygen.config2
-rw-r--r--scripts/build/verinfo.py4
-rw-r--r--scripts/resources/windows/mame/mame.man2
-rw-r--r--scripts/resources/windows/mess/mess.man2
10 files changed, 14 insertions, 14 deletions
diff --git a/README.md b/README.md
index 1da46c96047..282a6ac8da0 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Static analysis status for entire build (except for third-party parts of project
What is MAME?
=============
-MAME originally stood for Multiple Arcade Machine Emulator.
+MAME is a multiple 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.
diff --git a/docs/man/mame.6 b/docs/man/mame.6
index da51b1f2c41..e78794aa5a2 100644
--- a/docs/man/mame.6
+++ b/docs/man/mame.6
@@ -13,12 +13,12 @@
.\" and updated by Andrew Burton <burtona@gol.com>, July 2003
.\"
.\"
-.TH MAME 6 2016-07-21 0.176 "MAME \- The Multiple Arcade Machine Emulator"
+.TH MAME 6 2016-07-21 0.176 "MAME \- Multiple Emulator"
.\"
.\"
.\" NAME chapter
.SH NAME
-MAME \- The Multiple Arcade Machine Emulator
+MAME \- Multiple Emulator
.\"
.\"
.\" SYNOPSIS chapter
diff --git a/docs/man/mess.6 b/docs/man/mess.6
index d9fb0b310e3..ec95595ad1e 100644
--- a/docs/man/mess.6
+++ b/docs/man/mess.6
@@ -16,12 +16,12 @@
.\" http://www.mess.org/
.\"
.\"
-.TH MESS 6 2015-05-20 0.162 "The Multiple Emulator Super System (MESS)"
+.TH MESS 6 2015-05-20 0.162 "MESS \- Multiple Emulator"
.\"
.\"
.\" NAME chapter
.SH NAME
-MESS \- The Multiple Emulator Super System
+MESS \- Multiple Emulator
.\"
.\"
.\" SYNOPSIS chapter
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5270d41f479..58a258ca67a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -244,7 +244,7 @@ man_pages = [
# dir menu entry, description, category)
texinfo_documents = [
('index', 'MAME', u'MAME Documentation',
- u'MAMEdev Team', 'MAME', 'Multiple Arcade Machine Emulator',
+ u'MAMEdev Team', 'MAME', 'Multiple Emulator',
'Emulation'),
]
diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst
index 98897104855..d3c839f2f54 100644
--- a/docs/source/whatis.rst
+++ b/docs/source/whatis.rst
@@ -1,12 +1,12 @@
What is MAME
============
-MAME originally stood for Multiple Arcade Machine Emulator.
+MAME is a multiple 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.
|
-| **MAME(R), the Multiple Arcade Machine Emulator**
+| **MAME(R)**
| **Copyright (c) 1997-2017 by Nicola Salmoria and the MAME team**
| **MAME is a trademark owned by Nicola Salmoria**
|
diff --git a/doxygen/README.md b/doxygen/README.md
index a6eb47da12d..7e8913ee854 100644
--- a/doxygen/README.md
+++ b/doxygen/README.md
@@ -1,7 +1,7 @@
What is MAME?
=============
-MAME stands for Multiple Arcade Machine Emulator.
+MAME is a multiple emulator.
MAME's purpose is to preserve decades of video-game history. As gaming technology continues to rush forward, MAME prevents these important "vintage" games 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 games are playable serves primarily to validate the accuracy of the documentation (how else can you prove that you have recreated the hardware faithfully?).
diff --git a/doxygen/doxygen.config b/doxygen/doxygen.config
index 9cdc7792934..8ccb5bb6854 100644
--- a/doxygen/doxygen.config
+++ b/doxygen/doxygen.config
@@ -44,7 +44,7 @@ PROJECT_NUMBER =
# for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "Multiple Arcade Machine Emulator"
+PROJECT_BRIEF = "Multiple Emulator"
# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
# the documentation. The maximum height of the logo should not exceed 55 pixels
diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py
index c294df827aa..31e59434ad4 100644
--- a/scripts/build/verinfo.py
+++ b/scripts/build/verinfo.py
@@ -98,9 +98,9 @@ if build == "mess":
else:
# MAME
author = "Nicola Salmoria and the MAME Team"
- comments = "Multiple Arcade Machine Emulator"
+ comments = "Multiple Emulator"
company_name = "MAME Team"
- file_description = "Multiple Arcade Machine Emulator"
+ file_description = "Multiple Emulator"
internal_name = "MAME" if build == "mame" else build
original_filename = "MAME" if build == "mame" else build
product_name = "MAME" if build == "mame" else build
diff --git a/scripts/resources/windows/mame/mame.man b/scripts/resources/windows/mame/mame.man
index e08eba181cb..82fd61639b7 100644
--- a/scripts/resources/windows/mame/mame.man
+++ b/scripts/resources/windows/mame/mame.man
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MAME" type="win32" />
- <description>Multiple Arcade Machine Emulator</description>
+ <description>Multiple Emulator</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
diff --git a/scripts/resources/windows/mess/mess.man b/scripts/resources/windows/mess/mess.man
index 67ba3aced37..48847330e49 100644
--- a/scripts/resources/windows/mess/mess.man
+++ b/scripts/resources/windows/mess/mess.man
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MESS" type="win32" />
- <description>Multi Emulator Super System</description>
+ <description>Multiple Emulator</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>