From 478f67e48e0a49968c0606dab92e15f8e8501c84 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Fri, 11 Mar 2016 13:09:46 -0800
Subject: [PATCH] Cleaned up Windows 3.x configs

---
 .../5170/ega/1152kb/rev3/debugger/machine.md  |  2 +-
 .../5170/ega/1152kb/rev3/debugger/machine.xml |  4 ++--
 .../{win300/README.md => rev3/machine.md}     |  7 ++-----
 .../ega/1152kb/{win300 => rev3}/machine.xml   |  4 ++--
 .../5170/ega/1152kb/win300/debugger/README.md | 14 -------------
 .../ega/1152kb/win300/debugger/machine.xml    | 20 -------------------
 .../5170/ega/2048kb/rev3/debugger/machine.md  |  2 +-
 .../machine/5170/ega/2048kb/rev3/machine.md   |  2 +-
 .../{win310/README.md => debugger/machine.md} |  8 +++-----
 .../2048kb/{win310 => }/debugger/machine.xml  |  4 ++--
 .../{win310/debugger/README.md => machine.md} |  8 ++------
 .../5170/vga/2048kb/{win310 => }/machine.xml  |  4 ++--
 devices/pc/machine/README.md                  | 11 +++++-----
 disks/pc/compiled/library.xml                 | 18 ++++++++---------
 disks/pc/library.xml                          |  1 +
 disks/pc/windows/3.00/README.md               |  8 +++++---
 disks/pc/windows/3.10/README.md               |  4 +++-
 17 files changed, 41 insertions(+), 80 deletions(-)
 rename devices/pc/machine/5170/ega/1152kb/{win300/README.md => rev3/machine.md} (58%)
 rename devices/pc/machine/5170/ega/1152kb/{win300 => rev3}/machine.xml (82%)
 delete mode 100644 devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md
 delete mode 100644 devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
 rename devices/pc/machine/5170/vga/2048kb/{win310/README.md => debugger/machine.md} (59%)
 rename devices/pc/machine/5170/vga/2048kb/{win310 => }/debugger/machine.xml (80%)
 rename devices/pc/machine/5170/vga/2048kb/{win310/debugger/README.md => machine.md} (51%)
 rename devices/pc/machine/5170/vga/2048kb/{win310 => }/machine.xml (82%)

diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
index b885a60a9..e6607dce6 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk"
+title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger"
 permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/
 machines:
   - type: pc
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 7ca7f66ac..4d68d840d 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -8,11 +8,11 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/README.md b/devices/pc/machine/5170/ega/1152kb/rev3/machine.md
similarity index 58%
rename from devices/pc/machine/5170/ega/1152kb/win300/README.md
rename to devices/pc/machine/5170/ega/1152kb/rev3/machine.md
index 997f8cd15..819b43680 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/README.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.md
@@ -1,13 +1,10 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display running Windows 3.00"
-permalink: /devices/pc/machine/5170/ega/1152kb/win300/
+title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display"
+permalink: /devices/pc/machine/5170/ega/1152kb/rev3/
 machines:
   - type: pc
     id: ibm5170
 ---
 
