Lots of README normalizations

2017-06-24 15:59:31 -07:00 · 2017-06-24 15:59:31 -07:00 · cf35125d34
commit cf35125d34
parent a9b6feb377
106 changed files with 246 additions and 245 deletions
--- a/disks/pcx86/apps/ibm/topview/1.01/README.md
+++ b/disks/pcx86/apps/ibm/topview/1.01/README.md
@ -3,8 +3,8 @@ layout: page
 title: TopView 1.01
 permalink: /disks/pcx86/apps/ibm/topview/1.01/
 machines:
-  - type: pcx86
-    id: ibm5160
+  - id: ibm5160
+    type: pcx86
    config: /devices/pcx86/machine/5160/cga/640kb/machine.xml
    autoMount:
      A:
--- a/disks/pcx86/apps/other/omniview/4.30/README.md
+++ b/disks/pcx86/apps/other/omniview/4.30/README.md
@ -3,8 +3,8 @@ layout: page
 title: Omniview 386 4.30
 permalink: /disks/pcx86/apps/other/omniview/4.30/
 machines:
-  - type: pcx86
-    id: compaq386
+  - id: compaq386
+    type: pcx86
    config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
    autoMount:
      A:
@ -14,7 +14,7 @@ machines:
 ---

 Omniview 386 4.30
