diff --git a/README.md b/README.md
index 699e8e0b6..3a259f6a2 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,9 @@ Demos
Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows, OS/2, and other assorted software.
-
+
-
+
diff --git a/apps/README.md b/apps/README.md
index 102fe60eb..0fbed89ca 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -1,20 +1,22 @@
---
layout: page
title: Software Archives
+menu_title: Apps
+menu_order: 2
permalink: /apps/
---
-Software Archives
+Application Demos
-----------------
-PCjs includes archives of selected software:
+PCjs provides selected demos of archived software:
-* [IBM PC Application Demos](pcx86/)
+* [IBM PC Applications](pcx86/)
* [Challenger 1P Applications](c1p/)
* [DEC PDP-10 Tapes and Diagnostics](pdp10/)
* [DEC PDP-11 Tapes and Diagnostics](pdp11/)
-You can also browse our software archives by disk:
+You can also browse our collection of archived disks:
* [IBM PC Disk Library](/disks/pcx86/)
* [Challenger 1P Disk Library](/disks/c1p/)
@@ -60,13 +62,16 @@ described by <file> entries in its [manifest](/apps/pcx86/1981/visicalc/ma
ApplicationProductivitySoftware Arts
- December 16, 1981
+ Dan Bricklin
+ Bob Frankston
+ December 16, 1981
+ Lotus Development
-
- VC.COM
- README.md
- VisiCalc License
-
+
+ VisiCalc (1981)
+ VC.COM
+ VisiCalc License
+
```
@@ -102,7 +107,7 @@ have saved that JSON-encoded image as static file on the server, and then added
```xml
-
+
...
diff --git a/apps/pcx86/1981/README.md b/apps/pcx86/1981/README.md
index b4a61df28..96f0e4fc7 100644
--- a/apps/pcx86/1981/README.md
+++ b/apps/pcx86/1981/README.md
@@ -5,6 +5,7 @@ permalink: /apps/pcx86/1981/
---
IBM PC Applications (1981)
----
+--------------------------
+* [DONKEY.BAS (1981)](donkey/)
* [VisiCalc (1981)](visicalc/)
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/README.md b/apps/pcx86/1981/donkey/README.md
similarity index 81%
rename from devices/pcx86/machine/5150/cga/64kb/donkey/README.md
rename to apps/pcx86/1981/donkey/README.md
index ec0e89434..e9994d11f 100644
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/README.md
+++ b/apps/pcx86/1981/donkey/README.md
@@ -1,15 +1,18 @@
---
layout: page
-title: IBM PC (Model 5150, 64Kb, Color Display) running DONKEY.BAS
-permalink: /devices/pcx86/machine/5150/cga/64kb/donkey/
+title: "DONKEY.BAS (1981)"
+permalink: /apps/pcx86/1981/donkey/
redirect_from:
- /configs/pc/machines/5150/cga/64kb/donkey/
- /configs/pc/machines/5150/cga/64kb/donkey/machine.xml/
- /demos/pc/donkey/
- /devices/pc/machine/5150/cga/64kb/donkey/
+ - /devices/pcx86/machine/5150/cga/64kb/donkey/
machines:
- type: pcx86
id: ibm5150
+ config: /devices/pcx86/machine/5150/cga/64kb/machine.xml
+ state: /apps/pcx86/1981/donkey/state.json
autoMount:
A:
path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
@@ -18,7 +21,7 @@ machines:
---
IBM PC Running DONKEY.BAS
----
+-------------------------
{% include machine.html id="ibm5150" %}
diff --git a/apps/pcx86/1981/donkey/debugger/README.md b/apps/pcx86/1981/donkey/debugger/README.md
new file mode 100644
index 000000000..38a37147c
--- /dev/null
+++ b/apps/pcx86/1981/donkey/debugger/README.md
@@ -0,0 +1,28 @@
+---
+layout: page
+title: "DONKEY.BAS (1981) with Debugger"
+permalink: /apps/pcx86/1981/donkey/debugger/
+machines:
+ - type: pcx86
+ id: ibm5150
+ config: /devices/pcx86/machine/5150/cga/64kb/debugger/machine.xml
+ state: /apps/pcx86/1981/donkey/state.json
+ autoMount:
+ A:
+ path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
+ B:
+ name: None
+---
+
+IBM PC Running DONKEY.BAS (with Debugger)
+-----------------------------------------
+
+{% include machine.html id="ibm5150" %}
+
+The above simulation is configured for a clock speed of 4.77Mhz, with 64Kb of RAM and a CGA display,
+using the original IBM PC Model 5150 ROM BIOS and CGA font ROM. This configuration also includes a
+predefined state, with PC-DOS 1.0 already booted and DONKEY.BAS ready to run.
+
+And now that PCx86 automatically saves all your changes (subject to the limits of your browser's local
+storage), you can even close the browser in the middle of a game of DONKEY, and the next time you load
+this page, your progress (and the donkey) will be perfectly restored.
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/screenshot.png b/apps/pcx86/1981/donkey/screenshot.png
similarity index 100%
rename from devices/pcx86/machine/5150/cga/64kb/donkey/screenshot.png
rename to apps/pcx86/1981/donkey/screenshot.png
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/state.json b/apps/pcx86/1981/donkey/state.json
similarity index 100%
rename from devices/pcx86/machine/5150/cga/64kb/donkey/state.json
rename to apps/pcx86/1981/donkey/state.json
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/thumbnail.jpg b/apps/pcx86/1981/donkey/thumbnail.jpg
similarity index 100%
rename from devices/pcx86/machine/5150/cga/64kb/donkey/thumbnail.jpg
rename to apps/pcx86/1981/donkey/thumbnail.jpg
diff --git a/apps/pcx86/README.md b/apps/pcx86/README.md
index a8f43125d..dded9929d 100644
--- a/apps/pcx86/README.md
+++ b/apps/pcx86/README.md
@@ -9,6 +9,7 @@ IBM PC Application Demos
Below are selected [PCx86](/docs/about/pcx86/) demos of classic IBM PC applications:
+* [DONKEY.BAS (1981)](1981/donkey/)
* [VisiCalc (1981)](1981/visicalc/)
* [Executive Suite (1982)](1982/esuite/)
* [RatBas (1982)](1982/ratbas/)
diff --git a/devices/README.md b/devices/README.md
index de40c0c7b..0b93dfe77 100644
--- a/devices/README.md
+++ b/devices/README.md
@@ -9,15 +9,15 @@ redirect_from:
---
Device Configurations
----
+---------------------
All PCjs machines are built from the following sets of devices:
-* [6502 Devices](c1p/) (e.g., [Challenger 1P](c1p/machine/))
-* [8080 Devices](pc8080/) (e.g., [Space Invaders](pc8080/machine/invaders/), [VT100 Terminal](pc8080/machine/vt100/))
-* [8086 Devices](pcx86/) (e.g., [IBM PC and compatibles](pcx86/machine/))
-* [PDP-10 Devices](pdp10/) (e.g., [PDP-10 (Model KA10)](pdp10/machine/ka10/))
-* [PDP-11 Devices](pdp11/) (e.g., [PDP-11/20](pdp11/machine/1120/), [PDP-11/45](pdp11/machine/1145/), [PDP-11/70](pdp11/machine/1170/))
+* [6502 Devices](c1p/): [Challenger 1P](c1p/machine/)
+* [8080 Devices](pc8080/): [Space Invaders](pc8080/machine/invaders/), [VT100 Terminal](pc8080/machine/vt100/)
+* [8086 Devices](pcx86/): [IBM PC and compatibles](pcx86/machine/)
+* [PDP-10 Devices](pdp10/): [PDP-10 (Model KA10)](pdp10/machine/ka10/)
+* [PDP-11 Devices](pdp11/): [PDP-11/20](pdp11/machine/1120/), [PDP-11/45](pdp11/machine/1145/), [PDP-11/70](pdp11/machine/1170/)
These devices are user-installable components that you would typically find in a real personal computer,
such as keyboards, disk drive controllers with one or more drives, video cards, etc.
diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml
index 4415c5873..d770599aa 100644
--- a/devices/c1p/machine/32kb/machine.xml
+++ b/devices/c1p/machine/32kb/machine.xml
@@ -1,6 +1,6 @@
-
+OSI Challenger 1P (32Kb) with Disk Support
diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml
index 3f5b28476..84ebc6b9d 100644
--- a/devices/c1p/machine/8kb/all/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/all/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+OSI Challenger 1P (8Kb, Additional Software)
diff --git a/devices/c1p/machine/8kb/all/machine.xml b/devices/c1p/machine/8kb/all/machine.xml
index cef5df016..11668dd54 100644
--- a/devices/c1p/machine/8kb/all/machine.xml
+++ b/devices/c1p/machine/8kb/all/machine.xml
@@ -1,6 +1,6 @@
-
+OSI Challenger 1P (8Kb, Additional Software)
diff --git a/devices/c1p/machine/8kb/embed/machine.xml b/devices/c1p/machine/8kb/embed/machine.xml
index d3b4bd711..d03e5a1bf 100644
--- a/devices/c1p/machine/8kb/embed/machine.xml
+++ b/devices/c1p/machine/8kb/embed/machine.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml
index 358c652d4..ffff50a1a 100644
--- a/devices/c1p/machine/8kb/large/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/large/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+OSI Challenger 1P (8Kb) with Debugger
diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml
index d716571b7..c77db5af5 100644
--- a/devices/c1p/machine/8kb/large/machine.xml
+++ b/devices/c1p/machine/8kb/large/machine.xml
@@ -1,6 +1,6 @@
-
+OSI Challenger 1P (circa 1978)
diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml
index 6c6cc1b4b..13fdf2433 100644
--- a/devices/c1p/machine/8kb/small/machine.xml
+++ b/devices/c1p/machine/8kb/small/machine.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/devices/pc8080/machine/exerciser/machine.xml b/devices/pc8080/machine/exerciser/machine.xml
index 54cd963c9..0caf4e1c9 100644
--- a/devices/pc8080/machine/exerciser/machine.xml
+++ b/devices/pc8080/machine/exerciser/machine.xml
@@ -1,6 +1,6 @@
-
+8080 Exerciser Test Machine
diff --git a/devices/pc8080/machine/invaders/debugger/machine.xml b/devices/pc8080/machine/invaders/debugger/machine.xml
index 3724148cf..0a43680d4 100644
--- a/devices/pc8080/machine/invaders/debugger/machine.xml
+++ b/devices/pc8080/machine/invaders/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+Space Invaders
diff --git a/devices/pc8080/machine/invaders/machine.xml b/devices/pc8080/machine/invaders/machine.xml
index b421f0d0c..19389e7fd 100644
--- a/devices/pc8080/machine/invaders/machine.xml
+++ b/devices/pc8080/machine/invaders/machine.xml
@@ -1,6 +1,6 @@
-
+Space Invaders
diff --git a/devices/pc8080/machine/vt100/debugger/machine.xml b/devices/pc8080/machine/vt100/debugger/machine.xml
index c9ef6b56a..f53933605 100644
--- a/devices/pc8080/machine/vt100/debugger/machine.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/machine.xml b/devices/pc8080/machine/vt100/machine.xml
index b44ed68ef..88e50a584 100644
--- a/devices/pc8080/machine/vt100/machine.xml
+++ b/devices/pc8080/machine/vt100/machine.xml
@@ -1,6 +1,6 @@
-
+VT100 Terminal
diff --git a/devices/pcx86/machine/5150/cga/64kb/README.md b/devices/pcx86/machine/5150/cga/64kb/README.md
index 295d0772f..dab9ece57 100644
--- a/devices/pcx86/machine/5150/cga/64kb/README.md
+++ b/devices/pcx86/machine/5150/cga/64kb/README.md
@@ -14,5 +14,3 @@ All our 64Kb configurations of the IBM PC Model 5150 w/CGA are located here, inc
* [IBM PC (64Kb) with Color Display](/devices/pcx86/machine/5150/cga/64kb/)
* [IBM PC (64Kb) with Color Display and Debugger](/devices/pcx86/machine/5150/cga/64kb/debugger/)
* [IBM PC (64Kb) with Color Display and Soft Keyboard](/devices/pcx86/machine/5150/cga/64kb/softkbd/)
-* [IBM PC (64Kb) running DONKEY.BAS](/devices/pcx86/machine/5150/cga/64kb/donkey/)
-* [IBM PC (64Kb) running DONKEY.BAS with Debugger](/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/)
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.md b/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.md
deleted file mode 100644
index 41dcd5b23..000000000
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: IBM PC (Model 5150, 64Kb) with Color Display and Debugger
-permalink: /devices/pcx86/machine/5150/cga/64kb/donkey/debugger/
-machines:
- - type: pcx86
- id: ibm5150
- debugger: true
----
-
-{% include machine.html id="ibm5150" %}
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml
deleted file mode 100644
index 8bfc852c8..000000000
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- IBM PC (Model 5150), CGA, 64K
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml b/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml
deleted file mode 100644
index 0127c8e67..000000000
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- IBM PC (Model 5150), CGA, 64K
-
-
-
-
-
-
-
- Run
- Reset
-
-
-
-
diff --git a/devices/pcx86/machine/5150/cga/64kb/machine.xml b/devices/pcx86/machine/5150/cga/64kb/machine.xml
index 7064289d1..c18047a3e 100644
--- a/devices/pcx86/machine/5150/cga/64kb/machine.xml
+++ b/devices/pcx86/machine/5150/cga/64kb/machine.xml
@@ -8,7 +8,7 @@
-
+ RunResetSpeed
diff --git a/devices/pcx86/machine/5150/cga/README.md b/devices/pcx86/machine/5150/cga/README.md
index 9de7f3d7a..b75a97323 100644
--- a/devices/pcx86/machine/5150/cga/README.md
+++ b/devices/pcx86/machine/5150/cga/README.md
@@ -14,6 +14,5 @@ All our Color Graphics (CGA) configurations of the IBM PC Model 5150 are located
* [IBM PC (64Kb) with Color Display](/devices/pcx86/machine/5150/cga/64kb/) ([Debugger](/devices/pcx86/machine/5150/cga/64kb/debugger/))
* [IBM PC (64Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5150/cga/64kb/softkbd/)
-* [IBM PC (64Kb) running DONKEY.BAS](/devices/pcx86/machine/5150/cga/64kb/donkey/) ([Debugger](/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/))
* [IBM PC (256Kb) with Color Display](/devices/pcx86/machine/5150/cga/256kb/) ([Debugger](/devices/pcx86/machine/5150/cga/256kb/debugger/))
* [IBM PC (384Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5150/cga/384kb/softkbd/)
diff --git a/devices/pcx86/machine/5150/dual/64kb/machine.xml b/devices/pcx86/machine/5150/dual/64kb/machine.xml
index 2f459a1bd..602380a7c 100644
--- a/devices/pcx86/machine/5150/dual/64kb/machine.xml
+++ b/devices/pcx86/machine/5150/dual/64kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150) with Dual Displays
diff --git a/devices/pcx86/machine/5150/mda/256kb/debugger/machine.xml b/devices/pcx86/machine/5150/mda/256kb/debugger/machine.xml
index df0208832..2c0deb825 100644
--- a/devices/pcx86/machine/5150/mda/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5150/mda/256kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150), MDA, 256K, Debugger
diff --git a/devices/pcx86/machine/5150/mda/256kb/machine.xml b/devices/pcx86/machine/5150/mda/256kb/machine.xml
index 456aeeca2..ae37321e5 100644
--- a/devices/pcx86/machine/5150/mda/256kb/machine.xml
+++ b/devices/pcx86/machine/5150/mda/256kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150), MDA, 256K
diff --git a/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml b/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
index 51aaa2f60..bfb3dd678 100644
--- a/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150), MDA, 64K, Debugger
diff --git a/devices/pcx86/machine/5150/mda/64kb/machine.xml b/devices/pcx86/machine/5150/mda/64kb/machine.xml
index 050c74eb2..ace4c769e 100644
--- a/devices/pcx86/machine/5150/mda/64kb/machine.xml
+++ b/devices/pcx86/machine/5150/mda/64kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150), MDA, 64K
diff --git a/devices/pcx86/machine/5160/README.md b/devices/pcx86/machine/5160/README.md
index f858ef562..94cfc939b 100644
--- a/devices/pcx86/machine/5160/README.md
+++ b/devices/pcx86/machine/5160/README.md
@@ -5,7 +5,7 @@ permalink: /devices/pcx86/machine/5160/
---
IBM PC XT (Model 5160) Machines
----
+-------------------------------
Our IBM PC XT 5160 configurations include:
diff --git a/devices/pcx86/machine/5160/cga/256kb/README.md b/devices/pcx86/machine/5160/cga/256kb/README.md
index 8f5172856..c62175edd 100644
--- a/devices/pcx86/machine/5160/cga/256kb/README.md
+++ b/devices/pcx86/machine/5160/cga/256kb/README.md
@@ -4,17 +4,27 @@ title: IBM PC XT (Model 5160)
permalink: /devices/pcx86/machine/5160/cga/256kb/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/
+ - /configs/pc/machines/5160/cga/256kb/demo/
+machines:
+ - type: pcx86
+ id: ibm5160
---
IBM PC XT (256Kb) with Color Display
----
+------------------------------------
All our 256Kb Model 5160, aka IBM PC XT, configurations are located here, including:
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/demo/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger](/devices/pcx86/machine/5160/cga/256kb/demo/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard](/devices/pcx86/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pcx86/machine/5160/cga/256kb/win101/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01](/devices/pcx86/machine/5160/cga/256kb/win101/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/)
* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard](/devices/pcx86/machine/5160/cga/256kb/softkbd/)
+
+{% include machine.html id="ibm5160" %}
+
+The above simulation is configured for a clock speed of 4.77Mhz, with 256Kb of RAM and a CGA display,
+using the original IBM PC Model 5160 ROM BIOS and CGA font ROM.
+
+This PC XT configuration also includes an empty 10Mb hard disk. Use FDISK and then FORMAT to turn it into
+a usable C: drive.
+
+For more control over this machine, try the [Control Panel](debugger/) configuration, featuring the
+built-in PCjs Debugger.
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.md b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.md
similarity index 70%
rename from devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.md
rename to devices/pcx86/machine/5160/cga/256kb/debugger/machine.md
index 4645eb006..8d7050175 100644
--- a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.md
+++ b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.md
@@ -1,9 +1,10 @@
---
layout: page
title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger
-permalink: /devices/pcx86/machine/5160/cga/256kb/demo/debugger/
+permalink: /devices/pcx86/machine/5160/cga/256kb/debugger/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/demo/debugger/
+ - /devices/pcx86/machine/5160/cga/256kb/demo/debugger/
machines:
- type: pcx86
id: ibm5160
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
similarity index 82%
rename from devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml
rename to devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
index d96c18ac9..2c1cca365 100644
--- a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
@@ -1,15 +1,15 @@
-
+IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive
-
+
-
+
@@ -19,4 +19,6 @@
+
+
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/README.md b/devices/pcx86/machine/5160/cga/256kb/demo/README.md
deleted file mode 100644
index 7c5f14c22..000000000
--- a/devices/pcx86/machine/5160/cga/256kb/demo/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display
-permalink: /devices/pcx86/machine/5160/cga/256kb/demo/
-redirect_from:
- - /configs/pc/machines/5160/cga/256kb/demo/
-machines:
- - type: pcx86
- id: ibm5160
----
-
-IBM PC XT with Color Display
----
-
-{% include machine.html id="ibm5160" %}
-
-The above simulation is configured for a clock speed of 4.77Mhz, with 256Kb of RAM and a CGA display,
-using the original IBM PC Model 5160 ROM BIOS and CGA font ROM.
-
-This PC XT configuration also includes an empty 10Mb hard disk. Use FDISK and then FORMAT to turn it into
-a usable C: drive.
-
-For more control over this machine, try the [Control Panel](debugger/) configuration, featuring the
-built-in PCjs Debugger.
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml b/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml
deleted file mode 100644
index b2793d5a5..000000000
--- a/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive
-
-
-
-
-
-
-
-
- Run
- Reset
-
-
-
-
-
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml b/devices/pcx86/machine/5160/cga/256kb/machine.xml
similarity index 75%
rename from devices/pcx86/machine/5160/cga/256kb/win101/machine.xml
rename to devices/pcx86/machine/5160/cga/256kb/machine.xml
index 6b43b9738..3e7cba456 100644
--- a/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/machine.xml
@@ -1,21 +1,21 @@
-
- IBM PC XT (Model 5160) running Windows 1.01
-
+
+ IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive
+
-
+ RunReset
+
-
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/screenshot.png b/devices/pcx86/machine/5160/cga/256kb/screenshot.png
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/demo/screenshot.png
rename to devices/pcx86/machine/5160/cga/256kb/screenshot.png
diff --git a/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
index e3ce97e57..e572f8b17 100644
--- a/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
@@ -8,7 +8,7 @@
-
+
@@ -18,4 +18,7 @@
+
+
+
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/thumbnail.jpg b/devices/pcx86/machine/5160/cga/256kb/thumbnail.jpg
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/demo/thumbnail.jpg
rename to devices/pcx86/machine/5160/cga/256kb/thumbnail.jpg
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/README.md b/devices/pcx86/machine/5160/cga/256kb/win101/debugger/README.md
deleted file mode 100644
index c6f69eccd..000000000
--- a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01
-permalink: /devices/pcx86/machine/5160/cga/256kb/win101/debugger/
-redirect_from:
- - /configs/pc/machines/5160/cga/256kb/win101/debugger/
-machines:
- - type: pcx86
- id: ibm5160
- debugger: true
----
-
-IBM PC XT with Debugger running Windows 1.01
----
-
-{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml
deleted file mode 100644
index 9a6ca14f2..000000000
--- a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- IBM PC XT (Model 5160) running Windows 1.01
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.md b/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.md
deleted file mode 100644
index 5a4163378..000000000
--- a/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01
-permalink: /devices/pcx86/machine/5160/cga/256kb/win101/softkbd/
-redirect_from:
- - /configs/pc/machines/5160/cga/256kb/win101/softkbd/index.xml/
- - /configs/pc/machines/5160/cga/256kb/win101/softkbd/machine.xml/
-machines:
- - type: pcx86
- id: ibm5160
- debugger: true
----
-
-{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.md b/devices/pcx86/machine/5160/cga/512kb/softkbd/machine.md
similarity index 55%
rename from devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.md
rename to devices/pcx86/machine/5160/cga/512kb/softkbd/machine.md
index adf67d443..78c0f2e9c 100644
--- a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.md
+++ b/devices/pcx86/machine/5160/cga/512kb/softkbd/machine.md
@@ -1,9 +1,9 @@
---
layout: page
-title: IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01
-permalink: /devices/pcx86/machine/5160/cga/512kb/win101/softkbd/
+title: IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard
+permalink: /devices/pcx86/machine/5160/cga/512kb/softkbd/
redirect_from:
- - /configs/pc/machines/5160/cga/512kb/win101/softkbd/
+ - /configs/pc/machines/5160/cga/512kb/softkbd/
machines:
- type: pcx86
id: ibm5160
diff --git a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/512kb/softkbd/machine.xml
similarity index 95%
rename from devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml
rename to devices/pcx86/machine/5160/cga/512kb/softkbd/machine.xml
index 88bd38d35..89669465a 100644
--- a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/512kb/softkbd/machine.xml
@@ -1,7 +1,7 @@
- IBM PC XT (Model 5160), CGA, 512K, WIN101
+ IBM PC XT (Model 5160), CGA, 512K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
index e0d6e5bfa..d72395050 100644
--- a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/640kb/machine.xml b/devices/pcx86/machine/5160/cga/640kb/machine.xml
index 9aec37835..01610be5b 100644
--- a/devices/pcx86/machine/5160/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/README.md b/devices/pcx86/machine/5160/cga/README.md
index 0c5077606..372bb6730 100644
--- a/devices/pcx86/machine/5160/cga/README.md
+++ b/devices/pcx86/machine/5160/cga/README.md
@@ -7,15 +7,13 @@ redirect_from:
---
IBM PC XT with Color Graphics (CGA) Display
----
+-------------------------------------------
All our Color Graphics (CGA) configurations of the IBM PC XT (Model 5160) are located here, including:
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/demo/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/demo/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/))
* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pcx86/machine/5160/cga/256kb/win101/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/win101/debugger/))
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/)
+* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/512kb/softkbd/)
* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/640kb/) ([Debugger](/devices/pcx86/machine/5160/cga/640kb/debugger/))
* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/640kb/softkbd/)
diff --git a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
index b63d7080b..21de430cb 100644
--- a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/256kb/machine.xml b/devices/pcx86/machine/5160/ega/256kb/machine.xml
index de0189c9d..90d7f5fc3 100644
--- a/devices/pcx86/machine/5160/ega/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/array/machine.xml b/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
index 73ee684b1..883571625 100644
--- a/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
index 8673e1941..7ea98d6e9 100644
--- a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/machine.xml b/devices/pcx86/machine/5160/ega/640kb/machine.xml
index c307f4feb..da2350330 100644
--- a/devices/pcx86/machine/5160/ega/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/README.md b/devices/pcx86/machine/5160/ega/README.md
index 269f1060d..791249b53 100644
--- a/devices/pcx86/machine/5160/ega/README.md
+++ b/devices/pcx86/machine/5160/ega/README.md
@@ -5,7 +5,7 @@ permalink: /devices/pcx86/machine/5160/ega/
---
IBM PC XT with Enhanced Color Graphics (EGA) Display
----
+----------------------------------------------------
All our Enhanced Color Graphics (EGA) configurations of the IBM PC XT (Model 5160) are located here, including:
diff --git a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
index e4f5741e3..37f5c6ca0 100644
--- a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
index 7b5db2886..54f4d723f 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
index 498beef02..b38844413 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/machine.xml b/devices/pcx86/machine/5160/mda/256kb/machine.xml
index 21d95e1a4..14a31bcf1 100644
--- a/devices/pcx86/machine/5160/mda/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
index da8b29095..8340cbb4c 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
index 2b43dbf01..f21d08850 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index 08663057e..c4c7e035a 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
index 35c19e867..b1eb85c34 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index 738318b91..59e2d36e1 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 83d6336dd..7da1fc6a1 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
index a842b7ae7..48ee1430f 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
index 7750f56a7..31f62869b 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index 84ca99ee5..efb15a441 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
index b980c02c5..945833e75 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
index 15ff313a5..fca9136b5 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT, 128K EGA, 640Kb RAM
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
index 0799a77ba..7265211bd 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT, 128K EGA, 640Kb RAM
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
index b1912966e..892bba973 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
index 737e768bc..f37f6f25a 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display
diff --git a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
index 9ca328988..416b9f9d3 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/2048kb/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
index 57ba3d775..8165141c2 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
index 52b15def4..31f59c8cc 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz, 4Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/4096kb/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
index 3d084098f..d44c65363 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC AT (8Mhz), VGA, 4Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/README.md b/devices/pcx86/machine/README.md
index b9b23f28e..6a78b79df 100644
--- a/devices/pcx86/machine/README.md
+++ b/devices/pcx86/machine/README.md
@@ -59,7 +59,6 @@ other software.
* [IBM PC (64Kb) with Monochrome Display](/devices/pcx86/machine/5150/mda/64kb/) ([Debugger](/devices/pcx86/machine/5150/mda/64kb/debugger/))
* [IBM PC (64Kb) with Monochrome Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5150/mda/64kb/softkbd/)
-* [IBM PC (64Kb) with Color Display](/devices/pcx86/machine/5150/cga/64kb/donkey/) ([Debugger](/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/))
* [IBM PC (64Kb) with Color Display and Soft Keyboard](/devices/pcx86/machine/5150/cga/64kb/softkbd/)
* [IBM PC (384Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5150/cga/384kb/softkbd/)
* [IBM PC (64Kb) with Dual Displays (Monochrome and Color)](/devices/pcx86/machine/5150/dual/64kb/)
@@ -68,16 +67,14 @@ other software.
* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display](/devices/pcx86/machine/5160/mda/64kb/softkbd/)
* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pcx86/machine/5160/mda/256kb/) ([Debugger](/devices/pcx86/machine/5160/mda/256kb/debugger/))
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/demo/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/demo/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pcx86/machine/5160/cga/256kb/win101/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/win101/debugger/))
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/)
+* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/512kb/softkbd/)
* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/640kb/) ([Debugger](/devices/pcx86/machine/5160/cga/640kb/debugger/))
* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pcx86/machine/5160/cga/640kb/softkbd/)
* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display](/devices/pcx86/machine/5160/ega/256kb/) ([Debugger](/devices/pcx86/machine/5160/ega/256kb/debugger/))
* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display](/devices/pcx86/machine/5160/ega/640kb/) ([Debugger](/devices/pcx86/machine/5160/ega/640kb/debugger/))
-* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
* [IBM PC XT (640Kb, 10Mb Drive) Machine Array with EGA Displays](/devices/pcx86/machine/5160/ega/640kb/array/)
#### [IBM PC AT 5170 Machines](/devices/pcx86/machine/5170/)
diff --git a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
index fb53072e2..4768892b5 100644
--- a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+AT&T Personal Computer 6300 with Color Display
diff --git a/devices/pcx86/machine/att/6300/cga/640kb/machine.xml b/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
index f0ef0869b..1dec6c6a1 100644
--- a/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
@@ -1,6 +1,6 @@
-
+AT&T Personal Computer 6300 with Color Display
diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
index cfc6a0e8b..5b4aa246a 100644
--- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+Columbia Data Products MPC 1600 with Color Display
diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
index 546ca6eba..c09accb4d 100644
--- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
@@ -1,6 +1,6 @@
-
+Columbia Data Products MPC 1600 with Color Display
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
index 7f7a0fbd6..d5780b324 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
index d38141dae..f128cf52c 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
index 755065b53..9a2cb7fce 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
index aacfed602..965d3bd1d 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
index 4975209a7..f497661dd 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, COMPAQ VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
index aeb6ba017..0c3491356 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, COMPAQ VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
index 052ef33df..75f57eab3 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 1136fe256..9c142f925 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
index f2019cd87..084e52e21 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 4Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
index baced65df..a6f99761e 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -1,6 +1,6 @@
-
+COMPAQ DeskPro 386, 4Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/custom/machine.xml b/devices/pcx86/machine/custom/machine.xml
index fcd92786a..6dcd2098c 100644
--- a/devices/pcx86/machine/custom/machine.xml
+++ b/devices/pcx86/machine/custom/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150) with Monochrome Display
diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
index 3a18ecea4..5eec85025 100644
--- a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+Zenith Z-150 with Color Display
diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
index 8725e4034..f9d735494 100644
--- a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
@@ -1,6 +1,6 @@
-
+Zenith Z-150 with Color Display
diff --git a/devices/pdp10/machine/ka10/test/debugger/machine.xml b/devices/pdp10/machine/ka10/test/debugger/machine.xml
index fe6b245a1..166194f54 100644
--- a/devices/pdp10/machine/ka10/test/debugger/machine.xml
+++ b/devices/pdp10/machine/ka10/test/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-10 (Model KA10) with Debugger
diff --git a/devices/pdp10/machine/ka10/test/machine.xml b/devices/pdp10/machine/ka10/test/machine.xml
index 0ce777239..ddfc587fe 100644
--- a/devices/pdp10/machine/ka10/test/machine.xml
+++ b/devices/pdp10/machine/ka10/test/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-10 Test Machine
diff --git a/devices/pdp11/machine/1120/basic/debugger/machine.xml b/devices/pdp11/machine/1120/basic/debugger/machine.xml
index 023aeeb03..c02b467de 100644
--- a/devices/pdp11/machine/1120/basic/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/basic/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20: 16Kb, PDP-11 BASIC, Debugger
diff --git a/devices/pdp11/machine/1120/basic/machine.xml b/devices/pdp11/machine/1120/basic/machine.xml
index bb7197c65..98d747a7f 100644
--- a/devices/pdp11/machine/1120/basic/machine.xml
+++ b/devices/pdp11/machine/1120/basic/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20: 16Kb, PDP-11 BASIC
diff --git a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
index 96ab0ca16..c2d78cfd7 100644
--- a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20: 16Kb, Bootstrap Loader, Debugger
diff --git a/devices/pdp11/machine/1120/bootstrap/machine.xml b/devices/pdp11/machine/1120/bootstrap/machine.xml
index f80f93e57..03e336e89 100644
--- a/devices/pdp11/machine/1120/bootstrap/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20: 16Kb, Bootstrap Loader
diff --git a/devices/pdp11/machine/1120/monitor/debugger/machine.xml b/devices/pdp11/machine/1120/monitor/debugger/machine.xml
index c9fd6ad3a..82e287a9a 100644
--- a/devices/pdp11/machine/1120/monitor/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/monitor/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20 Boot Monitor with 56Kb and Debugger
diff --git a/devices/pdp11/machine/1120/monitor/machine.xml b/devices/pdp11/machine/1120/monitor/machine.xml
index d0f0430e7..f13a3eebf 100644
--- a/devices/pdp11/machine/1120/monitor/machine.xml
+++ b/devices/pdp11/machine/1120/monitor/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20 Boot Monitor with 56Kb
diff --git a/devices/pdp11/machine/1120/panel/debugger/machine.xml b/devices/pdp11/machine/1120/panel/debugger/machine.xml
index c9fa1552d..b20d7b370 100644
--- a/devices/pdp11/machine/1120/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/panel/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20 with Front Panel and Debugger
diff --git a/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml b/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
index 2f61f39cd..ae3e09fa7 100644
--- a/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
+++ b/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20 with Front Panel and TEST 14
diff --git a/devices/pdp11/machine/1120/panel/machine.xml b/devices/pdp11/machine/1120/panel/machine.xml
index bd0976826..7b231209a 100644
--- a/devices/pdp11/machine/1120/panel/machine.xml
+++ b/devices/pdp11/machine/1120/panel/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/20 with Front Panel
diff --git a/devices/pdp11/machine/1145/panel/debugger/machine.xml b/devices/pdp11/machine/1145/panel/debugger/machine.xml
index 9e669120a..702400f2b 100644
--- a/devices/pdp11/machine/1145/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1145/panel/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/45 with 256Kb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1145/panel/machine.xml b/devices/pdp11/machine/1145/panel/machine.xml
index 3022e04be..33bf61049 100644
--- a/devices/pdp11/machine/1145/panel/machine.xml
+++ b/devices/pdp11/machine/1145/panel/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/45 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1145/vt100/debugger/machine.xml b/devices/pdp11/machine/1145/vt100/debugger/machine.xml
index d758c2d12..b957299df 100644
--- a/devices/pdp11/machine/1145/vt100/debugger/machine.xml
+++ b/devices/pdp11/machine/1145/vt100/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/45 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1145/vt100/machine.xml b/devices/pdp11/machine/1145/vt100/machine.xml
index 5d38777af..b87ea99e2 100644
--- a/devices/pdp11/machine/1145/vt100/machine.xml
+++ b/devices/pdp11/machine/1145/vt100/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/45 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/4mb/debugger/machine.xml b/devices/pdp11/machine/1170/4mb/debugger/machine.xml
index 0cf0dec97..bea04363d 100644
--- a/devices/pdp11/machine/1170/4mb/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/4mb/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 4Mb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1170/4mb/machine.xml b/devices/pdp11/machine/1170/4mb/machine.xml
index 59ba6f9f4..9c2b6f0c1 100644
--- a/devices/pdp11/machine/1170/4mb/machine.xml
+++ b/devices/pdp11/machine/1170/4mb/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 4Mb and Front Panel
diff --git a/devices/pdp11/machine/1170/monitor/debugger/machine.xml b/devices/pdp11/machine/1170/monitor/debugger/machine.xml
index 3acee31e7..891444730 100644
--- a/devices/pdp11/machine/1170/monitor/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/monitor/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb, Boot Monitor, and Debugger
diff --git a/devices/pdp11/machine/1170/monitor/machine.xml b/devices/pdp11/machine/1170/monitor/machine.xml
index b6b510f37..8133eeff9 100644
--- a/devices/pdp11/machine/1170/monitor/machine.xml
+++ b/devices/pdp11/machine/1170/monitor/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb and Boot Monitor
diff --git a/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml b/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
index d9c0bb5db..059d8a3fc 100644
--- a/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
+++ b/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb running CPU Exerciser
diff --git a/devices/pdp11/machine/1170/panel/debugger/machine.xml b/devices/pdp11/machine/1170/panel/debugger/machine.xml
index 1332adc27..4051e25dd 100644
--- a/devices/pdp11/machine/1170/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/panel/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1170/panel/machine.xml b/devices/pdp11/machine/1170/panel/machine.xml
index 60aa69d55..b11434cdc 100644
--- a/devices/pdp11/machine/1170/panel/machine.xml
+++ b/devices/pdp11/machine/1170/panel/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine.xml b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
index 0818c58ff..0f319f1c7 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1170/vt100/machine.xml b/devices/pdp11/machine/1170/vt100/machine.xml
index 7903e43c8..a4e986fa4 100644
--- a/devices/pdp11/machine/1170/vt100/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/machine.xml
@@ -1,6 +1,6 @@
-
+PDP-11/70 with 256Kb and Front Panel
diff --git a/disks/README.md b/disks/README.md
index 2a4d7e242..ba540110f 100644
--- a/disks/README.md
+++ b/disks/README.md
@@ -15,7 +15,7 @@ Browse these PCjs Disk Libraries:
* [Challenger 1P](c1p/)
* [DEC](dec/)
-Additional selected software is available in the PCjs [Software Archives](/apps/).
+Additional selected software is available in the PCjs [Application Demos](/apps/).
---
diff --git a/disks/pcx86/README.md b/disks/pcx86/README.md
index 0c9592b46..fb73e3bb7 100644
--- a/disks/pcx86/README.md
+++ b/disks/pcx86/README.md
@@ -39,7 +39,7 @@ more detail, along with a live demonstration of the software, but that's not yet
* [Microsoft Word](apps/microsoft/word/)
* [More...](apps/other/)
-Additional applications for which we have created special "Demo Disks" include:
+Selected applications for which we have created "Demo Disks":
* [VisiCalc (1981)](/apps/pcx86/1981/visicalc/)
* [Executive Suite (1982)](/apps/pcx86/1982/esuite/)
diff --git a/disks/pcx86/cpm/1.1b/machine.xml b/disks/pcx86/cpm/1.1b/machine.xml
index d525e1449..ea7b73b20 100644
--- a/disks/pcx86/cpm/1.1b/machine.xml
+++ b/disks/pcx86/cpm/1.1b/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150) running CP/M-86
diff --git a/disks/pcx86/games/infocom/machine.xml b/disks/pcx86/games/infocom/machine.xml
index 3d3dd1bf4..8baa6f0cf 100644
--- a/disks/pcx86/games/infocom/machine.xml
+++ b/disks/pcx86/games/infocom/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC Model 5150 (CGA, 64K)
diff --git a/disks/pcx86/games/infocom/zork1/debugger/machine.xml b/disks/pcx86/games/infocom/zork1/debugger/machine.xml
index 9a4b02996..8b0013c31 100644
--- a/disks/pcx86/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pcx86/games/infocom/zork1/debugger/machine.xml
@@ -1,6 +1,6 @@
-
+Zork I (IBM PC Model 5150)
diff --git a/disks/pcx86/games/microsoft/adventure/machine.xml b/disks/pcx86/games/microsoft/adventure/machine.xml
index 4429ea189..7230a8048 100644
--- a/disks/pcx86/games/microsoft/adventure/machine.xml
+++ b/disks/pcx86/games/microsoft/adventure/machine.xml
@@ -1,6 +1,6 @@
-
+IBM PC (Model 5150) running Microsoft Adventure
diff --git a/disks/pcx86/windows/1.01/README.md b/disks/pcx86/windows/1.01/README.md
index eb1637a7c..50e47a8f0 100644
--- a/disks/pcx86/windows/1.01/README.md
+++ b/disks/pcx86/windows/1.01/README.md
@@ -8,27 +8,26 @@ redirect_from:
- /devices/pc/machine/5160/ega/640kb/win101/debugger/
- /disks/pc/windows/1.01/
machines:
- - type: pcx86
- id: ibm5160
- state: ibm5160-ega.json
+ - id: ibm5160
+ type: pcx86
+ state: /disks/pcx86/windows/1.01/state.json
config: /devices/pcx86/machine/5160/ega/640kb/machine.xml
drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/PCDOS200-WIN101-EGA.json"}]'
---
Microsoft Windows 1.01
----
+----------------------
-Microsoft Windows 1.01, the first public version of Windows, was released on November 20, 1985. It is shown
-here running on an IBM PC XT (Model 5160) with an EGA Display.
-
-You can also run [Windows 1.01 with a CGA Display](/devices/pcx86/machine/5160/cga/256kb/win101/).
-
-Directory listings of the five 360Kb distribution diskettes are provided [below](#directory-listings).
+Microsoft Windows 1.01, the first public version of Windows, was released on November 20, 1985.
+It is shown here running on an IBM PC XT (Model 5160) with an EGA Display. You can also run
+[Windows 1.01 with a CGA Display](cga/).
{% include machine.html id="ibm5160" %}
+Directory listings of the five 360Kb distribution diskettes are provided [below](#directory-listings).
+
Directory Listings
----
+------------------
### Directory of Windows 1.01 (SETUP)
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/README.md b/disks/pcx86/windows/1.01/cga/README.md
similarity index 67%
rename from devices/pcx86/machine/5160/cga/256kb/win101/README.md
rename to disks/pcx86/windows/1.01/cga/README.md
index cd534da0b..3da6630be 100644
--- a/devices/pcx86/machine/5160/cga/256kb/win101/README.md
+++ b/disks/pcx86/windows/1.01/cga/README.md
@@ -1,7 +1,7 @@
---
layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive, Color Display) running Windows 1.01
-permalink: /devices/pcx86/machine/5160/cga/256kb/win101/
+title: Microsoft Windows 1.01 with CGA Display
+permalink: /disks/pcx86/windows/1.01/cga/
redirect_from:
- /configs/pc/machines/5160/cga/win101/
- /configs/pc/machines/5160/cga/256kb/win101/
@@ -10,18 +10,21 @@ redirect_from:
- /demos/pc/cga-win101/
- /devices/pc/machine/5160/cga/256kb/win101/
- /devices/pc/machine/5160/cga/256kb/win101/machine.xml/
+ - /devices/pcx86/machine/5160/cga/256kb/win101/
machines:
- - type: pcx86
- id: ibm5160
+ - id: ibm5160
+ type: pcx86
+ state: /disks/pcx86/windows/1.01/cga/state.json
+ config: /devices/pcx86/machine/5160/cga/256kb/machine.xml
+ drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/PCDOS200-WIN101-CGA.json"}]'
---
-IBM PC XT running Windows 1.01
----
+Microsoft Windows 1.01 with CGA Display
+---------------------------------------
[Microsoft Windows 1.01](/disks/pcx86/windows/1.01/), the first public version of Windows, was released on
-November 20, 1985. It is shown here running on an IBM PC XT (Model 5160) with a CGA Display.
-
-You can also run [Windows 1.01 with an EGA Display](/disks/pcx86/windows/1.01/).
+November 20, 1985. It is shown here running on an IBM PC XT (Model 5160) with a CGA Display. You can also run
+[Windows 1.01 with an EGA Display](/disks/pcx86/windows/1.01/).
{% include machine.html id="ibm5160" %}
@@ -36,5 +39,5 @@ been pre-configured to always start Windows 1.01 in the same state.
NOTE: The Windows 1.01 mouse pointer can be controlled with your mouse, but only when your mouse is
within the "CGA Display" window. This is a restriction imposed by your web browser, not PCjs.
-For more control over this machine, try the [Control Panel](debugger/) configuration, featuring the
-built-in PCjs Debugger, with save/restore enabled.
+For more control over this machine, try the [Control Panel](debugger/) or [Soft Keyboard](softkbd/) configurations,
+featuring the built-in PCjs Debugger, with save/restore enabled.
diff --git a/disks/pcx86/windows/1.01/cga/debugger/README.md b/disks/pcx86/windows/1.01/cga/debugger/README.md
new file mode 100644
index 000000000..4416ea1bd
--- /dev/null
+++ b/disks/pcx86/windows/1.01/cga/debugger/README.md
@@ -0,0 +1,20 @@
+---
+layout: page
+title: Microsoft Windows 1.01 with CGA Display and Debugger
+permalink: /disks/pcx86/windows/1.01/cga/debugger/
+redirect_from:
+ - /configs/pc/machines/5160/cga/256kb/win101/debugger/
+ - /devices/pcx86/machine/5160/cga/256kb/win101/debugger/
+machines:
+ - type: pcx86
+ id: ibm5160
+ debugger: true
+ state: /disks/pcx86/windows/1.01/cga/state.json
+ config: /devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
+ drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/PCDOS200-WIN101-CGA.json"}]'
+---
+
+Microsoft Windows 1.01 with CGA Display and Debugger
+----------------------------------------------------
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/screenshot.png b/disks/pcx86/windows/1.01/cga/screenshot.png
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/win101/screenshot.png
rename to disks/pcx86/windows/1.01/cga/screenshot.png
diff --git a/disks/pcx86/windows/1.01/cga/softkbd/README.md b/disks/pcx86/windows/1.01/cga/softkbd/README.md
new file mode 100644
index 000000000..208060cf8
--- /dev/null
+++ b/disks/pcx86/windows/1.01/cga/softkbd/README.md
@@ -0,0 +1,21 @@
+---
+layout: page
+title: Microsoft Windows 1.01 with CGA Display and Soft Keyboard
+permalink: /disks/pcx86/windows/1.01/cga/softkbd/
+redirect_from:
+ - /configs/pc/machines/5160/cga/256kb/win101/softkbd/index.xml/
+ - /configs/pc/machines/5160/cga/256kb/win101/softkbd/machine.xml/
+ - /devices/pcx86/machine/5160/cga/256kb/win101/softkbd/
+machines:
+ - type: pcx86
+ id: ibm5160
+ debugger: true
+ state: /disks/pcx86/windows/1.01/cga/state.json
+ config: /devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
+ drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/PCDOS200-WIN101-CGA.json"}]'
+---
+
+Microsoft Windows 1.01 with CGA Display and Soft Keyboard
+---------------------------------------------------------
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml b/disks/pcx86/windows/1.01/cga/softkbd/machine.xml
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml
rename to disks/pcx86/windows/1.01/cga/softkbd/machine.xml
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/state.json b/disks/pcx86/windows/1.01/cga/state.json
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/win101/state.json
rename to disks/pcx86/windows/1.01/cga/state.json
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/thumbnail.jpg b/disks/pcx86/windows/1.01/cga/thumbnail.jpg
similarity index 100%
rename from devices/pcx86/machine/5160/cga/256kb/win101/thumbnail.jpg
rename to disks/pcx86/windows/1.01/cga/thumbnail.jpg
diff --git a/disks/pcx86/windows/1.01/ibm5160-ega.json b/disks/pcx86/windows/1.01/state.json
similarity index 100%
rename from disks/pcx86/windows/1.01/ibm5160-ega.json
rename to disks/pcx86/windows/1.01/state.json
diff --git a/docs/README.md b/docs/README.md
index 17ae1104f..6072b86b6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -7,7 +7,7 @@ permalink: /docs/
---
Documentation
----
+-------------
Help is available for the following PCjs Machines:
diff --git a/docs/pcx86/examples/components.xsl b/docs/pcx86/examples/components.xsl
index dffaca0e7..2cd477a24 100644
--- a/docs/pcx86/examples/components.xsl
+++ b/docs/pcx86/examples/components.xsl
@@ -16,6 +16,7 @@
PCx861.35.1www.pcjs.org
+ #FAEBD7
@@ -210,7 +211,10 @@
overflow:auto;width:100%;
- background-color:;
+
+ background-color:;
+ background-color:;
+
diff --git a/modules/c1pjs/templates/components.xsl b/modules/c1pjs/templates/components.xsl
index 341955438..cc58caf46 100644
--- a/modules/c1pjs/templates/components.xsl
+++ b/modules/c1pjs/templates/components.xsl
@@ -14,6 +14,7 @@
c1pjs1.x.xwww.pcjs.org
+ #FAEBD7
@@ -142,7 +143,10 @@
overflow:auto;width:100%;
- background-color:;
+
+ background-color:;
+ background-color:;
+
diff --git a/modules/shared/templates/common.html b/modules/shared/templates/common.html
index 1e1a99bdf..e23401f6a 100644
--- a/modules/shared/templates/common.html
+++ b/modules/shared/templates/common.html
@@ -31,9 +31,10 @@
](/devices/pcx86/machine/5150/cga/64kb/donkey/ "IBM PC running DONKEY.BAS")
+ [
](/apps/pcx86/1981/donkey/ "IBM PC running DONKEY.BAS")
The latter is better for pure Markdown environments, but the former enables Jekyll to properly style screenshots.
diff --git a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
index 70e26480f..b9aae0081 100644
--- a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
+++ b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
@@ -1,6 +1,6 @@
-