From 9a3a9c31a22a7ba077bfc15c0edc4f93120e52e8 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Tue, 9 Feb 2016 17:41:19 -0800
Subject: [PATCH] Better XML redirect fix: pretend the old URL was a folder
 with an .xml extension

---
 demos/pc/cga-win101/README.md                 |  8 -------
 demos/pc/cga-win101/xt-cga-win101.xml         | 22 -------------------
 devices/c1p/machine/8kb/array/README.md       |  1 +
 .../machine/5160/cga/256kb/win101/README.md   |  1 +
 4 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 demos/pc/cga-win101/README.md
 delete mode 100644 demos/pc/cga-win101/xt-cga-win101.xml

diff --git a/demos/pc/cga-win101/README.md b/demos/pc/cga-win101/README.md
deleted file mode 100644
index af8a61ac9..000000000
--- a/demos/pc/cga-win101/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-IBM PC XT running Windows 1.01
----
-
-This folder, and the accompanying [xt-cga-win101.xml](xt-cga-win101.xml) file, exist only because Jekyll's
-"Redirect From" plugin is unable to redirect from a URL containing an ".xml" extension.
-
-Note that [xt-cga-win101.xml](xt-cga-win101.xml) is a copy of
-[/devices/pc/machine/5160/cga/256kb/win101/machine.xml](../../../devices/pc/machine/5160/cga/256kb/win101/machine.xml).
diff --git a/demos/pc/cga-win101/xt-cga-win101.xml b/demos/pc/cga-win101/xt-cga-win101.xml
deleted file mode 100644
index f185edd2f..000000000
--- a/demos/pc/cga-win101/xt-cga-win101.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name pos="center">IBM PC XT (Model 5160) running Windows v1.01</name>
-	<computer id="xt-cga-win101" name="IBM PC XT" state="/devices/pc/machine/5160/cga/256kb/win101/state.json"/>
-	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
-	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" binding="run">Run</control>
-		<control type="button" binding="reset">Reset</control>
-	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/samples.xml" pos="right"/>
-	<chipset id="chipset" model="5160" sw1="01001001"/>
-	<hdc ref="/disks/pc/fixed/win101.xml"/>
-	<serial id="com1" adapter="1" binding="print"/>
-	<serial id="com2" adapter="2"/>
-	<mouse serial="com2"/>
-</machine>
diff --git a/devices/c1p/machine/8kb/array/README.md b/devices/c1p/machine/8kb/array/README.md
index 8bac8d7b9..77f392778 100644
--- a/devices/c1p/machine/8kb/array/README.md
+++ b/devices/c1p/machine/8kb/array/README.md
@@ -33,6 +33,7 @@ machines:
 redirect_from:
   - /configs/c1p/machines/array/
   - /configs/c1p/machines/8kb/array/
+  - /devices/other/c1p/array.xml/
 ---
 
 Challenger 1P (8Kb) "Server Array"
diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md
index a796f39b8..728ba5cc6 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/README.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/README.md
@@ -4,6 +4,7 @@ title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Win
 permalink: /devices/pc/machine/5160/cga/256kb/win101/
 redirect_from:
   - /configs/pc/machines/5160/cga/256kb/win101/
+  - /demos/pc/cga-win101/xt-cga-win101.xml/
   - /demos/pc/cga-win101/
 machines:
   - type: pc