Merge branch 'master' into next-release

disks/pc/dos/compaq/1.11/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5150-compaq111
     config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
       A:
         path: /disks/pc/dos/compaq/1.11/COMPAQ-DOS111.json
 ---

disks/pc/dos/compaq/1.12/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5150-compaq112
     config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
       A:
         path: /disks/pc/dos/compaq/1.12/COMPAQ-DOS112.json
 ---

disks/pc/dos/compaq/2.12/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5160-compaq212
     config: /devices/pc/machine/5160/mda/256kb/machine.xml
-    automount:
+    autoMount:
       A:
         path: /disks/pc/dos/compaq/2.12/COMPAQ-DOS212.json
 ---

disks/pc/dos/ibm/1.00/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5150-pcdos100
     config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
       A:
         path: /disks/pc/dos/ibm/1.00/PCDOS100.json
 ---

disks/pc/dos/ibm/1.10/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5150-pcdos110
     config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
       A:
         path: /disks/pc/dos/ibm/1.10/PCDOS110.json
 ---

disks/pc/dos/microsoft/3.20/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5170-msdos320
     config: /devices/pc/machine/5170/ega/640kb/rev1/machine.xml
-    automount:
+    autoMount:
       A:
         name: MS-DOS 3.20 (Disk 1)
         path: /disks/pc/dos/microsoft/3.20/MSDOS320-DISK1.json

disks/pc/dos/microsoft/4.00/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5170-msdos400
     config: /devices/pc/machine/5170/ega/640kb/rev1/machine.xml
-    automount:
+    autoMount:
       A:
         name: MS-DOS 4.00 (Disk 1)
         path: /disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json

disks/pc/dos/microsoft/4.01/README.md

@@ -6,7 +6,7 @@ machines:
   - type: pc
     id: ibm5170-msdos401
     config: /devices/pc/machine/5170/ega/640kb/rev1/machine.xml
-    automount:
+    autoMount:
       A:
         name: MS-DOS 4.01 (Disk 1)
         path: /disks/pc/dos/microsoft/4.01/MSDOS401-DISK1.json

disks/pc/dos/microsoft/4.0M/README.md

@@ -3,8 +3,9 @@ layout: page
 title: Multitasking MS-DOS 4.00
 permalink: /disks/pc/dos/microsoft/4.0M/
 machines:
-  - type: pc-dbg
+  - type: pc
     id: ibm5160
+    debugger: true
     config: /devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
 ---