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/disks/pc/cpm/1.1b/machine.md
+++ b/disks/pc/cpm/1.1b/machine.md
@ -1,9 +1,7 @@
 ---
 layout: page
-title: "IBM PC (Model 5150) running CP/M-86"
+title: "IBM PC (Model 5150) running CP/M-86 v1.1b"
 permalink: /disks/pc/cpm/1.1b/
-redirect_from:
-  - /disks/pc/cpm/
 machines:
  - type: pc
    id: ibm5150
--- a/disks/pc/cpm/README.md
+++ b/disks/pc/cpm/README.md
@ -0,0 +1,12 @@
+---
+layout: page
+title: CP/M-86
+permalink: /disks/pc/cpm/
+---
+
+CP/M-86
+---
+
+The following versions of CP/M-86 are available:
+
+* [CP/M-86 1.1b](/disks/pc/cpm/1.1b/)