From 310df1a8dee8373720eb560c3903d6672055f987 Mon Sep 17 00:00:00 2001
From: Karol Stasiak <karol.m.stasiak@gmail.com>
Date: Wed, 19 Dec 2018 22:21:51 +0100
Subject: [PATCH] It's Amstrad not Armstrad

---
 CHANGELOG.md                      | 2 +-
 README.md                         | 2 +-
 docs/api/cpc-programming-guide.md | 2 +-
 docs/api/target-platforms.md      | 6 +++---
 include/cpc.mfk                   | 4 ++--
 include/cpc464.ini                | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 617ca832..37be1aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 * Almost complete support for the Zilog Z80, Intel 8080 and Sharp LR35902 microprocessors.
 
-* A very incomplete support for NEC PC-88, ZX Spectrum, CP/M and Armstrad CPC.
+* A very incomplete support for NEC PC-88, ZX Spectrum, CP/M and Amstrad CPC.
 
 * Unified the syntax of commandline switches.
 
diff --git a/README.md b/README.md
index 26fe16a7..8c4fbd50 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ For binary releases, see: https://github.com/KarolS/millfork/releases
     
     * NEC PC-88
     
-    * Armstrad CPC
+    * Amstrad CPC
     
     * CP/M
     
diff --git a/docs/api/cpc-programming-guide.md b/docs/api/cpc-programming-guide.md
index da164ca1..6ceafb95 100644
--- a/docs/api/cpc-programming-guide.md
+++ b/docs/api/cpc-programming-guide.md
@@ -1,6 +1,6 @@
 [< back to index](../index.md)
 
-### A note about Armstrad CPC
+### A note about Amstrad CPC
 
 The compiler output is a raw machine code file, which then has to be put on a disk. 
 You can do it using [CPCDiskXP](http://www.cpcwiki.eu/index.php/CPCDiskXP), 
diff --git a/docs/api/target-platforms.md b/docs/api/target-platforms.md
index 21017f96..4e786657 100644
--- a/docs/api/target-platforms.md
+++ b/docs/api/target-platforms.md
@@ -3,7 +3,7 @@
 # Target platforms
 
 Currently, Millfork supports creating disk- or tape-based programs
-for Commodore, Apple, BBC and Atari 8-bit computers, NEC PC-88, ZX Spectrum 48k, Armstrad CPC, CP/M,
+for Commodore, Apple, BBC and Atari 8-bit computers, NEC PC-88, ZX Spectrum 48k, Amstrad CPC, CP/M,
 and cartridge-based programs for Commodore 64, VIC-20, Famicom/NES and Atari 2600,
 but it may be expanded to support other 6502-based and Z80-based platforms in the future.
 
@@ -67,9 +67,9 @@ Read [the Apple 2 programming guide](./apple2-programming-guide.md) for more inf
 * `pc88` – NEC PC-88.
 The compiler emits bootable disk images.
 
-* `cpc464` – Armstrad CPC 464.
+* `cpc464` – Amstrad CPC 464.
 The compiler only emits raw binaries, not disk images.
-Read [the Armstrad CPC programming guide](./cpc-programming-guide.md) for more info.
+Read [the Amstrad CPC programming guide](./cpc-programming-guide.md) for more info.
 
 * `zxspectrum` – Sinclair ZX Spectrum 48k.
 The compiler emits tape images.
diff --git a/include/cpc.mfk b/include/cpc.mfk
index 2be9e8d7..65c86791 100644
--- a/include/cpc.mfk
+++ b/include/cpc.mfk
@@ -1,6 +1,6 @@
 
-#if not(ARMSTRAD_CPC)
-#warn cpc module should be only used on Armstrad CPC-compatible targets
+#if not(AMSTRAD_CPC)
+#warn cpc module should be only used on Amstrad CPC-compatible targets
 #endif
 
 asm void putchar(byte a) @$BB5A extern
diff --git a/include/cpc464.ini b/include/cpc464.ini
index 3670d991..f1dcc876 100644
--- a/include/cpc464.ini
+++ b/include/cpc464.ini
@@ -1,4 +1,4 @@
-;a single-load Armstrad CPC 464 program
+;a single-load Amstrad CPC 464 program
 [compilation]
 arch=z80
 encoding=ascii
@@ -12,7 +12,7 @@ segment_default_datastart=after_code
 segment_default_end=$b0ff
 
 [define]
-ARMSTRAD_CPC=1
+AMSTRAD_CPC=1
 WIDESCREEN=1
 KEYBOARD=1
 ; TODO: ?