Merge branch 'master' into next-release

2016-01-09 18:02:13 -08:00 · 2016-01-09 18:02:13 -08:00 · fe23128a99
commit fe23128a99
parent a63b5326c0 cdff68669e
25 changed files with 134 additions and 7 deletions
--- a/devices/pc/machine/5160/cga/256kb/README.md
+++ b/devices/pc/machine/5160/cga/256kb/README.md
@ -0,0 +1,12 @@
+---
+layout: page
+title: IBM PC XT (Model 5160)
+permalink: /devices/pc/machine/5160/cga/256kb/
+redirect_from:
+  - /configs/pc/machines/5160/cga/256kb/
+---
+
+IBM PC XT (Model 5160, 256Kb) with Color Display
+---
+
+All our 256Kb Model 5160, aka IBM PC XT, configurations are located here.
--- a/devices/pc/machine/5160/cga/256kb/demo/README.md
+++ b/devices/pc/machine/5160/cga/256kb/demo/README.md
@ -7,7 +7,7 @@ machines:
    id: ibm5160
 ---

-IBM PC XT with Color Display
+IBM PC XT (Model 5160, 256Kb) with Color Display
 ---

 {% include machine.html id="ibm5160" %}
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.md
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.md
@ -2,6 +2,8 @@
 layout: page
 title: "IBM PC XT (Model 5160, 640Kb) with EGA Display running Windows 1.01"
 permalink: /devices/pc/machine/5160/ega/640kb/win101/
+redirect_from:
+  - /configs/pc/machines/5160/ega/640kb/win101/
 machines:
  - type: pc
    id: ibm5160