-IBM PC AT running Windows 3.00
----
-
 {% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
similarity index 82%
rename from devices/pc/machine/5170/ega/1152kb/win300/machine.xml
rename to devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
index 20ffb4365..42bcf386d 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
@@ -7,14 +7,14 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md b/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md
deleted file mode 100644
index 02ec17718..000000000
--- a/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: page
-title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger running Windows 3.00"
-permalink: /devices/pc/machine/5170/ega/1152kb/win300/debugger/
-machines:
-  - type: pc
-    id: ibm5170
-    debugger: true
----
-
-IBM PC AT running Windows 3.00
----
-
-{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
deleted file mode 100644
index f6c3d1bbc..000000000
--- a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/machine.xsl"?>
-<machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name pos="center">IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk</name>
-	<computer id="at-ega-1152k-rev3" name="IBM PC AT" buswidth="24"/>
-	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>
-	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
-	<debugger id="debugger"/>
-	<panel ref="/devices/pc/panel/wide.xml"/>
-	<cpu id="cpu286" model="80286" cycles="8000000"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
-	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
-	<serial id="com1" adapter="1"/>
-	<serial id="com2" adapter="2" binding="print"/>
-	<mouse serial="com1"/>
-</machine>
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md
index 952000ebc..8f9502096 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 2Mb) with EGA Display and 20Mb Hard Disk"
+title: "IBM PC AT (Model 5170, 2Mb20Mb Hard Disk) with EGA Display and Debugger"
 permalink: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/
 machines:
   - type: pc
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/machine.md b/devices/pc/machine/5170/ega/2048kb/rev3/machine.md
index 492e52971..d7fb6bf54 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/machine.md
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/machine.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 2Mb) with EGA Display and 20Mb Hard Disk"
+title: "IBM PC AT (Model 5170, 2Mb, 20Mb Hard Disk) with EGA Display"
 permalink: /devices/pc/machine/5170/ega/2048kb/rev3/
 machines:
   - type: pc
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/README.md b/devices/pc/machine/5170/vga/2048kb/debugger/machine.md
similarity index 59%
rename from devices/pc/machine/5170/vga/2048kb/win310/README.md
rename to devices/pc/machine/5170/vga/2048kb/debugger/machine.md
index c233cd251..8d65249a6 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/README.md
+++ b/devices/pc/machine/5170/vga/2048kb/debugger/machine.md
@@ -1,13 +1,11 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display running Windows 3.10"
-permalink: /devices/pc/machine/5170/vga/2048kb/win310/
+title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display and Debugger"
+permalink: /devices/pc/machine/5170/vga/2048kb/debugger/
 machines:
   - type: pc
     id: ibm5170
