It's Amstrad not Armstrad

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.
 

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
     

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), 

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.

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

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: ?