diff --git a/_posts/2014-12-04-os2-10.md b/_posts/2014-12-04-os2-10.md
index a9a7ac151..c644f37a7 100644
--- a/_posts/2014-12-04-os2-10.md
+++ b/_posts/2014-12-04-os2-10.md
@@ -11,7 +11,7 @@ Exciting news for OS/2 fans: PCjs (v1.16.1) is now able to run OS/2 1.0 on
of recent work in PCjs to fully emulate the Intel 80286 processor and 16-bit protected-mode, including undocumented
features like [LOADALL](/pubs/pc/reference/intel/80286/loadall/) and triple-fault resets.
-For a quick demo, try the [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/). In a few seconds,
+For a quick demo, try the [OS/2 1.0 Debugger Disk](/disks/pc/os2/misc/1.0/88286/). In a few seconds,
you'll see a very rudimentary OS/2 shell (a slimmed-down version of the OS/2 Program Selector) that allows you to
start the protected-mode command interpreter ("Start a Program") or the real-mode command interpreter ("command.com").
@@ -20,7 +20,7 @@ start the protected-mode command interpreter ("Start a Program") or the real-mod
As an added bonus, the Model 5170 machines feature two serial ports, with COM1 connected to a simulated serial
mouse and COM2 connected to the **Control Panel** output window.
-Once you've booted the [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/) from the assortment of
+Once you've booted the [OS/2 1.0 Debugger Disk](/disks/pc/os2/misc/1.0/88286/) from the assortment of
[OS/2 Prototype Disks](/disks/pc/os2/misc/), you can click on the **Control Panel** output window, press Ctrl-C, and
find yourself magically transported into the OS/2 Kernel Debugger. The **Control Panel** display is functioning
as both the output window for all PCjs messages and PCjs Debugger commands, as well as a serial input/output device
diff --git a/_posts/2015-12-27-revisiting-os2.md b/_posts/2015-12-27-revisiting-os2.md
index a51f6d5a3..32771ff05 100644
--- a/_posts/2015-12-27-revisiting-os2.md
+++ b/_posts/2015-12-27-revisiting-os2.md
@@ -9,7 +9,7 @@ machines:
id: ibm5170
debugger: true
config: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
- drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210.json"}]'
+ drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210-EGA.json"}]'
automount: ''
---
diff --git a/apps/pc/1981/README.md b/apps/pc/1981/README.md
new file mode 100644
index 000000000..e0a7a0d68
--- /dev/null
+++ b/apps/pc/1981/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1981)
+permalink: /apps/pc/1981/
+---
+
+IBM PC Applications (1981)
+---
+
+* [VisiCalc (1981)](visicalc/)
diff --git a/apps/pc/1982/README.md b/apps/pc/1982/README.md
new file mode 100644
index 000000000..22d248d4c
--- /dev/null
+++ b/apps/pc/1982/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1982)
+permalink: /apps/pc/1982/
+---
+
+IBM PC Applications (1982)
+---
+
+* [Executive Suite (1982)](esuite/)
diff --git a/apps/pc/1985/README.md b/apps/pc/1985/README.md
new file mode 100644
index 000000000..6b0bdb97e
--- /dev/null
+++ b/apps/pc/1985/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1985)
+permalink: /apps/pc/1985/
+---
+
+IBM PC Applications (1985)
+---
+
+* [Rogue (1985)](rogue/)
diff --git a/apps/pc/1987/README.md b/apps/pc/1987/README.md
new file mode 100644
index 000000000..55195a449
--- /dev/null
+++ b/apps/pc/1987/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1987)
+permalink: /apps/pc/1987/
+---
+
+IBM PC Applications (1987)
+---
+
+* [ThinkTank (1987)](thinktank/)
diff --git a/apps/pc/1988/README.md b/apps/pc/1988/README.md
new file mode 100644
index 000000000..22e147821
--- /dev/null
+++ b/apps/pc/1988/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1988)
+permalink: /apps/pc/1988/
+---
+
+IBM PC Applications (1988)
+---
+
+* The Dungeons of Moria (1988)
diff --git a/apps/pc/1988/moria/README.md b/apps/pc/1988/moria/README.md
index 6ac01e844..7172cf6e8 100644
--- a/apps/pc/1988/moria/README.md
+++ b/apps/pc/1988/moria/README.md
@@ -1,9 +1,8 @@
---
layout: page
-title: "The Dungeons of Moria (1988)"
+title: The Dungeons of Moria (1988)
permalink: /apps/pc/1988/moria/
---
The Dungeons of Moria (1988)
---
-
diff --git a/apps/pc/1992/README.md b/apps/pc/1992/README.md
new file mode 100644
index 000000000..22c9fcc7b
--- /dev/null
+++ b/apps/pc/1992/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC Applications (1992)
+permalink: /apps/pc/1992/
+---
+
+IBM PC Applications (1992)
+---
+
+* [The Dungeons of Moria (1992)](moria/)
diff --git a/devices/README.md b/devices/README.md
index 19afa9f64..21ccdbb68 100644
--- a/devices/README.md
+++ b/devices/README.md
@@ -2,6 +2,8 @@
layout: page
title: Device Configurations
permalink: /devices/
+redirect_from:
+ - /configs/
---
Device Configurations
diff --git a/devices/c1p/machine/32kb/machine.md b/devices/c1p/machine/32kb/machine.md
index b8dce3c0e..75de11f90 100644
--- a/devices/c1p/machine/32kb/machine.md
+++ b/devices/c1p/machine/32kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (32Kb) with Disk Support"
+title: OSI Challenger 1P (32Kb) with Disk Support
permalink: /devices/c1p/machine/32kb/
machines:
- type: c1p-dbg
diff --git a/devices/c1p/machine/8kb/all/debugger/machine.md b/devices/c1p/machine/8kb/all/debugger/machine.md
index 2dcd36300..717d2299e 100644
--- a/devices/c1p/machine/8kb/all/debugger/machine.md
+++ b/devices/c1p/machine/8kb/all/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Additional Software"
+title: OSI Challenger 1P (8Kb) with Additional Software
permalink: /devices/c1p/machine/8kb/all/debugger/
machines:
- type: c1p-dbg
diff --git a/devices/c1p/machine/8kb/all/machine.md b/devices/c1p/machine/8kb/all/machine.md
index 054e89d13..d8d3a5377 100644
--- a/devices/c1p/machine/8kb/all/machine.md
+++ b/devices/c1p/machine/8kb/all/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Additional Software"
+title: OSI Challenger 1P (8Kb) with Additional Software
permalink: /devices/c1p/machine/8kb/all/
machines:
- type: c1p
diff --git a/devices/c1p/machine/8kb/embed/machine.md b/devices/c1p/machine/8kb/embed/machine.md
index d2466e3e1..a9b247f4c 100644
--- a/devices/c1p/machine/8kb/embed/machine.md
+++ b/devices/c1p/machine/8kb/embed/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Small Display"
+title: OSI Challenger 1P (8Kb) with Small Display
permalink: /devices/c1p/machine/8kb/embed/
machines:
- type: c1p
diff --git a/devices/c1p/machine/8kb/large/debugger/machine.md b/devices/c1p/machine/8kb/large/debugger/machine.md
index 3f244a931..12e85e61b 100644
--- a/devices/c1p/machine/8kb/large/debugger/machine.md
+++ b/devices/c1p/machine/8kb/large/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Large Display"
+title: OSI Challenger 1P (8Kb) with Large Display
permalink: /devices/c1p/machine/8kb/large/debugger/
machines:
- type: c1p-dbg
diff --git a/devices/c1p/machine/8kb/large/machine.md b/devices/c1p/machine/8kb/large/machine.md
index 32dae21a7..75c0147d3 100644
--- a/devices/c1p/machine/8kb/large/machine.md
+++ b/devices/c1p/machine/8kb/large/machine.md
@@ -1,12 +1,13 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Large Display"
+title: OSI Challenger 1P (8Kb) with Large Display
permalink: /devices/c1p/machine/8kb/large/
machines:
- type: c1p
id: c1p8kb
redirect_from:
- /configs/c1p/machines/8kb/large/
+ - /configs/c1p/machines/8kb/large/machine.xml/
---
{% include machine.html id="c1p8kb" %}
diff --git a/devices/c1p/machine/8kb/small/machine.md b/devices/c1p/machine/8kb/small/machine.md
index db37026ea..e07bfc716 100644
--- a/devices/c1p/machine/8kb/small/machine.md
+++ b/devices/c1p/machine/8kb/small/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OSI Challenger 1P (8Kb) with Small Display"
+title: OSI Challenger 1P (8Kb) with Small Display
permalink: /devices/c1p/machine/8kb/small/
machines:
- type: c1p
diff --git a/devices/pc/README.md b/devices/pc/README.md
index 832226a71..48c831286 100644
--- a/devices/pc/README.md
+++ b/devices/pc/README.md
@@ -2,6 +2,8 @@
layout: page
title: IBM PC Device Configurations
permalink: /devices/pc/
+redirect_from:
+ - /configs/pc/
---
IBM PC Device Configurations
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.md b/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
index b757f1d0a..c1bf6ed4e 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard"
+title: IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard
permalink: /devices/pc/machine/5150/cga/384kb/softkbd/
machines:
- type: pc
diff --git a/devices/pc/machine/5150/cga/64kb/README.md b/devices/pc/machine/5150/cga/64kb/README.md
index 925e8de74..d92fbfefd 100644
--- a/devices/pc/machine/5150/cga/64kb/README.md
+++ b/devices/pc/machine/5150/cga/64kb/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Color Display"
+title: IBM PC (Model 5150, 64Kb) with Color Display
permalink: /devices/pc/machine/5150/cga/64kb/
redirect_from:
- /configs/pc/machines/5150/cga/64kb/
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/README.md b/devices/pc/machine/5150/cga/64kb/donkey/README.md
index 3face4ab0..40fd950e5 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/README.md
+++ b/devices/pc/machine/5150/cga/64kb/donkey/README.md
@@ -4,6 +4,7 @@ title: IBM PC (Model 5150, 64Kb) with Color Display
permalink: /devices/pc/machine/5150/cga/64kb/donkey/
redirect_from:
- /configs/pc/machines/5150/cga/64kb/donkey/
+ - /demos/pc/donkey/
machines:
- type: pc
id: ibm5150
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
index 3cfaefb6e..8ffe251a4 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Color Display and Debugger"
+title: IBM PC (Model 5150, 64Kb) with Color Display and Debugger
permalink: /devices/pc/machine/5150/cga/64kb/donkey/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.md b/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
index 7de628311..b6bcf1436 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Color Display and Soft Keyboard"
+title: IBM PC (Model 5150, 64Kb) with Color Display and Soft Keyboard
permalink: /devices/pc/machine/5150/cga/64kb/softkbd/
machines:
- type: pc
diff --git a/devices/pc/machine/5150/cga/README.md b/devices/pc/machine/5150/cga/README.md
index 8c558b99c..673a31145 100644
--- a/devices/pc/machine/5150/cga/README.md
+++ b/devices/pc/machine/5150/cga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150) with Color Display"
+title: IBM PC (Model 5150) with Color Display
permalink: /devices/pc/machine/5150/cga/
redirect_from:
- /configs/pc/machines/5150/cga/
diff --git a/devices/pc/machine/5150/dual/64kb/machine.md b/devices/pc/machine/5150/dual/64kb/machine.md
index 40b4c1a56..d89a22130 100644
--- a/devices/pc/machine/5150/dual/64kb/machine.md
+++ b/devices/pc/machine/5150/dual/64kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Dual Displays"
+title: IBM PC (Model 5150, 64Kb) with Dual Displays
permalink: /devices/pc/machine/5150/dual/64kb/
machines:
- type: pc
diff --git a/devices/pc/machine/5150/dual/README.md b/devices/pc/machine/5150/dual/README.md
new file mode 100644
index 000000000..c4c43c59c
--- /dev/null
+++ b/devices/pc/machine/5150/dual/README.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: IBM PC (Model 5150) with Dual Displays
+permalink: /devices/pc/machine/5150/dual/
+redirect_from:
+ - /configs/pc/machines/5150/dual/
+---
+
+IBM PC with Dual Displays
+---
+
+* [IBM PC with Dual Displays (Monochrome and Color)](64kb/)
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.md b/devices/pc/machine/5150/mda/64kb/debugger/machine.md
index ff449be7a..e05d58b47 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.md
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.md
@@ -1,7 +1,9 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Monochrome Display and Debugger"
+title: IBM PC (Model 5150, 64Kb) with Monochrome Display and Debugger
permalink: /devices/pc/machine/5150/mda/64kb/debugger/
+redirect_from:
+ - /configs/pc/machines/5150/mda/64kb/debugger/
machines:
- type: pc
id: ibm5150
diff --git a/devices/pc/machine/5150/mda/64kb/machine.md b/devices/pc/machine/5150/mda/64kb/machine.md
index a991ae7de..bec77926c 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.md
+++ b/devices/pc/machine/5150/mda/64kb/machine.md
@@ -1,9 +1,11 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Monochrome Display"
+title: IBM PC (Model 5150, 64Kb) with Monochrome Display
permalink: /devices/pc/machine/5150/mda/64kb/
redirect_from:
- /configs/pc/machines/5150/mda/64kb/
+ - /configs/pc/machines/5150/mda/64kb/index.xml/
+ - /configs/pc/machines/5150/mda/64kb/machine.xml/
machines:
- type: pc
id: ibm5150
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.md b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
index 20d2b1a60..cb2ffd71b 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC (Model 5150, 64Kb) with Monochrome Display and Soft Keyboard"
+title: IBM PC (Model 5150, 64Kb) with Monochrome Display and Soft Keyboard
permalink: /devices/pc/machine/5150/mda/64kb/softkbd/
machines:
- type: pc
diff --git a/devices/pc/machine/5150/mda/README.md b/devices/pc/machine/5150/mda/README.md
index 3431840cf..4a90406bf 100644
--- a/devices/pc/machine/5150/mda/README.md
+++ b/devices/pc/machine/5150/mda/README.md
@@ -1,7 +1,9 @@
---
layout: page
-title: IBM PC Machines (Model 5150) with Monochrome (MDA) Display
+title: IBM PC (Model 5150) with Monochrome (MDA) Display
permalink: /devices/pc/machine/5150/mda/
+redirect_from:
+ - /configs/pc/machines/5150/mda/
machines:
- type: pc
id: ibm5150
diff --git a/devices/pc/machine/5160/cga/256kb/array/README.md b/devices/pc/machine/5160/cga/256kb/array/README.md
index a832a5e62..6e9bfb974 100644
--- a/devices/pc/machine/5160/cga/256kb/array/README.md
+++ b/devices/pc/machine/5160/cga/256kb/array/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with CGA Displays"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with CGA Displays
permalink: /devices/pc/machine/5160/cga/256kb/array/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/cga/256kb/demo/README.md b/devices/pc/machine/5160/cga/256kb/demo/README.md
index a2db483e2..6a145b812 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/README.md
+++ b/devices/pc/machine/5160/cga/256kb/demo/README.md
@@ -1,7 +1,9 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display
permalink: /devices/pc/machine/5160/cga/256kb/demo/
+redirect_from:
+ - /configs/pc/machines/5160/cga/256kb/demo/
machines:
- type: pc
id: ibm5160
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
index 61ac5f06b..76ec51e13 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
@@ -1,7 +1,9 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger
permalink: /devices/pc/machine/5160/cga/256kb/demo/debugger/
+redirect_from:
+ - /configs/pc/machines/5160/cga/256kb/demo/debugger/
machines:
- type: pc
id: ibm5160
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.md b/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
index abc1a864d..5ac0913ae 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard
permalink: /devices/pc/machine/5160/cga/256kb/softkbd/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md
index a6b96a37f..559288177 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/README.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/README.md
@@ -1,9 +1,10 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Windows 1.01"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Windows 1.01
permalink: /devices/pc/machine/5160/cga/256kb/win101/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/win101/
+ - /configs/pc/machines/5160/cga/256kb/win101/machine.xml/
- /demos/pc/cga-win101/xt-cga-win101.xml/
- /demos/pc/cga-win101/
machines:
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md b/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
index ab13af023..6b879ffea 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01
permalink: /devices/pc/machine/5160/cga/256kb/win101/debugger/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/win101/debugger/
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
index 02c4a807d..87d3d67ca 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
@@ -1,7 +1,10 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01
permalink: /devices/pc/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: pc
id: ibm5160
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
index 41fe9dca7..4344d7468 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
@@ -1,7 +1,11 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
+title: IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01
permalink: /devices/pc/machine/5160/cga/512kb/win101/softkbd/
+redirect_from:
+ - /configs/pc/machines/5160/cga/512kb/win101/softkbd/
+ - /devices/pc/machine/5160/cga/512kb/
+ - /devices/pc/machine/5160/cga/512kb/win101/
machines:
- type: pc
id: ibm5160
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.md b/devices/pc/machine/5160/cga/640kb/debugger/machine.md
index 68378a222..4013ca171 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.md
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Debugger"
+title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Debugger
permalink: /devices/pc/machine/5160/cga/640kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/cga/640kb/machine.md b/devices/pc/machine/5160/cga/640kb/machine.md
index 038384979..ee7f173e4 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.md
+++ b/devices/pc/machine/5160/cga/640kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display"
+title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display
permalink: /devices/pc/machine/5160/cga/640kb/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/cga/640kb/softkbd/machine.md b/devices/pc/machine/5160/cga/640kb/softkbd/machine.md
index cf9df28b7..3124aed91 100644
--- a/devices/pc/machine/5160/cga/640kb/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/640kb/softkbd/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Soft Keyboard"
+title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Soft Keyboard
permalink: /devices/pc/machine/5160/cga/640kb/softkbd/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/cga/README.md b/devices/pc/machine/5160/cga/README.md
index e62b698d2..87b97f29f 100644
--- a/devices/pc/machine/5160/cga/README.md
+++ b/devices/pc/machine/5160/cga/README.md
@@ -1,7 +1,9 @@
---
layout: page
-title: "IBM PC (Model 5160) with Color Display"
+title: IBM PC (Model 5160) with Color Display
permalink: /devices/pc/machine/5160/cga/
+redirect_from:
+ - /configs/pc/machines/5160/cga/
---
IBM PC XT with Color Graphics (CGA) Display
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.md b/devices/pc/machine/5160/ega/256kb/debugger/machine.md
index fa1b0c8b2..27dae3a31 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.md
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display and Debugger"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display and Debugger
permalink: /devices/pc/machine/5160/ega/256kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/ega/256kb/machine.md b/devices/pc/machine/5160/ega/256kb/machine.md
index 84121a655..cd98e7537 100644
--- a/devices/pc/machine/5160/ega/256kb/machine.md
+++ b/devices/pc/machine/5160/ega/256kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display
permalink: /devices/pc/machine/5160/ega/256kb/
redirect_from:
- /configs/pc/machines/5160/ega/256kb/
diff --git a/devices/pc/machine/5160/ega/640kb/array/README.md b/devices/pc/machine/5160/ega/640kb/array/README.md
index 2d1fb6e9b..9d62dbf3c 100644
--- a/devices/pc/machine/5160/ega/640kb/array/README.md
+++ b/devices/pc/machine/5160/ega/640kb/array/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with EGA Displays"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with EGA Displays
permalink: /devices/pc/machine/5160/ega/640kb/array/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.md b/devices/pc/machine/5160/ega/640kb/debugger/machine.md
index 5431b2035..8d065fa7c 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.md
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger"
+title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger
permalink: /devices/pc/machine/5160/ega/640kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/ega/640kb/machine.md b/devices/pc/machine/5160/ega/640kb/machine.md
index d7d6a3ee6..cbbf978ed 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.md
+++ b/devices/pc/machine/5160/ega/640kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display"
+title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display
permalink: /devices/pc/machine/5160/ega/640kb/
redirect_from:
- /configs/pc/machines/5160/ega/640kb/
diff --git a/devices/pc/machine/5160/ega/README.md b/devices/pc/machine/5160/ega/README.md
index 71aec1d93..5574a3472 100644
--- a/devices/pc/machine/5160/ega/README.md
+++ b/devices/pc/machine/5160/ega/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160) with Enhanced Color Display"
+title: IBM PC XT (Model 5160) with Enhanced Color Display
permalink: /devices/pc/machine/5160/ega/
---
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.md b/devices/pc/machine/5160/mda/256kb/debugger/machine.md
index 6af02b4f6..68780500f 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger
permalink: /devices/pc/machine/5160/mda/256kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
index 04a45dc58..04e0fc163 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display and Debugger"
+title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display and Debugger
permalink: /devices/pc/machine/5160/mda/256kb/fake188/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.md b/devices/pc/machine/5160/mda/256kb/fake188/machine.md
index af85f5a25..b4fc3fa8a 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display"
+title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display
permalink: /devices/pc/machine/5160/mda/256kb/fake188/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/mda/256kb/machine.md b/devices/pc/machine/5160/mda/256kb/machine.md
index 3c953214f..12e16d81c 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display"
+title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display
permalink: /devices/pc/machine/5160/mda/256kb/
machines:
- type: pc
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.md b/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
index 1865daec1..ae3d98a89 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
@@ -1,7 +1,10 @@
---
layout: page
-title: "IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard"
+title: IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard
permalink: /devices/pc/machine/5160/mda/64kb/softkbd/
+redirect_from:
+ - /devices/pc/machine/5160/mda/64kb/
+ - /configs/pc/machines/5160/mda/64kb/softkbd/index.xml/
machines:
- type: pc
id: ibm5160
diff --git a/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md
index 65e7872ed..df52c1d71 100644
--- a/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md
+++ b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with CGA Display"
+title: IBM PC AT (Model 5170, 640Kb) with CGA Display
permalink: /devices/pc/machine/5170/cga/640kb/rev3/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/cga/640kb/rev3/machine.md b/devices/pc/machine/5170/cga/640kb/rev3/machine.md
index 41b6e9d9a..df41565b3 100644
--- a/devices/pc/machine/5170/cga/640kb/rev3/machine.md
+++ b/devices/pc/machine/5170/cga/640kb/rev3/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with CGA Display"
+title: IBM PC AT (Model 5170, 640Kb) with CGA Display
permalink: /devices/pc/machine/5170/cga/640kb/rev3/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/cga/README.md b/devices/pc/machine/5170/cga/README.md
index cfaa16486..ef2c45285 100644
--- a/devices/pc/machine/5170/cga/README.md
+++ b/devices/pc/machine/5170/cga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170) with Color Display"
+title: IBM PC AT (Model 5170) with Color Display
permalink: /devices/pc/machine/5170/cga/
---
diff --git a/devices/pc/machine/5170/ega/1152kb/README.md b/devices/pc/machine/5170/ega/1152kb/README.md
new file mode 100644
index 000000000..b1283ed25
--- /dev/null
+++ b/devices/pc/machine/5170/ega/1152kb/README.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: IBM PC AT (Model 5170) with Enhanced Color Display
+permalink: /devices/pc/machine/5170/ega/1152kb/
+redirect_from:
+ - /configs/pc/machines/5170/ega/1152kb/
+---
+
+IBM PC AT with 1Mb RAM and Enhanced Color Graphics (EGA) Display
+---
+
+* [IBM PC AT (6Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev1/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/))
+* [IBM PC AT (8Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/))
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md
index f2dc78165..3abf4fdfa 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/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) with EGA Display and 20Mb Hard Disk
permalink: /devices/pc/machine/5170/ega/1152kb/rev1/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/machine.md
index 1092a629c..7cf9a7839 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/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) with EGA Display and 20Mb Hard Disk
permalink: /devices/pc/machine/5170/ega/1152kb/rev1/
redirect_from:
- /configs/pc/machines/5170/ega/1152kb/rev1/
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
index 79c83c41f..d01cb0427 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger"
+title: IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger
permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/
machines:
- type: pc
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 e6607dce6..8f0608b92 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, 20Mb Drive) with EGA Display and Debugger"
+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/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/machine.md
index 819b43680..a331c8c38 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display"
+title: IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display
permalink: /devices/pc/machine/5170/ega/1152kb/rev3/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/ega/2048kb/README.md b/devices/pc/machine/5170/ega/2048kb/README.md
new file mode 100644
index 000000000..365fa3683
--- /dev/null
+++ b/devices/pc/machine/5170/ega/2048kb/README.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: IBM PC AT (Model 5170) with Enhanced Color Display
+permalink: /devices/pc/machine/5170/ega/2048kb/
+redirect_from:
+ - /configs/pc/machines/5170/ega/2048kb/
+---
+
+IBM PC AT with 2Mb RAM and Enhanced Color Graphics (EGA) Display
+---
+
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/))
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md
index 47c63e062..e585712c5 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with EGA Display and Debugger"
+title: IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with EGA Display and Debugger
permalink: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/
machines:
- type: pc
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 8f9502096..4312e8c6a 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, 2Mb20Mb Hard Disk) with EGA Display and Debugger"
+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 d7fb6bf54..2a60c991d 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, 20Mb Hard Disk) with EGA Display"
+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/ega/640kb/README.md b/devices/pc/machine/5170/ega/640kb/README.md
new file mode 100644
index 000000000..ec8467722
--- /dev/null
+++ b/devices/pc/machine/5170/ega/640kb/README.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: IBM PC AT (Model 5170) with Enhanced Color Display
+permalink: /devices/pc/machine/5170/ega/640kb/
+redirect_from:
+ - /configs/pc/machines/5170/ega/640kb/
+---
+
+IBM PC AT with 640Kb RAM and Enhanced Color Graphics (EGA) Display
+---
+
+* [IBM PC AT (6Mhz, 640Kb, Dual Floppy) with EGA Display](/devices/pc/machine/5170/ega/640kb/rev1/) ([Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/))
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
index b39328195..0aa423b9f 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with EGA Display"
+title: IBM PC AT (Model 5170, 640Kb) with EGA Display
permalink: /devices/pc/machine/5170/ega/640kb/rev1/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.md b/devices/pc/machine/5170/ega/640kb/rev1/machine.md
index 98727f986..a2392d8b9 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.md
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with EGA Display"
+title: IBM PC AT (Model 5170, 640Kb) with EGA Display
permalink: /devices/pc/machine/5170/ega/640kb/rev1/
redirect_from:
- /configs/pc/machines/5170/ega/640kb/
diff --git a/devices/pc/machine/5170/ega/README.md b/devices/pc/machine/5170/ega/README.md
index 1ec8e1dd3..c16f565c5 100644
--- a/devices/pc/machine/5170/ega/README.md
+++ b/devices/pc/machine/5170/ega/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170) with Enhanced Color Display"
+title: IBM PC AT (Model 5170) with Enhanced Color Display
permalink: /devices/pc/machine/5170/ega/
redirect_from:
- /configs/pc/machines/5170/ega/
diff --git a/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md
index e28542640..9c23c6d2f 100644
--- a/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md
+++ b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with MDA Display"
+title: IBM PC AT (Model 5170, 640Kb) with MDA Display
permalink: /devices/pc/machine/5170/mda/640kb/rev3/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/mda/640kb/rev3/machine.md b/devices/pc/machine/5170/mda/640kb/rev3/machine.md
index 7fae8003d..c10458a15 100644
--- a/devices/pc/machine/5170/mda/640kb/rev3/machine.md
+++ b/devices/pc/machine/5170/mda/640kb/rev3/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 640Kb) with MDA Display"
+title: IBM PC AT (Model 5170, 640Kb) with MDA Display
permalink: /devices/pc/machine/5170/mda/640kb/rev3/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/mda/README.md b/devices/pc/machine/5170/mda/README.md
index f621636d9..847143246 100644
--- a/devices/pc/machine/5170/mda/README.md
+++ b/devices/pc/machine/5170/mda/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170) with Monochrome Display"
+title: IBM PC AT (Model 5170) with Monochrome Display
permalink: /devices/pc/machine/5170/mda/
---
diff --git a/devices/pc/machine/5170/vga/2048kb/debugger/machine.md b/devices/pc/machine/5170/vga/2048kb/debugger/machine.md
index 8d65249a6..71e4a55f5 100644
--- a/devices/pc/machine/5170/vga/2048kb/debugger/machine.md
+++ b/devices/pc/machine/5170/vga/2048kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display and Debugger"
+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
diff --git a/devices/pc/machine/5170/vga/2048kb/machine.md b/devices/pc/machine/5170/vga/2048kb/machine.md
index 9cb572e10..50041260a 100644
--- a/devices/pc/machine/5170/vga/2048kb/machine.md
+++ b/devices/pc/machine/5170/vga/2048kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display"
+title: IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display
permalink: /devices/pc/machine/5170/vga/2048kb/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/vga/4096kb/debugger/machine.md b/devices/pc/machine/5170/vga/4096kb/debugger/machine.md
index 49bbd29d5..e5767e76a 100644
--- a/devices/pc/machine/5170/vga/4096kb/debugger/machine.md
+++ b/devices/pc/machine/5170/vga/4096kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display and Debugger"
+title: IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display and Debugger
permalink: /devices/pc/machine/5170/vga/4096kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/vga/4096kb/machine.md b/devices/pc/machine/5170/vga/4096kb/machine.md
index c189f1aca..7039402e7 100644
--- a/devices/pc/machine/5170/vga/4096kb/machine.md
+++ b/devices/pc/machine/5170/vga/4096kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display"
+title: IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display
permalink: /devices/pc/machine/5170/vga/4096kb/
machines:
- type: pc
diff --git a/devices/pc/machine/5170/vga/README.md b/devices/pc/machine/5170/vga/README.md
index 0a3bffe71..419e73011 100644
--- a/devices/pc/machine/5170/vga/README.md
+++ b/devices/pc/machine/5170/vga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM PC AT (Model 5170) with VGA Display"
+title: IBM PC AT (Model 5170) with VGA Display
permalink: /devices/pc/machine/5170/vga/
---
diff --git a/devices/pc/machine/att/6300/cga/640kb/debugger/machine.md b/devices/pc/machine/att/6300/cga/640kb/debugger/machine.md
index 01ee96f55..965dbcc82 100644
--- a/devices/pc/machine/att/6300/cga/640kb/debugger/machine.md
+++ b/devices/pc/machine/att/6300/cga/640kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "AT&T Personal Computer 6300 with Color Display"
+title: AT&T Personal Computer 6300 with Color Display
permalink: /devices/pc/machine/att/6300/cga/640kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/att/6300/cga/640kb/machine.md b/devices/pc/machine/att/6300/cga/640kb/machine.md
index bb04f179c..7552787ac 100644
--- a/devices/pc/machine/att/6300/cga/640kb/machine.md
+++ b/devices/pc/machine/att/6300/cga/640kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "AT&T Personal Computer 6300 with Color Display"
+title: AT&T Personal Computer 6300 with Color Display
permalink: /devices/pc/machine/att/6300/cga/640kb/
machines:
- type: pc
diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.md b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.md
index d2281c3b3..d0c3f9d93 100644
--- a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.md
+++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Columbia Data Products MPC 1600 with Color Display and Debugger"
+title: Columbia Data Products MPC 1600 with Color Display and Debugger
permalink: /devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.md b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.md
index 99d37fee3..e9500ba06 100644
--- a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.md
+++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Columbia Data Products MPC 1600 with Color Display"
+title: Columbia Data Products MPC 1600 with Color Display
permalink: /devices/pc/machine/cdp/mpc1600/cga/640kb/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/README.md b/devices/pc/machine/compaq/deskpro386/README.md
index 82bc12e46..74bb213d7 100644
--- a/devices/pc/machine/compaq/deskpro386/README.md
+++ b/devices/pc/machine/compaq/deskpro386/README.md
@@ -7,8 +7,8 @@ permalink: /devices/pc/machine/compaq/deskpro386/
COMPAQ DeskPro 386 Machines
---
-* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ EGA](ega/2048kb/) ([Debugger](ega/2048kb/debugger/))
-* [COMPAQ DeskPro 386 with 4Mb RAM and COMPAQ EGA](ega/4096kb/) ([Debugger](ega/4096kb/debugger/))
+* [COMPAQ DeskPro 386 with 2Mb RAM and IBM EGA](ega/2048kb/) ([Debugger](ega/2048kb/debugger/))
+* [COMPAQ DeskPro 386 with 4Mb RAM and IBM EGA](ega/4096kb/) ([Debugger](ega/4096kb/debugger/))
* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ VGA (Debugger)](other/2048kb/debugger/),([Backtrack](other/2048kb/debugger/backtrack/))
* [COMPAQ DeskPro 386 with 2Mb RAM and IBM VGA](vga/2048kb/) ([Debugger](vga/2048kb/debugger/))
* [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA](vga/4096kb/) ([Debugger](vga/4096kb/debugger/))
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md
index 30037320a..7a9e11994 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA"
+title: COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA
permalink: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
index 70f34ad19..71297657e 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA"
+title: COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA
permalink: /devices/pc/machine/compaq/deskpro386/ega/2048kb/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md
index 57292eae9..3e7b90a25 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA"
+title: COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA
permalink: /devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
index de8a9ff0d..3a7bba4ae 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA"
+title: COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA
permalink: /devices/pc/machine/compaq/deskpro386/ega/4096kb/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/ega/README.md b/devices/pc/machine/compaq/deskpro386/ega/README.md
new file mode 100644
index 000000000..f2dc88354
--- /dev/null
+++ b/devices/pc/machine/compaq/deskpro386/ega/README.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: COMPAQ DeskPro 386 Machines with IBM EGA
+permalink: /devices/pc/machine/compaq/deskpro386/ega/
+---
+
+COMPAQ DeskPro 386 Machines with IBM EGA
+---
+
+* [COMPAQ DeskPro 386 with 2Mb RAM and IBM EGA](2048kb/) ([Debugger](2048kb/debugger/))
+* [COMPAQ DeskPro 386 with 4Mb RAM and IBM EGA](4096kb/) ([Debugger](4096kb/debugger/))
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md
index 1da6f82d2..fbde5d72c 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA"
+title: COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA
permalink: /devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.md
index 62f725914..dfbd4ba0e 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA"
+title: COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA
permalink: /devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/other/README.md b/devices/pc/machine/compaq/deskpro386/other/README.md
new file mode 100644
index 000000000..4c0987eb1
--- /dev/null
+++ b/devices/pc/machine/compaq/deskpro386/other/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: COMPAQ DeskPro 386 Machines with COMPAQ VGA
+permalink: /devices/pc/machine/compaq/deskpro386/other/
+---
+
+COMPAQ DeskPro 386 Machines with COMPAQ VGA
+---
+
+* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ VGA (Debugger)](2048kb/debugger/),([Backtrack](2048kb/debugger/backtrack/))
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md
index c03efe424..ce55c8fdf 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with IBM VGA"
+title: COMPAQ DeskPro 386 (2Mb) with IBM VGA
permalink: /devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
index 95304ea5d..939180d94 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (2Mb) with IBM VGA"
+title: COMPAQ DeskPro 386 (2Mb) with IBM VGA
permalink: /devices/pc/machine/compaq/deskpro386/vga/2048kb/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md
index 0a5f4380f..c93261975 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (4Mb) with IBM VGA"
+title: COMPAQ DeskPro 386 (4Mb) with IBM VGA
permalink: /devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.md b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.md
index 5a6261da8..10e23bc7e 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ DeskPro 386 (4Mb) with IBM VGA"
+title: COMPAQ DeskPro 386 (4Mb) with IBM VGA
permalink: /devices/pc/machine/compaq/deskpro386/vga/4096kb/
machines:
- type: pc
diff --git a/devices/pc/machine/compaq/deskpro386/vga/README.md b/devices/pc/machine/compaq/deskpro386/vga/README.md
new file mode 100644
index 000000000..f2c9522ea
--- /dev/null
+++ b/devices/pc/machine/compaq/deskpro386/vga/README.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: COMPAQ DeskPro 386 Machines with IBM VGA
+permalink: /devices/pc/machine/compaq/deskpro386/vga/
+---
+
+COMPAQ DeskPro 386 Machines with IBM VGA
+---
+
+* [COMPAQ DeskPro 386 with 2Mb RAM and IBM VGA](vga/2048kb/) ([Debugger](vga/2048kb/debugger/))
+* [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA](vga/4096kb/) ([Debugger](vga/4096kb/debugger/))
+* [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA running Windows 95](/disks/pc/windows/win95/4.00.950/) ([Debugger](/disks/pc/windows/win95/4.00.950/debugger/))
diff --git a/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.md b/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.md
index 1d89fafc1..9912f4d9e 100644
--- a/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.md
+++ b/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Zenith Z-150 with Color Display and Debugger"
+title: Zenith Z-150 with Color Display and Debugger
permalink: /devices/pc/machine/zenith/z150/cga/640kb/debugger/
machines:
- type: pc
diff --git a/devices/pc/machine/zenith/z150/cga/640kb/machine.md b/devices/pc/machine/zenith/z150/cga/640kb/machine.md
index 1476bd8c5..10d5d81ca 100644
--- a/devices/pc/machine/zenith/z150/cga/640kb/machine.md
+++ b/devices/pc/machine/zenith/z150/cga/640kb/machine.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Zenith Z-150 with Color Display"
+title: Zenith Z-150 with Color Display
permalink: /devices/pc/machine/zenith/z150/cga/640kb/
machines:
- type: pc
diff --git a/devices/pc/rom/compaq/deskpro386/README.md b/devices/pc/rom/compaq/deskpro386/README.md
index eceedadec..a25ebbf85 100644
--- a/devices/pc/rom/compaq/deskpro386/README.md
+++ b/devices/pc/rom/compaq/deskpro386/README.md
@@ -3,6 +3,7 @@ layout: page
title: COMPAQ DeskPro 386 ROMs
permalink: /devices/pc/rom/compaq/deskpro386/
redirect_from:
+ - /devices/pc/bios/compaq/deskpro386/
- /devices/pc/compaq/deskpro386/
- /devices/pc/rom/compaq/bios/deskpro386/
---
diff --git a/devices/pc/video/ati/vga/README.md b/devices/pc/video/ati/vga/README.md
index b3c3aee3a..491d75c12 100644
--- a/devices/pc/video/ati/vga/README.md
+++ b/devices/pc/video/ati/vga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "ATI VGA Wonder-16"
+title: ATI VGA Wonder-16
permalink: /devices/pc/video/ati/vga/
---
diff --git a/devices/pc/video/cdp/cga/README.md b/devices/pc/video/cdp/cga/README.md
index 57e3c1f05..49396dc68 100644
--- a/devices/pc/video/cdp/cga/README.md
+++ b/devices/pc/video/cdp/cga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Columbia Data Products Color Graphics Adapter (CGA)"
+title: Columbia Data Products Color Graphics Adapter (CGA)
permalink: /devices/pc/video/cdp/cga/
---
diff --git a/devices/pc/video/compaq/README.md b/devices/pc/video/compaq/README.md
new file mode 100644
index 000000000..6065dcedb
--- /dev/null
+++ b/devices/pc/video/compaq/README.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: COMPAQ Video Adapters
+permalink: /devices/pc/video/compaq/
+---
+
+COMPAQ Video Adapters
+---
+
+* [COMPAQ EGA](ega/)
+* [COMPAQ VGA](vga/)
diff --git a/devices/pc/video/compaq/ega/README.md b/devices/pc/video/compaq/ega/README.md
index 5e987f870..9e0b1ba02 100644
--- a/devices/pc/video/compaq/ega/README.md
+++ b/devices/pc/video/compaq/ega/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ Enhanced Color Graphics Board (EGA)"
+title: COMPAQ Enhanced Color Graphics Board (EGA)
permalink: /devices/pc/video/compaq/ega/
---
diff --git a/devices/pc/video/compaq/vga/README.md b/devices/pc/video/compaq/vga/README.md
index e7893205c..70559fc01 100644
--- a/devices/pc/video/compaq/vga/README.md
+++ b/devices/pc/video/compaq/vga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "COMPAQ Video Graphics Controller (VGA)"
+title: COMPAQ Video Graphics Controller (VGA)
permalink: /devices/pc/video/compaq/vga/
---
diff --git a/devices/pc/video/ibm/ega/README.md b/devices/pc/video/ibm/ega/README.md
index 6ab43f050..0a16d2176 100644
--- a/devices/pc/video/ibm/ega/README.md
+++ b/devices/pc/video/ibm/ega/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM Enhanced Graphics Adapter (EGA)"
+title: IBM Enhanced Graphics Adapter (EGA)
permalink: /devices/pc/video/ibm/ega/
---
diff --git a/devices/pc/video/ibm/vga/README.md b/devices/pc/video/ibm/vga/README.md
index 0655a49f9..2e7925154 100644
--- a/devices/pc/video/ibm/vga/README.md
+++ b/devices/pc/video/ibm/vga/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "IBM Video Graphics Array (VGA)"
+title: IBM Video Graphics Array (VGA)
permalink: /devices/pc/video/ibm/vga/
---
diff --git a/devices/pc/video/paradise/README.md b/devices/pc/video/paradise/README.md
new file mode 100644
index 000000000..70d32437b
--- /dev/null
+++ b/devices/pc/video/paradise/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Paradise Video Adapters
+permalink: /devices/pc/video/paradise/
+---
+
+Paraside Video Adapters
+---
+
+* [Paradise VGA](vga/)
diff --git a/disks/pc/README.md b/disks/pc/README.md
index aadfb34d6..52513960c 100644
--- a/disks/pc/README.md
+++ b/disks/pc/README.md
@@ -4,6 +4,8 @@ title: IBM PC Disk Library
menu_title: Disks
menu_order: 4
permalink: /disks/pc/
+redirect_from:
+ - /configs/pc/disks/
---
IBM PC Disk Library
@@ -43,15 +45,15 @@ computer diagnostics, programming tools, and more.
### Games
* [id Software](games/id/)
-* [Infocom](games/infocom/)
-* [Microsoft](games/microsoft/)
+* [Infocom Games](games/infocom/)
+* [Microsoft Games](games/microsoft/)
### Tools
* [Borland Tools](tools/borland/)
* [IBM PC Diagnostics](diags/ibm/)
* [Microsoft Tools](tools/microsoft/)
-* [Other](tools/misc/)
+* [Other Tools](tools/misc/)
### Tests
diff --git a/disks/pc/cpm/1.1b/machine.md b/disks/pc/cpm/1.1b/machine.md
index 225782589..11f54922c 100644
--- a/disks/pc/cpm/1.1b/machine.md
+++ b/disks/pc/cpm/1.1b/machine.md
@@ -2,6 +2,8 @@
layout: page
title: "IBM PC (Model 5150) running CP/M-86 v1.1B"
permalink: /disks/pc/cpm/1.1b/
+redirect_from:
+ - /disks/pc/cpm/machine.xml/
machines:
- type: pc
id: ibm5150
diff --git a/disks/pc/dos/microsoft/3.30/README.md b/disks/pc/dos/microsoft/3.30/README.md
index 2ed8bb47b..decea7df2 100644
--- a/disks/pc/dos/microsoft/3.30/README.md
+++ b/disks/pc/dos/microsoft/3.30/README.md
@@ -2,6 +2,8 @@
layout: page
title: Microsoft MS-DOS 3.30
permalink: /disks/pc/dos/microsoft/3.30/
+redirect_from:
+ - /disks/pc/dos/microsoft/3.30a/
---
Microsoft MS-DOS 3.30
diff --git a/disks/pc/fixed/10mb/README.md b/disks/pc/fixed/10mb/README.md
index 8df8aec29..29015fafa 100644
--- a/disks/pc/fixed/10mb/README.md
+++ b/disks/pc/fixed/10mb/README.md
@@ -1,22 +1,25 @@
---
layout: page
-title: 10Mb Disk Image with Windows 1.01
+title: 10Mb Hard Drive (Fixed Disk) Images
permalink: /disks/pc/fixed/10mb/
---
-10Mb Disk Image with Windows 1.01
+10Mb Hard Drive (Fixed Disk) Images
---
-This folder contains a 10Mb hard disk image ([pcdos200-win101.json](pcdos200-win101.json)) with a Windows 1.01 installation.
+This folder contains the following 10Mb disk images:
+
+* PC-DOS 2.00 with Windows 1.01 for CGA ([PCDOS200-WIN101-CGA](pcdos200-win101-cga.xml))
+* PC-DOS 2.00 with Windows 1.01 for EGA ([PCDOS200-WIN101-EGA](pcdos200-win101-ega.xml))
-This disk image is used by various [Model 5160 CGA](/devices/pc/machine/5160/cga/) machine configurations.
+These disk images are used by various [Model 5160](/devices/pc/machine/5160/) machine configurations.
-To use it with a machine configuration, include:
+To use one of these disks with another machine configuration, include:
-
+
-in your machine.xml file. Alternatively, you can include it by reference:
+in the *machine.xml* file. Alternatively, you can include it by reference:
-
+
Of course, if your machine configuration file is on a different server, the *ref* path will likely be different.
diff --git a/disks/pc/fixed/20mb/IBMOS210.json b/disks/pc/fixed/20mb/IBMOS210-EGA.json
similarity index 100%
rename from disks/pc/fixed/20mb/IBMOS210.json
rename to disks/pc/fixed/20mb/IBMOS210-EGA.json
diff --git a/disks/pc/fixed/20mb/IBMOS211.json b/disks/pc/fixed/20mb/IBMOS211-VGA.json
similarity index 100%
rename from disks/pc/fixed/20mb/IBMOS211.json
rename to disks/pc/fixed/20mb/IBMOS211-VGA.json
diff --git a/disks/pc/fixed/20mb/README.md b/disks/pc/fixed/20mb/README.md
new file mode 100644
index 000000000..553dbfc7c
--- /dev/null
+++ b/disks/pc/fixed/20mb/README.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: 20Mb Hard Drive (Fixed Disk) Images
+permalink: /disks/pc/fixed/20mb/
+---
+
+20Mb Hard Drive (Fixed Disk) Images
+---
+
+This folder contains the following 20Mb disk images:
+
+* COMPAQ MS-DOS 3.10 with Windows/386 2.01 for VGA (COMPAQ310-WIN386201-VGA.json)
+* IBM OS/2 1.0 for EGA (IBMOS210-EGA.json)
+* IBM OS/2 1.1 for VGA (IBMOS211-VGA.json)
+* PC-DOS 3.20 with Windows 3.00 for EGA (PCDOS320-WIN300-EGA.json)
+* PC-DOS 3.30 with no files ([PCDOS330-EMPTY](pcdos330-empty.xml))
+* PC-DOS 3.30 with Windows 3.10 for VGA (PCDOS330-WIN310-VGA.json)
diff --git a/disks/pc/fixed/README.md b/disks/pc/fixed/README.md
new file mode 100644
index 000000000..293a8a071
--- /dev/null
+++ b/disks/pc/fixed/README.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: PC Hard Drive (Fixed Disk) Images
+permalink: /disks/pc/fixed/
+---
+
+PC Hard Drive (Fixed Disk) Images
+---
+
+Pre-built fixed disk images with the following sizes are available:
+
+* [10Mb](10mb/)
+* [20Mb](20mb/)
diff --git a/disks/pc/os2/ibm/1.0/README.md b/disks/pc/os2/ibm/1.0/README.md
index 0aca1bd33..6b9ff0842 100644
--- a/disks/pc/os2/ibm/1.0/README.md
+++ b/disks/pc/os2/ibm/1.0/README.md
@@ -7,7 +7,7 @@ machines:
id: ibm5170
debugger: true
config: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
- drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210.json"}]'
+ drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210-EGA.json"}]'
automount: ''
---
diff --git a/disks/pc/os2/ibm/1.1/README.md b/disks/pc/os2/ibm/1.1/README.md
index 7a2006bf3..b2fd9411c 100644
--- a/disks/pc/os2/ibm/1.1/README.md
+++ b/disks/pc/os2/ibm/1.1/README.md
@@ -7,7 +7,7 @@ machines:
id: ibm5170
debugger: true
config: /devices/pc/machine/5170/vga/4096kb/debugger/machine.xml
- drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS211.json"}]'
+ drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS211-VGA.json"}]'
automount: ''
messages: fault
---
diff --git a/disks/pc/os2/misc/1.0/README.md b/disks/pc/os2/misc/1.0/README.md
new file mode 100644
index 000000000..596ff0ec7
--- /dev/null
+++ b/disks/pc/os2/misc/1.0/README.md
@@ -0,0 +1,14 @@
+---
+layout: page
+title: OS/2 1.0 Debugger Disk
+permalink: /disks/pc/os2/misc/1.0/
+---
+
+OS/2 1.0 Debugger Disk
+---
+
+The [OS/2 1.0 Debugger Disk](/disks/pc/os2/misc/1.0/88286/) contained a version of OS/2 1.0 built on
+October 12, 1988, which included the built-in kernel debugger used by Microsoft and IBM for internal development,
+along with a rudimentary program selector. For more details, see the [OS/2 1.0](/blog/2014/12/04/) blog post.
+
+[Return to [OS/2 Prototype Disks](/disks/pc/os2/misc/)]
diff --git a/disks/pc/os2/misc/README.md b/disks/pc/os2/misc/README.md
index e6b1ed36d..879ca4784 100644
--- a/disks/pc/os2/misc/README.md
+++ b/disks/pc/os2/misc/README.md
@@ -7,55 +7,11 @@ permalink: /disks/pc/os2/misc/
OS/2 Prototype Disks
---
-Below are some interesting pre-1.0 (or 1.0-based) OS/2 revisions we have unearthed. They provide an early glimpse
-of OS/2 when it was still a work-in-progress. Not all of the disks run properly in PCjs yet, but we're working on it.
+Below are some interesting pre-1.0 (or 1.0-based) OS/2 prototype disks we have unearthed. They provide an early glimpse
+of OS/2 when it was still a work-in-progress.
-### CP-DOS
+* [CP-DOS](cpdos/)
+* [FOOTBALL](football/)
+* [Other OS/2 1.0 Disks](1.0/)
-#### OS/2 CP-DOS Boot Disk (v7.68)
-
-The [OS/2 CP-DOS Boot Disk (v7.68)](/disks/pc/os2/misc/cpdos/86295/) contained a pre-1.0 version of OS/2 built on
-October 22, 1986.
-
----
-
-### SIZZLE
-
-#### OS/2 SIZZLE Boot Disk (v7.68.18)
-
-The [OS/2 SIZZLE Boot Disk (v7.68.18)](/disks/pc/os2/misc/cpdos/87007/) contained a pre-1.0 version of OS/2
-built on January 7, 1987, which was based on an interim source code fork known as "SIZZLE", the code-name for a
-collection of changes intended to improve overall OS/2 performance.
-
-#### OS/2 SIZZLE Boot Disk (v7.68.18 DEBUG)
-
-The [OS/2 SIZZLE Boot Disk (v7.68.18 DEBUG)](/disks/pc/os2/misc/cpdos/87007/debug/) was largely identical to the
-previous disk, with the exception of a *DEBUG* kernel (with built-in debugger) and a different assortment of tools.
-
----
-
-### FOOTBALL
-
-#### OS/2 FOOTBALL Boot Disk (v7.68.17)
-
-The [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/87058/) contained a prototype version of OS/2
-from February 1987 that was designed to test two important new features of the Intel 80386 processor: paging and V86-mode.
-This prototype was forked from pre-1.0 OS/2 sources, and the only hardware it supported was the COMPAQ DeskPro 386-16.
-
-#### OS/2 FOOTBALL Boot Disk (v4.41.00)
-
-The [OS/2 FOOTBALL Boot Disk (v4.41.00)](/disks/pc/os2/misc/football/87357/) contained an updated FOOTBALL prototype.
-It was built in December 1987, using final OS/2 1.0 sources merged with assorted FOOTBALL changes, and although
-it was originally assigned version number 1.3, this version of OS/2 would ultimately become 2.0.
-
----
-
-### Miscellaneous
-
-#### OS/2 1.0 Debugger Boot Disk
-
-The [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/) contained a version of OS/2 1.0 built on
-October 12, 1988, which included the built-in kernel debugger used by Microsoft and IBM for internal development,
-along with a rudimentary program selector. For more details, see the [OS/2 1.0](/blog/2014/12/04/) blog post.
-
-[Return to [IBM PC Disk Library](/disks/pc/#other-os2-disks)]
+[Return to [IBM PC Disk Library](/disks/pc/)]
diff --git a/disks/pc/os2/misc/cpdos/README.md b/disks/pc/os2/misc/cpdos/README.md
new file mode 100644
index 000000000..71eef96e6
--- /dev/null
+++ b/disks/pc/os2/misc/cpdos/README.md
@@ -0,0 +1,26 @@
+---
+layout: page
+title: OS/2 CP-DOS Disks
+permalink: /disks/pc/os2/misc/cpdos/
+---
+
+OS/2 CP-DOS Disks
+---
+
+#### OS/2 CP-DOS Boot Disk (v7.68)
+
+The [OS/2 CP-DOS Boot Disk (v7.68)](/disks/pc/os2/misc/cpdos/86295/) contained a pre-1.0 version of OS/2 built on
+October 22, 1986.
+
+#### OS/2 SIZZLE Boot Disk (v7.68.18)
+
+The [OS/2 SIZZLE Boot Disk (v7.68.18)](/disks/pc/os2/misc/cpdos/87007/) contained a pre-1.0 version of OS/2
+built on January 7, 1987, which was based on an interim source code fork known as "SIZZLE", the code-name for a
+collection of changes intended to improve overall OS/2 performance.
+
+#### OS/2 SIZZLE Boot Disk (v7.68.18 DEBUG)
+
+The [OS/2 SIZZLE Boot Disk (v7.68.18 DEBUG)](/disks/pc/os2/misc/cpdos/87007/debug/) was largely identical to the
+previous disk, with the exception of a *DEBUG* kernel (with built-in debugger) and a different assortment of tools.
+
+[Return to [OS/2 Prototype Disks](/disks/pc/os2/misc/)]
diff --git a/disks/pc/os2/misc/football/README.md b/disks/pc/os2/misc/football/README.md
new file mode 100644
index 000000000..208440b63
--- /dev/null
+++ b/disks/pc/os2/misc/football/README.md
@@ -0,0 +1,22 @@
+---
+layout: page
+title: OS/2 FOOTBALL Disks
+permalink: /disks/pc/os2/misc/football/
+---
+
+OS/2 FOOTBALL Disks
+---
+
+#### OS/2 FOOTBALL Boot Disk (v7.68.17)
+
+The [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/87058/) contained a prototype version of OS/2
+from February 1987 that was designed to test two important new features of the Intel 80386 processor: paging and V86-mode.
+This prototype was forked from pre-1.0 OS/2 sources, and the only hardware it supported was the COMPAQ DeskPro 386-16.
+
+#### OS/2 FOOTBALL Boot Disk (v4.41.00)
+
+The [OS/2 FOOTBALL Boot Disk (v4.41.00)](/disks/pc/os2/misc/football/87357/) contained an updated FOOTBALL prototype.
+It was built in December 1987, using final OS/2 1.0 sources merged with assorted FOOTBALL changes, and although
+it was originally assigned version number 1.3, this version of OS/2 would ultimately become 2.0.
+
+[Return to [OS/2 Prototype Disks](/disks/pc/os2/misc/)]
diff --git a/disks/pc/unix/sco/xenix/README.md b/disks/pc/unix/sco/xenix/README.md
index 630733795..0c6081e8d 100644
--- a/disks/pc/unix/sco/xenix/README.md
+++ b/disks/pc/unix/sco/xenix/README.md
@@ -2,6 +2,9 @@
layout: page
title: SCO Xenix
permalink: /disks/pc/unix/sco/xenix/
+redirect_from:
+ - /disks/pc/xenix/
+ - /disks/pc/xenix/sco/
---
SCO Xenix
diff --git a/disks/pc/windows/1.01/README.md b/disks/pc/windows/1.01/README.md
index d9ba5b965..f495bc0aa 100644
--- a/disks/pc/windows/1.01/README.md
+++ b/disks/pc/windows/1.01/README.md
@@ -12,6 +12,7 @@ redirect_from:
- /configs/pc/machines/5160/ega/640kb/win101/
- /devices/pc/machine/5160/ega/640kb/win101/
- /devices/pc/machine/5160/ega/640kb/win101/debugger/
+ - /disks/pc/win/win101/
---
Microsoft Windows 1.01
diff --git a/disks/pc/windows/3.00/README.md b/disks/pc/windows/3.00/README.md
index 603b2d52c..092462dde 100644
--- a/disks/pc/windows/3.00/README.md
+++ b/disks/pc/windows/3.00/README.md
@@ -8,7 +8,7 @@ machines:
- type: pc
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"}]'
+ drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300-EGA.json"}]'
autoMount: ''
---
diff --git a/disks/pc/windows/3.10/README.md b/disks/pc/windows/3.10/README.md
index ce9d48404..9df0b012a 100644
--- a/disks/pc/windows/3.10/README.md
+++ b/disks/pc/windows/3.10/README.md
@@ -6,7 +6,7 @@ machines:
- type: pc
id: ibm5170-win310
config: /devices/pc/machine/5170/vga/2048kb/machine.xml
- drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'
+ drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310-VGA.json"}]'
autoMount: ''
---
diff --git a/disks/pc/windows/win95/4.00.499/README.md b/disks/pc/windows/win95/4.00.499/README.md
index a202c9270..5f8ef9a67 100644
--- a/disks/pc/windows/win95/4.00.499/README.md
+++ b/disks/pc/windows/win95/4.00.499/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Microsoft Windows 95 (Build 499)"
+title: Microsoft Windows 95 (Build 499)
permalink: /disks/pc/windows/win95/4.00.499/
redirect_from:
- /disks/pc/windows/win95/build499/
diff --git a/disks/pc/windows/win95/4.00.950/README.md b/disks/pc/windows/win95/4.00.950/README.md
index 386ef55d7..8df9fd67d 100644
--- a/disks/pc/windows/win95/4.00.950/README.md
+++ b/disks/pc/windows/win95/4.00.950/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "Microsoft Windows 95 (First Retail Release)"
+title: Microsoft Windows 95 (First Retail Release)
permalink: /disks/pc/windows/win95/4.00.950/
machines:
- type: pc
diff --git a/disks/pc/windows/win95/README.md b/disks/pc/windows/win95/README.md
new file mode 100644
index 000000000..10d6151cb
--- /dev/null
+++ b/disks/pc/windows/win95/README.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: Microsoft Windows 95
+permalink: /disks/pc/windows/win95/
+---
+
+Microsoft Windows 95
+---
+
+Information is available for the following versions:
+
+* [Microsoft Windows 95 (Build 499)](4.00.499/)
+* [Microsoft Windows 95 (First Retail Release)](4.00.950/)
diff --git a/docs/pcjs/examples/README.md b/docs/pcjs/examples/README.md
index 6b94a93ae..deaa663cb 100644
--- a/docs/pcjs/examples/README.md
+++ b/docs/pcjs/examples/README.md
@@ -8,6 +8,7 @@ machines:
config: /docs/pcjs/examples/example3b.xml
redirect_from:
- /docs/pcjs/demos/
+ - /docs/pcjs/demos/sample1.html/
---
PCjs Documentation Examples