----
-
-IBM PC AT running Windows 3.10
+    debugger: true
 ---
 
 {% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
similarity index 80%
rename from devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
rename to devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
index 3e154fb21..021a24537 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
@@ -7,12 +7,12 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md b/devices/pc/machine/5170/vga/2048kb/machine.md
similarity index 51%
rename from devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md
rename to devices/pc/machine/5170/vga/2048kb/machine.md
index dad0421c9..9cb572e10 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md
+++ b/devices/pc/machine/5170/vga/2048kb/machine.md
@@ -1,14 +1,10 @@
 ---
 layout: page
-title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display and Debugger running Windows 3.10"
-permalink: /devices/pc/machine/5170/vga/2048kb/win310/debugger/
+title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display"
+permalink: /devices/pc/machine/5170/vga/2048kb/
 machines:
   - type: pc
     id: ibm5170
-    debugger: true
----
-
-IBM PC AT running Windows 3.10
 ---
 
 {% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml b/devices/pc/machine/5170/vga/2048kb/machine.xml
similarity index 82%
rename from devices/pc/machine/5170/vga/2048kb/win310/machine.xml
rename to devices/pc/machine/5170/vga/2048kb/machine.xml
index 1d65c22ba..49e263c28 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/machine.xml
@@ -7,14 +7,14 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md
index 97a0aeae1..17d954c8b 100644
--- a/devices/pc/machine/README.md
+++ b/devices/pc/machine/README.md
@@ -101,10 +101,9 @@ Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
 ### Model 5170 Machine Configurations
 
 * [IBM PC AT (6Mhz, 640Kb) with EGA Display and Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
-* [IBM PC AT (6Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
-* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
-* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
-* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
+* [IBM PC AT (6Mhz, 1Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
+* [IBM PC AT (8Mhz, 1Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/)
 * [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display and Debugger running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/debugger/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/2048kb/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display and Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)
diff --git a/disks/pc/compiled/library.xml b/disks/pc/compiled/library.xml
index 03d308029..33a2753b7 100644
--- a/disks/pc/compiled/library.xml
+++ b/disks/pc/compiled/library.xml
@@ -194,15 +194,15 @@
 		<disk path="/disks/pc/windows/2.0x/WIN203-386-DISK3.json">Windows/386 2.03 (FONTS)</disk>
 		<disk path="/disks/pc/windows/2.0x/WIN203-386-DISK4.json">Windows/386 2.03 (PROGRAM)</disk>
 		<disk path="/disks/pc/windows/2.0x/WIN203-386-DISK5.json">Windows/386 2.03 (UTILITY 2)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK1-SETUP.json">Windows 2.03 (SETUP)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK2-BUILD.json">Windows 2.03 (BUILD)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK3-DISPLAYS.json">Windows 2.03 (DISPLAYS)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK4-UTILS1.json">Windows 2.03 (UTILS 1)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK5-UTILS2.json">Windows 2.03 (UTILS 2)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK6-FONTS1.json">Windows 2.03 (FONTS 1)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK7-FONTS2.json">Windows 2.03 (FONTS 2)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK8-APPS.json">Windows 2.03 (APPS)</disk>
-		<disk path="/disks/pc/windows/2.0x/WIN203-DISK9-PROGRAM.json">Windows 2.03 (PROGRAM)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK1-SETUP.json">Windows 2.03 (SETUP)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK2-BUILD.json">Windows 2.03 (BUILD)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK3-DISPLAYS.json">Windows 2.03 (DISPLAYS)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK4-UTILS1.json">Windows 2.03 (UTILS 1)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK5-UTILS2.json">Windows 2.03 (UTILS 2)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK6-FONTS1.json">Windows 2.03 (FONTS 1)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK7-FONTS2.json">Windows 2.03 (FONTS 2)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK8-APPS.json">Windows 2.03 (APPS)</disk>
+		<disk path="/disks/pc/windows/2.03/WIN203-DISK9-PROGRAM.json">Windows 2.03 (PROGRAM)</disk>
 		<disk path="/disks/pc/windows/2.10/WIN210-386-DISK1.json">Windows/386 2.10 (SETUP)</disk>
 		<disk path="/disks/pc/windows/2.10/WIN210-386-DISK2.json">Windows/386 2.10 (UTILS 1)</disk>
 		<disk path="/disks/pc/windows/2.10/WIN210-386-DISK3.json">Windows/386 2.10 (UTILS 2)</disk>
diff --git a/disks/pc/library.xml b/disks/pc/library.xml
index 8f63a811a..73f7eb18a 100644
--- a/disks/pc/library.xml
+++ b/disks/pc/library.xml
@@ -47,6 +47,7 @@
 		<manifest ref="/disks/pc/windows/1.03b/manifest.xml"/>
 		<manifest ref="/disks/pc/windows/1.04/manifest.xml"/>
 		<manifest ref="/disks/pc/windows/2.0x/manifest.xml"/>
+		<manifest ref="/disks/pc/windows/2.03/manifest.xml"/>
 		<manifest ref="/disks/pc/windows/2.10/manifest.xml"/>
 		<manifest ref="/disks/pc/windows/2.11/manifest.xml"/>
 		<manifest ref="/disks/pc/windows/3.00/manifest.xml"/>
diff --git a/disks/pc/windows/3.00/README.md b/disks/pc/windows/3.00/README.md
index 716ac1680..f1e8e580e 100644
--- a/disks/pc/windows/3.00/README.md
+++ b/disks/pc/windows/3.00/README.md
@@ -4,8 +4,10 @@ title: Microsoft Windows 3.00
 permalink: /disks/pc/windows/3.00/
 machines:
   - type: pc
-    id: ibm5170-pcdos320
-    config: /devices/pc/machine/5170/ega/1152kb/win300/machine.xml
+    id: ibm5170-win300
+    config: /devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
+    drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'
+    autoMount: ''
 ---
 
 Microsoft Windows 3.00
@@ -13,7 +15,7 @@ Microsoft Windows 3.00
 
 The PCjs machine below is running Microsoft Windows 3.00 on an IBM PC AT with PC-DOS 3.20.
 
-{% include machine.html id="ibm5170-pcdos320" %}
+{% include machine.html id="ibm5170-win300" %}
 
 Directory listings of the five 1.2Mb distribution diskettes are provided below.
 
diff --git a/disks/pc/windows/3.10/README.md b/disks/pc/windows/3.10/README.md
index e47e9d4eb..a3bdbba1f 100644
--- a/disks/pc/windows/3.10/README.md
+++ b/disks/pc/windows/3.10/README.md
@@ -5,7 +5,9 @@ permalink: /disks/pc/windows/3.10/
 machines:
   - type: pc
     id: ibm5170-pcdos330
-    config: /devices/pc/machine/5170/vga/2048kb/win310/machine.xml
+    config: /devices/pc/machine/5170/vga/2048kb/machine.xml
+    drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'
+    autoMount: ''
 ---
 
 Microsoft Windows 3.10