---
+-----------------

 The COMPAQ DeskPro 386 machine below is recommended for Omniview 386 4.30.
 A [directory listing](#directory-of-omniview-386-430) is also provided.
--- a/disks/pcx86/apps/other/sc2/1.00/README.md
+++ b/disks/pcx86/apps/other/sc2/1.00/README.md
@ -3,8 +3,8 @@ layout: page
 title: SuperCalc2 1.00
 permalink: /disks/pcx86/apps/other/sc2/1.00/
 machines:
-  - type: pcx86
-    id: ibm5150-sc2
+  - id: ibm5150-sc2
+    type: pcx86
    config: /devices/pcx86/machine/5150/cga/256kb/machine.xml
    autoMount:
      A:
--- a/disks/pcx86/apps/other/sc3/1.00/README.md
+++ b/disks/pcx86/apps/other/sc3/1.00/README.md
@ -3,8 +3,8 @@ layout: page
 title: SuperCalc3 1.00
 permalink: /disks/pcx86/apps/other/sc3/1.00/
 machines:
-  - type: pcx86
-    id: ibm5160-sc3
+  - id: ibm5160-sc3
+    type: pcx86
    config: /devices/pcx86/machine/5160/cga/640kb/machine.xml
    autoMount:
      A:
--- a/disks/pcx86/diags/ibm/1.02/README.md
+++ b/disks/pcx86/diags/ibm/1.02/README.md
@ -3,8 +3,8 @@ layout: page
 title: "IBM PC (Model 5150) running IBM PC Advanced Diagnostics 1.02"
 permalink: /disks/pcx86/diags/ibm/1.02/
 machines:
-  - type: pcx86
-    id: ibm5150
+  - id: ibm5150
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
    autoMount:
--- a/disks/pcx86/diags/ibm/2.07/README.md
+++ b/disks/pcx86/diags/ibm/2.07/README.md
@ -3,8 +3,8 @@ layout: page
 title: "IBM PC AT (Model 5170) running IBM PC AT Advanced Diagnostics 2.07"
 permalink: /disks/pcx86/diags/ibm/2.07/
 machines:
-  - type: pcx86
-    id: ibm5170
+  - id: ibm5170
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
    autoMount:
--- a/disks/pcx86/diags/ibm/2.20/README.md
+++ b/disks/pcx86/diags/ibm/2.20/README.md
@ -3,8 +3,8 @@ layout: page
 title: "IBM PC (Model 5150) running IBM PC Advanced Diagnostics 2.20"
 permalink: /disks/pcx86/diags/ibm/2.20/
 machines:
-  - type: pcx86
-    id: ibm5150
+  - id: ibm5150
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
    autoMount:
--- a/disks/pcx86/dos/compaq/1.11/README.md
+++ b/disks/pcx86/dos/compaq/1.11/README.md
@ -3,8 +3,8 @@ layout: page
 title: COMPAQ MS-DOS 1.11
 permalink: /disks/pcx86/dos/compaq/1.11/
 machines:
-  - type: pcx86
-    id: ibm5150-compaq111
+  - id: ibm5150-compaq111
+    type: pcx86
    config: /devices/pcx86/machine/5150/mda/64kb/machine.xml
    resume: 1
    autoMount:
@ -13,7 +13,7 @@ machines:
 ---

 COMPAQ MS-DOS 1.11
---
+------------------

 Released in 1983 by COMPAQ Computer Corp, this early version of MS-DOS displays the following messages on boot:

--- a/disks/pcx86/dos/compaq/1.12/README.md
+++ b/disks/pcx86/dos/compaq/1.12/README.md
@ -3,8 +3,8 @@ layout: page
 title: COMPAQ MS-DOS 1.12
 permalink: /disks/pcx86/dos/compaq/1.12/
 machines:
-  - type: pcx86
-    id: ibm5150-compaq112
+  - id: ibm5150-compaq112
+    type: pcx86
    config: /devices/pcx86/machine/5150/mda/64kb/machine.xml
    resume: 1
    autoMount:
@ -13,7 +13,7 @@ machines:
 ---

 COMPAQ MS-DOS 1.12
---
+------------------

 Released in 1983 by COMPAQ Computer Corp, this early version of MS-DOS displays the following messages on boot:

--- a/disks/pcx86/dos/compaq/2.12/README.md
+++ b/disks/pcx86/dos/compaq/2.12/README.md
@ -3,8 +3,8 @@ layout: page
 title: COMPAQ MS-DOS 2.12
 permalink: /disks/pcx86/dos/compaq/2.12/
 machines:
-  - type: pcx86
-    id: ibm5160-compaq212
+  - id: ibm5160-compaq212
+    type: pcx86
    config: /devices/pcx86/machine/5160/mda/256kb/machine.xml
    autoMount:
      A:
@ -12,7 +12,7 @@ machines:
 ---

 COMPAQ MS-DOS 2.12
---
+------------------

 Released in 1984 by COMPAQ Computer Corp, this early version of MS-DOS displays the following messages on boot:

--- a/disks/pcx86/dos/ibm/0.90/README.md
+++ b/disks/pcx86/dos/ibm/0.90/README.md
@ -3,8 +3,8 @@ layout: page
 title: PC-DOS 0.90
 permalink: /disks/pcx86/dos/ibm/0.90/
 machines:
-  - type: pcx86
-    id: ibm5150-pcdos090
+  - id: ibm5150-pcdos090
+    type: pcx86
    config: /devices/pcx86/machine/5150/cga/256kb/machine.xml
    autoMount:
      A:
--- a/disks/pcx86/dos/ibm/0.90/debugger/README.md
+++ b/disks/pcx86/dos/ibm/0.90/debugger/README.md
@ -3,8 +3,8 @@ layout: page
 title: "PC-DOS 0.90 (with Debugger)"
 permalink: /disks/pcx86/dos/ibm/0.90/debugger/
 machines:
-  - type: pcx86
-    id: ibm5150-pcdos090
+  - id: ibm5150-pcdos090
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5150/mda/256kb/debugger/machine.xml
    resume: 1
--- a/disks/pcx86/dos/ibm/1.00/README.md
+++ b/disks/pcx86/dos/ibm/1.00/README.md
@ -3,8 +3,8 @@ layout: page
 title: PC-DOS 1.00
 permalink: /disks/pcx86/dos/ibm/1.00/
 machines:
-  - type: pcx86
-    id: ibm5150-pcdos100
+  - id: ibm5150-pcdos100
+    type: pcx86
    config: /devices/pcx86/machine/5150/mda/64kb/machine.xml
    resume: 1
    autoMount:
--- a/disks/pcx86/dos/ibm/1.10/README.md
+++ b/disks/pcx86/dos/ibm/1.10/README.md
@ -3,8 +3,8 @@ layout: page
 title: PC-DOS 1.10
 permalink: /disks/pcx86/dos/ibm/1.10/
 machines:
-  - type: pcx86
-    id: ibm5150-pcdos110
+  - id: ibm5150-pcdos110
+    type: pcx86
    config: /devices/pcx86/machine/5150/mda/64kb/machine.xml
    resume: 1
    autoMount:
@ -13,7 +13,7 @@ machines:
 ---

 PC-DOS 1.10
---
+-----------

 The PCjs machine below is running PC-DOS 1.10.

--- a/disks/pcx86/dos/ibm/4.00/README.md
+++ b/disks/pcx86/dos/ibm/4.00/README.md
@ -3,16 +3,16 @@ layout: page
 title: PC-DOS 4.00
 permalink: /disks/pcx86/dos/ibm/4.00/
 machines:
-  - type: pcx86
-    id: ibm5170-pcdos400
+  - id: ibm5170-pcdos400
+    type: pcx86
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/dos/ibm/4.00/PCDOS400-DISK1.json
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
 ---

 PC-DOS 4.00
---
+-----------

 PC-DOS 4.00 was released in July 1988. 

--- a/disks/pcx86/dos/ibm/5.00/README.md
+++ b/disks/pcx86/dos/ibm/5.00/README.md
@ -3,17 +3,17 @@ layout: page
 title: PC-DOS 5.00
 permalink: /disks/pcx86/dos/ibm/5.00/
 machines:
-  - type: pcx86
-    id: ibm5170-pcdos500
+  - id: ibm5170-pcdos500
+    type: pcx86
    debugger: true
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/dos/ibm/5.00/PCDOS500-DISK1-720K.json
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
 ---

 PC-DOS 5.00
---
+-----------

 PC-DOS 5.00 was released in June 1991.

--- a/disks/pcx86/dos/ibm/6.10/README.md
+++ b/disks/pcx86/dos/ibm/6.10/README.md
@ -3,16 +3,16 @@ layout: page
 title: PC-DOS 6.10
 permalink: /disks/pcx86/dos/ibm/6.10/
 machines:
-  - type: pcx86
-    id: ibm5170-pcdos610
+  - id: ibm5170-pcdos610
+    type: pcx86
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/dos/ibm/6.10/PCDOS610-DISK1-1440K.json
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
 ---

 PC-DOS 6.10
---
+-----------

 PC-DOS 6.10 was released in June 1993.

--- a/disks/pcx86/dos/ibm/6.30/README.md
+++ b/disks/pcx86/dos/ibm/6.30/README.md
@ -3,16 +3,16 @@ layout: page
 title: PC-DOS 6.30
 permalink: /disks/pcx86/dos/ibm/6.30/
 machines:
-  - type: pcx86
-    id: ibm5170-pcdos630
+  - id: ibm5170-pcdos630
+    type: pcx86
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/dos/ibm/6.30/PCDOS630-DISK1-1440K.json
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
 ---

 PC-DOS 6.30
---
+-----------

 PC-DOS 6.30 was released in December 1993.

--- a/disks/pcx86/dos/ibm/7.00/README.md
+++ b/disks/pcx86/dos/ibm/7.00/README.md
@ -3,16 +3,16 @@ layout: page
 title: PC-DOS 7.00
 permalink: /disks/pcx86/dos/ibm/7.00/
 machines:
-  - type: pcx86
-    id: ibm5170-pcdos700
+  - id: ibm5170-pcdos700
+    type: pcx86
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/dos/ibm/7.00/PCDOS700-DISK1.json
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
 ---

 PC-DOS 7.00
---
+-----------

 PC-DOS 7.00 was released in April 1995.  The disks used the [XDF Format](/blog/2014/10/28/).

--- a/disks/pcx86/dos/microsoft/3.20/README.md
+++ b/disks/pcx86/dos/microsoft/3.20/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft MS-DOS 3.20
 permalink: /disks/pcx86/dos/microsoft/3.20/
 machines:
-  - type: pcx86
-    id: ibm5170-msdos320
+  - id: ibm5170-msdos320
+    type: pcx86
    config: /devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
    autoMount:
      A:
@ -13,7 +13,7 @@ machines:
 ---

 Microsoft MS-DOS 3.20
---
+---------------------

 The MS-DOS 3.20 disks in the PCjs collection are the only known non-OEM copies of that release
 available online.  All other known MS-DOS 3.20 disk images are OEM releases (eg, HP, Zenith, Data General,
@ -23,8 +23,7 @@ Directory listings of the four 360Kb distribution diskettes are provided [below]

 {% include machine.html id="ibm5170-msdos320" %}

-Directory Listings
---
+### Directory Listings

 Disks 3 and 4 contained a printed date of `March 21, 1986` (see the photo below), which is consistent with
 the file timestamps (`2-14-86` and `3-14-86`) on those disks.  However, all the files on Disks 1 and 2 are
@ -45,7 +44,7 @@ order.  As proof, the following data from Disk 1:
 	00013e00  72 70 20 31 39 38 31 2d  31 39 38 36 0d 0a 0d 0a  |rp 1981-1986....|

 matches the data listed at [16bitos.com](http://16bitos.com/320ms.htm), as do the MD5 checksums of IO.SYS,
-MSDODS.SYS and COMMAND.COM.
+MSDOS.SYS and COMMAND.COM.

 ### Directory of MS-DOS 3.20 (Disk 1)

@ -122,7 +121,8 @@ MSDODS.SYS and COMMAND.COM.
 	        1 File(s)     56320 bytes free

 Surprisingly Bad Bug in MS-DOS 3.20
---
+-----------------------------------
+
 If you attempt to boot MS-DOS 3.20 on an [IBM PC Model 5150](/devices/pcx86/machine/5150/cga/384kb/softkbd/) (with either
 an MDA or CGA video card), the machine will appear to crash after printing the first character.

@ -167,7 +167,7 @@ but that release apparently wasn't made available until almost a year later (MS-
 `5-01-87`).

 MS-DOS 3.20 Photos
---
+------------------

 Here's what one of the MS-DOS 3.20 diskettes looked like.

--- a/disks/pcx86/dos/microsoft/4.00/README.md
+++ b/disks/pcx86/dos/microsoft/4.00/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft MS-DOS 4.00
 permalink: /disks/pcx86/dos/microsoft/4.00/
 machines:
-  - type: pcx86
-    id: ibm5170-msdos400
+  - id: ibm5170-msdos400
+    type: pcx86
    config: /devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
    autoMount:
      A:
@ -13,7 +13,7 @@ machines:
 ---

 Microsoft MS-DOS 4.00
---
+---------------------

 The PCjs machine below is running PC-DOS 4.00.

--- a/disks/pcx86/dos/microsoft/4.01/README.md
+++ b/disks/pcx86/dos/microsoft/4.01/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft MS-DOS 4.01
 permalink: /disks/pcx86/dos/microsoft/4.01/
 machines:
-  - type: pcx86
-    id: ibm5170-msdos401
+  - id: ibm5170-msdos401
+    type: pcx86
    config: /devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
    autoMount:
      A:
@ -13,7 +13,7 @@ machines:
 ---

 Microsoft MS-DOS 4.01
---
+---------------------

 The PCjs machine below is running PC-DOS 4.01.

--- a/disks/pcx86/dos/microsoft/4.0M/README.md
+++ b/disks/pcx86/dos/microsoft/4.0M/README.md
@ -8,8 +8,8 @@ redirect_from:
  - /disks/pc/dos/microsoft/4.0M/
  - /videos/pcjs/
 machines:
-  - type: pcx86
-    id: ibm5160
+  - id: ibm5160
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5160/cga/640kb/softkbd/machine.xml
    autoMount:
@ -20,7 +20,7 @@ machines:
 ---

 Multitasking MS-DOS 4.00
---
+------------------------

 These disk images contain the first unearthed copy of Microsoft's "multitasking" version of MS-DOS
 since its *extremely* limited release around late 1985 or early 1986.  They were were discovered by the
--- a/disks/pcx86/games/infocom/hhiker/machine.md
+++ b/disks/pcx86/games/infocom/hhiker/machine.md
@ -13,6 +13,6 @@ machines:
 ---

 The Hitchhiker's Guide to the Galaxy
---
+------------------------------------

 {% include machine.html id="ibm5150-hhiker" %}
--- a/disks/pcx86/games/infocom/planet/machine.md
+++ b/disks/pcx86/games/infocom/planet/machine.md
@ -13,6 +13,6 @@ machines:
 ---

 Planetfall
---
+----------

 {% include machine.html id="ibm5150-planet" %}
--- a/disks/pcx86/games/infocom/zork1/machine.md
+++ b/disks/pcx86/games/infocom/zork1/machine.md
@ -12,6 +12,6 @@ machines:
 ---

 Zork I
---
+------

 {% include machine.html id="ibm5150-zork1" %}
--- a/disks/pcx86/games/infocom/zork2/machine.md
+++ b/disks/pcx86/games/infocom/zork2/machine.md
@ -13,6 +13,6 @@ machines:
 ---

 Zork II
---
+-------

 {% include machine.html id="ibm5150-zork2" %}
--- a/disks/pcx86/games/infocom/zork3/machine.md
+++ b/disks/pcx86/games/infocom/zork3/machine.md
@ -13,6 +13,6 @@ machines:
 ---

 Zork III
---
+--------

 {% include machine.html id="ibm5150-zork3" %}
--- a/disks/pcx86/os2/ibm/1.0/README.md
+++ b/disks/pcx86/os2/ibm/1.0/README.md
@ -3,8 +3,8 @@ layout: page
 title: IBM OS/2 1.0
 permalink: /disks/pcx86/os2/ibm/1.0/
 machines:
-  - type: pcx86
-    id: ibm5170
+  - id: ibm5170
+    type: pcx86
    debugger: true
    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
    drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
--- a/disks/pcx86/os2/ibm/1.1/README.md
+++ b/disks/pcx86/os2/ibm/1.1/README.md
@ -3,8 +3,8 @@ layout: page
 title: IBM OS/2 1.1
 permalink: /disks/pcx86/os2/ibm/1.1/
 machines:
-  - type: pcx86
-    id: ibm5170
+  - id: ibm5170
+    type: pcx86
    debugger: true
    messages: fault
    config: /devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
--- a/disks/pcx86/os2/misc/1.0/88286/README.md
+++ b/disks/pcx86/os2/misc/1.0/88286/README.md
@ -13,7 +13,7 @@ machines:
 ---

 OS/2 1.0 Debugger Boot Disk
---
+---------------------------

 This disk 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.
--- a/disks/pcx86/os2/misc/cpdos/86295/README.md
+++ b/disks/pcx86/os2/misc/cpdos/86295/README.md
@ -13,7 +13,7 @@ machines:
 ---

 OS/2 CP-DOS Boot Disk (v7.68)
---
+-----------------------------

 This disk contained a pre-1.0 version of OS/2 (aka **CP-DOS** or **MT-DOS** or **ADOS** or **286DOS** or **DOS5**)
 built on October 22, 1986, with a few files (IBMDOS.COM and NLS.EXE) apparently rebuilt on October 23, 1986.
--- a/disks/pcx86/os2/misc/cpdos/87007/README.md
+++ b/disks/pcx86/os2/misc/cpdos/87007/README.md
@ -13,7 +13,7 @@ machines:
 ---

 OS/2 SIZZLE Boot Disk (v7.68.18)
---
+--------------------------------

 This disk 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
--- a/disks/pcx86/os2/misc/cpdos/87007/debug/README.md
+++ b/disks/pcx86/os2/misc/cpdos/87007/debug/README.md
@ -13,7 +13,7 @@ machines:
 ---

 OS/2 SIZZLE Boot Disk (v7.68.18 DEBUG)
---
+--------------------------------------

 This disk contained a *DEBUG* pre-1.0 version of OS/2 built on January 7, 1987, and
 it is largely identical to the [OS/2 SIZZLE Boot Disk (v7.68.18)](/disks/pcx86/os2/misc/cpdos/87007/), with
--- a/disks/pcx86/os2/misc/football/87058/README.md
+++ b/disks/pcx86/os2/misc/football/87058/README.md
@ -8,15 +8,15 @@ machines:
  - id: deskpro386
    type: pcx86
    debugger: true
+    messages: warn
+    config: /devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
    autoMount:
      A:
        path: /disks/pcx86/os2/misc/football/FOOTBALL-76817.json
-    messages: warn
-    config: /devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
 ---

 OS/2 FOOTBALL Boot Disk (v7.68.17)
---
+----------------------------------

 This disk contained a prototype version of OS/2 from February 1987, code-named **FOOTBALL**
 (aka **PIGSKIN**).  It predated the completion of OS/2 1.0 by some eight months and was based on the
--- a/disks/pcx86/os2/misc/football/87357/README.md
+++ b/disks/pcx86/os2/misc/football/87357/README.md
@ -15,7 +15,7 @@ machines:
 ---

 OS/2 FOOTBALL Boot Disk (v4.41.00)
---
+----------------------------------

 This disk contained an updated version of [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pcx86/os2/misc/football/87058/).
 It was built in December 1987, using final OS/2 1.0 sources merged with assorted FOOTBALL changes, and although 
--- a/disks/pcx86/shareware/pcsig08/debugger/README.md
+++ b/disks/pcx86/shareware/pcsig08/debugger/README.md
@ -3,8 +3,8 @@ layout: page
 title: PC-SIG Library 8th Edition CD-ROM (April 1990) (with Debugger)
 permalink: /disks/pcx86/shareware/pcsig08/debugger/
 machines:
-  - type: pcx86
-    id: ibm5150-pcsig08
+  - id: ibm5150-pcsig08
+    type: pcx86
    config: /disks/pcx86/shareware/pcsig08/debugger/machine.xml
    autoMount:
      A:
--- a/disks/pcx86/windows/1.01/cga/softkbd/README.md
+++ b/disks/pcx86/windows/1.01/cga/softkbd/README.md
@ -7,8 +7,8 @@ redirect_from:
  - /configs/pc/machines/5160/cga/256kb/win101/softkbd/machine.xml/
  - /devices/pcx86/machine/5160/cga/256kb/win101/softkbd/
 machines:
-  - type: pcx86
-    id: ibm5160
+  - id: ibm5160
+    type: pcx86
    debugger: true
    state: /disks/pcx86/windows/1.01/cga/state.json
    config: /devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
--- a/disks/pcx86/windows/2.0x/README.md
+++ b/disks/pcx86/windows/2.0x/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft Windows/386 2.0x
 permalink: /disks/pcx86/windows/2.0x/
 machines:
-  - type: pcx86
-    id: deskpro386
+  - id: deskpro386
+    type: pcx86
    state: deskpro386.json
    config: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
    drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/COMPAQ310-WIN386201-VGA.json"}]'
@ -21,7 +21,7 @@ Microsoft Windows/386 2.0 existed as the following "point releases":
 * [Windows/386 2.03](#microsoft-windows386-203)

 Microsoft Windows/386 2.01
---
+--------------------------

 This Windows/386 release was finalized in September 1987, predating [Windows 2.03](/disks/pcx86/windows/2.03/)
 by several months.
--- a/disks/pcx86/windows/3.00/README.md
+++ b/disks/pcx86/windows/3.00/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft Windows 3.00
 permalink: /disks/pcx86/windows/3.00/
 machines:
-  - type: pcx86
-    id: ibm5170-win300
+  - id: ibm5170-win300
+    type: pcx86
    config: /devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
    drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS320-WIN300-EGA.json"}]'
    autoMount:
@ -15,7 +15,7 @@ machines:
 ---

 Microsoft Windows 3.00
---
+----------------------

 The PCjs machine below starts Microsoft Windows 3.00, using an IBM PC AT running PC-DOS 3.20.

--- a/disks/pcx86/windows/3.10/README.md
+++ b/disks/pcx86/windows/3.10/README.md
@ -5,8 +5,8 @@ permalink: /disks/pcx86/windows/3.10/
 redirect_from:
  - /disks/pc/windows/3.10/
 machines:
-  - type: pcx86
-    id: ibm5170-win310
+  - id: ibm5170-win310
+    type: pcx86
    config: /devices/pcx86/machine/5170/vga/2048kb/machine.xml
    drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS330-WIN310-VGA.json"}]'
    autoMount:
@ -17,7 +17,7 @@ machines:
 ---

 Microsoft Windows 3.10
---
+----------------------

 The PCjs machine below starts Microsoft Windows 3.10, using an IBM PC AT running PC-DOS 3.30.

--- a/disks/pcx86/windows/win95/4.00.499/README.md
+++ b/disks/pcx86/windows/win95/4.00.499/README.md
@ -3,13 +3,13 @@ layout: page
 title: Microsoft Windows 95 (Build 499)
 permalink: /disks/pcx86/windows/win95/4.00.499/
 machines:
-  - type: pcx86
-    id: deskpro386
+  - id: deskpro386
+    type: pcx86
    config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
 ---

 Microsoft Windows 95 (Build 499)
---
+--------------------------------

 The PCjs Project was first to unearth this pre-release version of Windows 95 since its *extremely* limited
 test release back in June 1995.  It was one of the last (if not *the* last) test versions produced before
--- a/disks/pcx86/windows/win95/4.00.950/README.md
+++ b/disks/pcx86/windows/win95/4.00.950/README.md
@ -3,8 +3,8 @@ layout: page
 title: Microsoft Windows 95 (First Retail Release)
 permalink: /disks/pcx86/windows/win95/4.00.950/
 machines:
-  - type: pcx86
-    id: deskpro386
+  - id: deskpro386
+    type: pcx86
    state: deskpro386.json
    config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
    drives: '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pcx86/fixed/68mb/win95.json"}]'
@ -16,7 +16,7 @@ machines:
 ---

 Microsoft Windows 95 (First Retail Release)
---
+-------------------------------------------

 Windows 95 was the successor to Windows 3.1 and included a number of important new features:

--- a/disks/pcx86/windows/win95/4.00.950/debugger/README.md
+++ b/disks/pcx86/windows/win95/4.00.950/debugger/README.md
@ -3,8 +3,8 @@ layout: page
 title: "Microsoft Windows 95 (First Retail Release) with Debugger"
 permalink: /disks/pcx86/windows/win95/4.00.950/debugger/
 machines:
-  - type: pcx86
-    id: deskpro386
+  - id: deskpro386
+    type: pcx86
    debugger: true
    state: /disks/pcx86/windows/win95/4.00.950/deskpro386.json
    config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
@ -17,7 +17,7 @@ machines:
 ---

 Microsoft Windows 95 (First Retail Release) with Debugger
---
+---------------------------------------------------------

 Windows 95 is shown running below, following a "Compact Installation" on a 68Mb hard disk.  Before the machine can
 start, it must download the disk image, which may take a minute or two, depending on the speed of your