From 9335ad3a549a2e33ae244dd3da0392b4ab1ba4b2 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Wed, 18 May 2016 22:18:07 -0700 Subject: [PATCH] And even more PCjs/PCx86 disambiguation --- README.md | 8 ++-- _config.yml | 2 +- devices/pcx86/README.md | 1 + .../machine/5150/cga/384kb/softkbd/machine.md | 1 + devices/pcx86/machine/5160/README.md | 2 + .../5160/ega/256kb/debugger/machine.md | 2 + .../pcx86/machine/5160/ega/256kb/machine.md | 1 + .../machine/5160/ega/640kb/array/README.md | 2 + .../5160/ega/640kb/debugger/machine.md | 2 + .../pcx86/machine/5160/ega/640kb/machine.md | 1 + devices/pcx86/machine/5160/ega/README.md | 2 + .../5160/mda/256kb/debugger/machine.md | 2 + .../mda/256kb/fake188/debugger/machine.md | 2 + .../machine/5160/mda/256kb/fake188/machine.md | 2 + .../pcx86/machine/5160/mda/256kb/machine.md | 2 + .../machine/5160/mda/64kb/softkbd/machine.md | 3 +- devices/pcx86/machine/5160/mda/README.md | 1 + devices/pcx86/machine/5170/README.md | 2 + .../5170/cga/640kb/rev3/debugger/machine.md | 2 + .../machine/5170/cga/640kb/rev3/machine.md | 3 +- devices/pcx86/machine/5170/cga/README.md | 2 + .../pcx86/machine/5170/ega/1152kb/README.md | 1 + .../5170/ega/1152kb/rev1/debugger/machine.md | 2 + .../machine/5170/ega/1152kb/rev1/machine.md | 1 + .../1152kb/rev3/debugger/backtrack/machine.md | 2 + .../5170/ega/1152kb/rev3/debugger/machine.md | 2 + .../machine/5170/ega/1152kb/rev3/machine.md | 2 + .../pcx86/machine/5170/ega/2048kb/README.md | 1 + .../2048kb/rev3/debugger/backtrack/machine.md | 2 + .../5170/ega/2048kb/rev3/debugger/machine.md | 2 + .../machine/5170/ega/2048kb/rev3/machine.md | 2 + .../pcx86/machine/5170/ega/640kb/README.md | 1 + .../5170/ega/640kb/rev1/debugger/machine.md | 2 + .../machine/5170/ega/640kb/rev1/machine.md | 1 + devices/pcx86/machine/5170/ega/README.md | 1 + .../5170/mda/640kb/rev3/debugger/machine.md | 2 + .../machine/5170/mda/640kb/rev3/machine.md | 3 +- devices/pcx86/machine/5170/mda/README.md | 2 + .../5170/vga/2048kb/debugger/machine.md | 2 + .../pcx86/machine/5170/vga/2048kb/machine.md | 2 + .../5170/vga/4096kb/debugger/machine.md | 2 + .../pcx86/machine/5170/vga/4096kb/machine.md | 2 + devices/pcx86/machine/5170/vga/README.md | 2 + devices/pcx86/machine/README.md | 1 + devices/pcx86/machine/att/6300/README.md | 2 + .../att/6300/cga/640kb/debugger/machine.md | 2 + .../machine/att/6300/cga/640kb/machine.md | 3 +- devices/pcx86/machine/att/README.md | 2 + devices/pcx86/machine/cdp/README.md | 2 + .../cdp/mpc1600/cga/640kb/debugger/machine.md | 2 + .../machine/cdp/mpc1600/cga/640kb/machine.md | 5 ++- devices/pcx86/machine/compaq/README.md | 2 + .../pcx86/machine/compaq/deskpro386/README.md | 2 + .../deskpro386/ega/2048kb/debugger/machine.md | 2 + .../compaq/deskpro386/ega/2048kb/machine.md | 2 + .../deskpro386/ega/4096kb/debugger/machine.md | 2 + .../compaq/deskpro386/ega/4096kb/machine.md | 2 + .../machine/compaq/deskpro386/ega/README.md | 2 + .../2048kb/debugger/backtrack/machine.md | 2 + .../other/2048kb/debugger/machine.md | 3 +- .../machine/compaq/deskpro386/other/README.md | 2 + .../deskpro386/vga/2048kb/debugger/machine.md | 2 + .../compaq/deskpro386/vga/2048kb/machine.md | 2 + .../deskpro386/vga/4096kb/debugger/machine.md | 2 + .../compaq/deskpro386/vga/4096kb/machine.md | 2 + .../machine/compaq/deskpro386/vga/README.md | 2 + devices/pcx86/machine/custom/README.md | 2 + devices/pcx86/machine/zenith/README.md | 2 + .../zenith/z150/cga/640kb/debugger/machine.md | 2 + .../machine/zenith/z150/cga/640kb/machine.md | 5 ++- devices/pcx86/panel/README.md | 2 + devices/pcx86/rom/5150/basic/README.md | 3 +- devices/pcx86/rom/5170/README.md | 7 ++-- devices/pcx86/rom/README.md | 3 +- devices/pcx86/rom/att/6300/README.md | 2 + devices/pcx86/rom/cdp/mpc1600/README.md | 2 + devices/pcx86/rom/compaq/README.md | 3 +- devices/pcx86/rom/compaq/deskpro386/README.md | 7 ++-- devices/pcx86/rom/compaq/portable/README.md | 2 + devices/pcx86/rom/compaq/portable3/README.md | 3 +- devices/pcx86/rom/olivetti/m24/README.md | 3 ++ devices/pcx86/rom/zenith/z150/README.md | 3 ++ devices/pcx86/video/README.md | 2 + devices/pcx86/video/ati/README.md | 2 + devices/pcx86/video/ati/vga/README.md | 2 + devices/pcx86/video/cdp/README.md | 2 + devices/pcx86/video/cdp/cga/README.md | 2 + devices/pcx86/video/compaq/README.md | 2 + devices/pcx86/video/compaq/ega/README.md | 2 + devices/pcx86/video/compaq/vga/README.md | 2 + devices/pcx86/video/ibm/README.md | 2 + devices/pcx86/video/ibm/cga/README.md | 2 + devices/pcx86/video/ibm/ega/README.md | 2 + devices/pcx86/video/ibm/vga/README.md | 2 + devices/pcx86/video/paradise/README.md | 2 + devices/pcx86/video/paradise/vga/README.md | 2 + disks/pcx86/cpm/1.1b/machine.md | 3 +- disks/pcx86/dos/microsoft/3.30/README.md | 2 +- disks/pcx86/dos/microsoft/4.0M/README.md | 9 ++-- disks/pcx86/os2/misc/1.0/88286/README.md | 4 +- disks/pcx86/unix/sco/xenix/README.md | 3 +- disks/pcx86/windows/1.01/README.md | 11 ++--- disks/pcx86/windows/2.03/README.md | 3 +- disks/pcx86/windows/2.0x/README.md | 5 ++- disks/pcx86/windows/3.00/README.md | 3 +- disks/pcx86/windows/win95/4.00.499/README.md | 3 +- docs/about/README.md | 42 ++++++++++--------- index.md | 6 +-- 108 files changed, 241 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 71868bb86..61a00c0c2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -PC Simulations in JavaScript +PCjs: JavaScript Machines === -Welcome to PCjs, home of the first IBM PC simulation to run in your web browser without -any plugins. It was released in Fall 2012 as part of the [PCjs Project](https://github.com/jeffpar/pcjs), -which includes: +Welcome to PCjs, home of [PCx86](/docs/pcx86/), the original IBM PC simulation written entirely JavaScript. +It was added in Fall 2012 to the [PCjs Project](https://github.com/jeffpar/pcjs), which now includes the following +JavaScript Machines: * [PCx86](/docs/pcx86/), an x86-based IBM PC and PC-compatible emulator * [PC8080](/modules/pc8080/), a 8080-based generic machine emulator diff --git a/_config.yml b/_config.yml index 2068464a9..e5d1b34a8 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ # Site settings -title: "PCjs: PC Simulations in JavaScript" +title: "PCjs: JavaScript Machines" email: Jeff@pcjs.org description: > PCjs: Home of the original IBM PC emulator in a browser. diff --git a/devices/pcx86/README.md b/devices/pcx86/README.md index 0a2b2d87b..40ef4a8ee 100644 --- a/devices/pcx86/README.md +++ b/devices/pcx86/README.md @@ -4,6 +4,7 @@ title: IBM PC Device Configurations permalink: /devices/pcx86/ redirect_from: - /configs/pc/ + - /devices/pc/ --- IBM PC Device Configurations diff --git a/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.md b/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.md index 0d4244e0f..8f8960c91 100644 --- a/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.md +++ b/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.md @@ -4,6 +4,7 @@ title: IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard permalink: /devices/pcx86/machine/5150/cga/384kb/softkbd/ redirect_from: - /devices/pc/machine/5150/cga/384kb/softkbd/ + - /devices/pcx86/machine/5150/cga/384kb/ machines: - type: pcx86 id: ibm5150 diff --git a/devices/pcx86/machine/5160/README.md b/devices/pcx86/machine/5160/README.md index f858ef562..258276e65 100644 --- a/devices/pcx86/machine/5160/README.md +++ b/devices/pcx86/machine/5160/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160) Machines permalink: /devices/pcx86/machine/5160/ +redirect_from: + - /devices/pc/machine/5160/ --- IBM PC XT (Model 5160) Machines diff --git a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.md b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.md index 5f66af9a8..fa7f01edd 100644 --- a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.md +++ b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display and Debugger permalink: /devices/pcx86/machine/5160/ega/256kb/debugger/ +redirect_from: + - /devices/pc/machine/5160/ega/256kb/debugger/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/ega/256kb/machine.md b/devices/pcx86/machine/5160/ega/256kb/machine.md index 026e83b73..fbce4ecaf 100644 --- a/devices/pcx86/machine/5160/ega/256kb/machine.md +++ b/devices/pcx86/machine/5160/ega/256kb/machine.md @@ -4,6 +4,7 @@ title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display permalink: /devices/pcx86/machine/5160/ega/256kb/ redirect_from: - /configs/pc/machines/5160/ega/256kb/ + - /devices/pc/machine/5160/ega/256kb/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/ega/640kb/array/README.md b/devices/pcx86/machine/5160/ega/640kb/array/README.md index f5f651433..b85741c50 100644 --- a/devices/pcx86/machine/5160/ega/640kb/array/README.md +++ b/devices/pcx86/machine/5160/ega/640kb/array/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with EGA Displays permalink: /devices/pcx86/machine/5160/ega/640kb/array/ +redirect_from: + - /devices/pc/machine/5160/ega/640kb/array/ machines: - type: pcx86 id: ibm5160a diff --git a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.md b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.md index 047bae1a0..1c672bc37 100644 --- a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.md +++ b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger permalink: /devices/pcx86/machine/5160/ega/640kb/debugger/ +redirect_from: + - /devices/pc/machine/5160/ega/640kb/debugger/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/ega/640kb/machine.md b/devices/pcx86/machine/5160/ega/640kb/machine.md index ad3910b04..68b0a039b 100644 --- a/devices/pcx86/machine/5160/ega/640kb/machine.md +++ b/devices/pcx86/machine/5160/ega/640kb/machine.md @@ -4,6 +4,7 @@ title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display permalink: /devices/pcx86/machine/5160/ega/640kb/ redirect_from: - /configs/pc/machines/5160/ega/640kb/ + - /devices/pc/machine/5160/ega/640kb/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/ega/README.md b/devices/pcx86/machine/5160/ega/README.md index 269f1060d..bee4d67c2 100644 --- a/devices/pcx86/machine/5160/ega/README.md +++ b/devices/pcx86/machine/5160/ega/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160) with Enhanced Color Display permalink: /devices/pcx86/machine/5160/ega/ +redirect_from: + - /devices/pc/machine/5160/ega/ --- IBM PC XT with Enhanced Color Graphics (EGA) Display diff --git a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.md b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.md index 68148c5bc..403d64b86 100644 --- a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.md +++ b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger permalink: /devices/pcx86/machine/5160/mda/256kb/debugger/ +redirect_from: + - /devices/pc/machine/5160/mda/256kb/debugger/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.md b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.md index 3e555c834..cb666abf0 100644 --- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.md +++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display and Debugger permalink: /devices/pcx86/machine/5160/mda/256kb/fake188/debugger/ +redirect_from: + - /devices/pc/machine/5160/mda/256kb/fake188/debugger/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.md b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.md index 13bc3bdc3..25ad7e041 100644 --- a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.md +++ b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display permalink: /devices/pcx86/machine/5160/mda/256kb/fake188/ +redirect_from: + - /devices/pc/machine/5160/mda/256kb/fake188/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/mda/256kb/machine.md b/devices/pcx86/machine/5160/mda/256kb/machine.md index cd6afae0a..792653c50 100644 --- a/devices/pcx86/machine/5160/mda/256kb/machine.md +++ b/devices/pcx86/machine/5160/mda/256kb/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display permalink: /devices/pcx86/machine/5160/mda/256kb/ +redirect_from: + - /devices/pc/machine/5160/mda/256kb/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.md b/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.md index 5241fd3dc..22ae1141d 100644 --- a/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.md +++ b/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.md @@ -3,8 +3,9 @@ layout: page title: IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard permalink: /devices/pcx86/machine/5160/mda/64kb/softkbd/ redirect_from: - - /devices/pcx86/machine/5160/mda/64kb/ + - /devices/pc/machine/5160/mda/64kb/ - /configs/pc/machines/5160/mda/64kb/softkbd/index.xml/ + - /devices/pc/machine/5160/mda/64kb/softkbd/ machines: - type: pcx86 id: ibm5160 diff --git a/devices/pcx86/machine/5160/mda/README.md b/devices/pcx86/machine/5160/mda/README.md index f1ff09146..545aef3b4 100644 --- a/devices/pcx86/machine/5160/mda/README.md +++ b/devices/pcx86/machine/5160/mda/README.md @@ -4,6 +4,7 @@ title: IBM PC Machines (Model 5160) with Monochrome (MDA) Display permalink: /devices/pcx86/machine/5160/mda/ redirect_from: - /configs/pc/machines/5160/mda/ + - /devices/pc/machine/5160/mda/ --- IBM PC XT with Monochrome (MDA) Display diff --git a/devices/pcx86/machine/5170/README.md b/devices/pcx86/machine/5170/README.md index 90374e563..dcde2de51 100644 --- a/devices/pcx86/machine/5170/README.md +++ b/devices/pcx86/machine/5170/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170) Machines permalink: /devices/pcx86/machine/5170/ +redirect_from: + - /devices/pc/machine/5170/ --- IBM PC AT (Model 5170) Machines diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.md b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.md index 8ed02303c..c7a653a08 100644 --- a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.md +++ b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 640Kb) with CGA Display permalink: /devices/pcx86/machine/5170/cga/640kb/rev3/debugger/ +redirect_from: + - /devices/pc/machine/5170/cga/640kb/rev3/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.md b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.md index 8f2eedc1b..0d98ad10f 100644 --- a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.md +++ b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.md @@ -3,7 +3,8 @@ layout: page title: IBM PC AT (Model 5170, 640Kb) with CGA Display permalink: /devices/pcx86/machine/5170/cga/640kb/rev3/ redirect_from: - - /devices/pcx86/machine/5170/cga/640kb/ + - /devices/pc/machine/5170/cga/640kb/ + - /devices/pc/machine/5170/cga/640kb/rev3/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/cga/README.md b/devices/pcx86/machine/5170/cga/README.md index 5b729c88c..5d6eb2026 100644 --- a/devices/pcx86/machine/5170/cga/README.md +++ b/devices/pcx86/machine/5170/cga/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170) with Color Display permalink: /devices/pcx86/machine/5170/cga/ +redirect_from: + - /devices/pc/machine/5170/cga/ --- IBM PC AT with Color (CGA) Display diff --git a/devices/pcx86/machine/5170/ega/1152kb/README.md b/devices/pcx86/machine/5170/ega/1152kb/README.md index 7b2fbed0a..b0bb530b4 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/README.md +++ b/devices/pcx86/machine/5170/ega/1152kb/README.md @@ -4,6 +4,7 @@ title: IBM PC AT (Model 5170) with Enhanced Color Display permalink: /devices/pcx86/machine/5170/ega/1152kb/ redirect_from: - /configs/pc/machines/5170/ega/1152kb/ + - /devices/pc/machine/5170/ega/1152kb/ --- IBM PC AT with 1Mb RAM and Enhanced Color Graphics (EGA) Display diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.md b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.md index 5028fe889..7ff340c54 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.md +++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk permalink: /devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/ +redirect_from: + - /devices/pc/machine/5170/ega/1152kb/rev1/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.md b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.md index d9f6ea8a1..0dea677cb 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.md +++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.md @@ -4,6 +4,7 @@ title: IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk permalink: /devices/pcx86/machine/5170/ega/1152kb/rev1/ redirect_from: - /configs/pc/machines/5170/ega/1152kb/rev1/ + - /devices/pc/machine/5170/ega/1152kb/rev1/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md index 0d50eaea5..e8944f76c 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md +++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger permalink: /devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/ +redirect_from: + - /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.md b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.md index 62872d04b..8e12e64bc 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.md +++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger permalink: /devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/ +redirect_from: + - /devices/pc/machine/5170/ega/1152kb/rev3/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.md b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.md index e8b994934..4ffb6ffad 100644 --- a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.md +++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display permalink: /devices/pcx86/machine/5170/ega/1152kb/rev3/ +redirect_from: + - /devices/pc/machine/5170/ega/1152kb/rev3/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/2048kb/README.md b/devices/pcx86/machine/5170/ega/2048kb/README.md index 422db93f1..cde2e22d2 100644 --- a/devices/pcx86/machine/5170/ega/2048kb/README.md +++ b/devices/pcx86/machine/5170/ega/2048kb/README.md @@ -4,6 +4,7 @@ title: IBM PC AT (Model 5170) with Enhanced Color Display permalink: /devices/pcx86/machine/5170/ega/2048kb/ redirect_from: - /configs/pc/machines/5170/ega/2048kb/ + - /devices/pc/machine/5170/ega/2048kb/ --- IBM PC AT with 2Mb RAM and Enhanced Color Graphics (EGA) Display diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md index 2ad58a2af..0800d45fa 100644 --- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md +++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with EGA Display and Debugger permalink: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/ +redirect_from: + - /devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.md index b3dcacac7..7e05912e3 100644 --- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.md +++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 2Mb20Mb Hard Disk) with EGA Display and Debugger permalink: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/ +redirect_from: + - /devices/pc/machine/5170/ega/2048kb/rev3/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.md index fad24493a..a624db329 100644 --- a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.md +++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 2Mb, 20Mb Hard Disk) with EGA Display permalink: /devices/pcx86/machine/5170/ega/2048kb/rev3/ +redirect_from: + - /devices/pc/machine/5170/ega/2048kb/rev3/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/640kb/README.md b/devices/pcx86/machine/5170/ega/640kb/README.md index a622b507b..ddb2d9b24 100644 --- a/devices/pcx86/machine/5170/ega/640kb/README.md +++ b/devices/pcx86/machine/5170/ega/640kb/README.md @@ -4,6 +4,7 @@ title: IBM PC AT (Model 5170) with Enhanced Color Display permalink: /devices/pcx86/machine/5170/ega/640kb/ redirect_from: - /configs/pc/machines/5170/ega/640kb/ + - /devices/pc/machine/5170/ega/640kb/ --- IBM PC AT with 640Kb RAM and Enhanced Color Graphics (EGA) Display diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md index ea21e6339..b13f26f99 100644 --- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md +++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 640Kb) with EGA Display permalink: /devices/pcx86/machine/5170/ega/640kb/rev1/debugger/ +redirect_from: + - /devices/pc/machine/5170/ega/640kb/rev1/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md index 2622372ff..dc49cf683 100644 --- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md +++ b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md @@ -5,6 +5,7 @@ permalink: /devices/pcx86/machine/5170/ega/640kb/rev1/ redirect_from: - /configs/pc/machines/5170/ega/640kb/ - /configs/pc/machines/5170/ega/640kb/rev1/ + - /devices/pc/machine/5170/ega/640kb/rev1/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/ega/README.md b/devices/pcx86/machine/5170/ega/README.md index 5dd5cf350..2109653c4 100644 --- a/devices/pcx86/machine/5170/ega/README.md +++ b/devices/pcx86/machine/5170/ega/README.md @@ -4,6 +4,7 @@ title: IBM PC AT (Model 5170) with Enhanced Color Display permalink: /devices/pcx86/machine/5170/ega/ redirect_from: - /configs/pc/machines/5170/ega/ + - /devices/pc/machine/5170/ega/ --- IBM PC AT with Enhanced Color Graphics (EGA) Display diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.md b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.md index b537d1da7..4d27d1399 100644 --- a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.md +++ b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 640Kb) with MDA Display permalink: /devices/pcx86/machine/5170/mda/640kb/rev3/debugger/ +redirect_from: + - /devices/pc/machine/5170/mda/640kb/rev3/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.md b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.md index d63d8122b..ae3661775 100644 --- a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.md +++ b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.md @@ -3,7 +3,8 @@ layout: page title: IBM PC AT (Model 5170, 640Kb) with MDA Display permalink: /devices/pcx86/machine/5170/mda/640kb/rev3/ redirect_from: - - /devices/pcx86/machine/5170/mda/640kb/ + - /devices/pc/machine/5170/mda/640kb/ + - /devices/pc/machine/5170/mda/640kb/rev3/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/mda/README.md b/devices/pcx86/machine/5170/mda/README.md index 7c7ba2f78..995900346 100644 --- a/devices/pcx86/machine/5170/mda/README.md +++ b/devices/pcx86/machine/5170/mda/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170) with Monochrome Display permalink: /devices/pcx86/machine/5170/mda/ +redirect_from: + - /devices/pc/machine/5170/mda/ --- IBM PC AT with Monochrome (MDA) Display diff --git a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.md b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.md index 73203ef1f..528f6d433 100644 --- a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.md +++ b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display and Debugger permalink: /devices/pcx86/machine/5170/vga/2048kb/debugger/ +redirect_from: + - /devices/pc/machine/5170/vga/2048kb/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/vga/2048kb/machine.md b/devices/pcx86/machine/5170/vga/2048kb/machine.md index 433192bf3..326334e41 100644 --- a/devices/pcx86/machine/5170/vga/2048kb/machine.md +++ b/devices/pcx86/machine/5170/vga/2048kb/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display permalink: /devices/pcx86/machine/5170/vga/2048kb/ +redirect_from: + - /devices/pc/machine/5170/vga/2048kb/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.md b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.md index 3674dc7a3..390be27e4 100644 --- a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.md +++ b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display and Debugger permalink: /devices/pcx86/machine/5170/vga/4096kb/debugger/ +redirect_from: + - /devices/pc/machine/5170/vga/4096kb/debugger/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/vga/4096kb/machine.md b/devices/pcx86/machine/5170/vga/4096kb/machine.md index 1ab5a9326..84d6c2bed 100644 --- a/devices/pcx86/machine/5170/vga/4096kb/machine.md +++ b/devices/pcx86/machine/5170/vga/4096kb/machine.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170, 4Mb, 20Mb Drive) with VGA Display permalink: /devices/pcx86/machine/5170/vga/4096kb/ +redirect_from: + - /devices/pc/machine/5170/vga/4096kb/ machines: - type: pcx86 id: ibm5170 diff --git a/devices/pcx86/machine/5170/vga/README.md b/devices/pcx86/machine/5170/vga/README.md index 3ae917779..e7128be61 100644 --- a/devices/pcx86/machine/5170/vga/README.md +++ b/devices/pcx86/machine/5170/vga/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC AT (Model 5170) with VGA Display permalink: /devices/pcx86/machine/5170/vga/ +redirect_from: + - /devices/pc/machine/5170/vga/ --- IBM PC AT with Video Graphics Array (VGA) Display diff --git a/devices/pcx86/machine/README.md b/devices/pcx86/machine/README.md index 7f45f1099..91bd64a32 100644 --- a/devices/pcx86/machine/README.md +++ b/devices/pcx86/machine/README.md @@ -4,6 +4,7 @@ title: IBM PC Machine Configurations permalink: /devices/pcx86/machine/ redirect_from: - /configs/pc/machines/ + - /devices/pc/machine/ --- IBM PC Machine Configurations diff --git a/devices/pcx86/machine/att/6300/README.md b/devices/pcx86/machine/att/6300/README.md index 07d68ee53..24904e8bc 100644 --- a/devices/pcx86/machine/att/6300/README.md +++ b/devices/pcx86/machine/att/6300/README.md @@ -2,6 +2,8 @@ layout: page title: AT&T Personal Computer 6300 permalink: /devices/pcx86/machine/att/6300/ +redirect_from: + - /devices/pc/machine/att/6300/ --- AT&T Personal Computer 6300 diff --git a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.md b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.md index b109a5d6c..4abafbaa7 100644 --- a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.md +++ b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: AT&T Personal Computer 6300 with Color Display permalink: /devices/pcx86/machine/att/6300/cga/640kb/debugger/ +redirect_from: + - /devices/pc/machine/att/6300/cga/640kb/debugger/ machines: - type: pcx86 id: att6300 diff --git a/devices/pcx86/machine/att/6300/cga/640kb/machine.md b/devices/pcx86/machine/att/6300/cga/640kb/machine.md index 98bbb699d..d65b62be6 100644 --- a/devices/pcx86/machine/att/6300/cga/640kb/machine.md +++ b/devices/pcx86/machine/att/6300/cga/640kb/machine.md @@ -3,7 +3,8 @@ layout: page title: AT&T Personal Computer 6300 with Color Display permalink: /devices/pcx86/machine/att/6300/cga/640kb/ redirect_from: - - /devices/pcx86/machine/att/6300/cga/ + - /devices/pc/machine/att/6300/cga/ + - /devices/pc/machine/att/6300/cga/640kb/ machines: - type: pcx86 id: att6300 diff --git a/devices/pcx86/machine/att/README.md b/devices/pcx86/machine/att/README.md index 3c302ff9f..77d3cc775 100644 --- a/devices/pcx86/machine/att/README.md +++ b/devices/pcx86/machine/att/README.md @@ -2,6 +2,8 @@ layout: page title: AT&T Machines permalink: /devices/pcx86/machine/att/ +redirect_from: + - /devices/pc/machine/att/ --- AT&T Machines diff --git a/devices/pcx86/machine/cdp/README.md b/devices/pcx86/machine/cdp/README.md index 50f397f24..fa5b5c890 100644 --- a/devices/pcx86/machine/cdp/README.md +++ b/devices/pcx86/machine/cdp/README.md @@ -2,6 +2,8 @@ layout: page title: Columbia Data Products Machines permalink: /devices/pcx86/machine/cdp/ +redirect_from: + - /devices/pc/machine/cdp/ --- Columbia Data Products Machines diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.md b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.md index abb1e5274..f437623f1 100644 --- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.md +++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: Columbia Data Products MPC 1600 with Color Display and Debugger permalink: /devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/ +redirect_from: + - /devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/ machines: - type: pcx86 id: mpc1600 diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.md b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.md index 64a093914..c113ffe53 100644 --- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.md +++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.md @@ -3,8 +3,9 @@ layout: page title: Columbia Data Products MPC 1600 with Color Display permalink: /devices/pcx86/machine/cdp/mpc1600/cga/640kb/ redirect_from: - - /devices/pcx86/machine/cdp/mpc1600/ - - /devices/pcx86/machine/cdp/mpc1600/cga/ + - /devices/pc/machine/cdp/mpc1600/ + - /devices/pc/machine/cdp/mpc1600/cga/ + - /devices/pc/machine/cdp/mpc1600/cga/640kb/ machines: - type: pcx86 id: mpc1600 diff --git a/devices/pcx86/machine/compaq/README.md b/devices/pcx86/machine/compaq/README.md index 0302ac736..364ac1d98 100644 --- a/devices/pcx86/machine/compaq/README.md +++ b/devices/pcx86/machine/compaq/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ Machines permalink: /devices/pcx86/machine/compaq/ +redirect_from: + - /devices/pc/machine/compaq/ --- COMPAQ Machines diff --git a/devices/pcx86/machine/compaq/deskpro386/README.md b/devices/pcx86/machine/compaq/deskpro386/README.md index a75e94b90..e8c904dc7 100644 --- a/devices/pcx86/machine/compaq/deskpro386/README.md +++ b/devices/pcx86/machine/compaq/deskpro386/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 Machines permalink: /devices/pcx86/machine/compaq/deskpro386/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ --- COMPAQ DeskPro 386 Machines diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md index e29362d1d..85497d58f 100644 --- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA permalink: /devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.md b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.md index 436d5b40e..4cd1d9ea1 100644 --- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA permalink: /devices/pcx86/machine/compaq/deskpro386/ega/2048kb/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ega/2048kb/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md index 22649e319..144e1f1e7 100644 --- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA permalink: /devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.md b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.md index ef47225f2..d76abe5ec 100644 --- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA permalink: /devices/pcx86/machine/compaq/deskpro386/ega/4096kb/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ega/4096kb/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/README.md b/devices/pcx86/machine/compaq/deskpro386/ega/README.md index e79159cdb..e35b1bed3 100644 --- a/devices/pcx86/machine/compaq/deskpro386/ega/README.md +++ b/devices/pcx86/machine/compaq/deskpro386/ega/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 Machines with IBM EGA permalink: /devices/pcx86/machine/compaq/deskpro386/ega/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/ega/ --- COMPAQ DeskPro 386 Machines with IBM EGA diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md index bb8649d51..03b8af727 100644 --- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA permalink: /devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.md b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.md index b47f40d6a..57e8cd9e6 100644 --- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.md @@ -3,7 +3,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with COMPAQ VGA permalink: /devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/ redirect_from: - - /devices/pcx86/machine/compaq/deskpro386/other/2048kb/ + - /devices/pc/machine/compaq/deskpro386/other/2048kb/ + - /devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/other/README.md b/devices/pcx86/machine/compaq/deskpro386/other/README.md index 2f0645b72..e1788a31a 100644 --- a/devices/pcx86/machine/compaq/deskpro386/other/README.md +++ b/devices/pcx86/machine/compaq/deskpro386/other/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 Machines with COMPAQ VGA permalink: /devices/pcx86/machine/compaq/deskpro386/other/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/other/ --- COMPAQ DeskPro 386 Machines with COMPAQ VGA diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md index 9670d53ec..9b0d028b9 100644 --- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with IBM VGA permalink: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.md b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.md index 9a4ee4eb2..10185c55a 100644 --- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (2Mb) with IBM VGA permalink: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/vga/2048kb/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md index 3c2fefd68..53fb32390 100644 --- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (4Mb) with IBM VGA permalink: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.md b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.md index 7e9ca9af9..9cb392160 100644 --- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.md +++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 (4Mb) with IBM VGA permalink: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/vga/4096kb/ machines: - type: pcx86 id: deskpro386 diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/README.md b/devices/pcx86/machine/compaq/deskpro386/vga/README.md index 6e72b7643..84ba0bce0 100644 --- a/devices/pcx86/machine/compaq/deskpro386/vga/README.md +++ b/devices/pcx86/machine/compaq/deskpro386/vga/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ DeskPro 386 Machines with IBM VGA permalink: /devices/pcx86/machine/compaq/deskpro386/vga/ +redirect_from: + - /devices/pc/machine/compaq/deskpro386/vga/ --- COMPAQ DeskPro 386 Machines with IBM VGA diff --git a/devices/pcx86/machine/custom/README.md b/devices/pcx86/machine/custom/README.md index 9f02178b9..0c46db1a1 100644 --- a/devices/pcx86/machine/custom/README.md +++ b/devices/pcx86/machine/custom/README.md @@ -2,6 +2,8 @@ layout: page title: Build Your Own PC permalink: /devices/pcx86/machine/custom/ +redirect_from: + - /devices/pc/machine/custom/ machines: - type: pcx86 name: Custom PC diff --git a/devices/pcx86/machine/zenith/README.md b/devices/pcx86/machine/zenith/README.md index d56b1ff76..404e4417d 100644 --- a/devices/pcx86/machine/zenith/README.md +++ b/devices/pcx86/machine/zenith/README.md @@ -2,6 +2,8 @@ layout: page title: Zenith Data Systems Machines permalink: /devices/pcx86/machine/zenith/ +redirect_from: + - /devices/pc/machine/zenith/ --- Zenith Data Systems Machines diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.md b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.md index 31cf5ac29..e66c53a47 100644 --- a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.md +++ b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.md @@ -2,6 +2,8 @@ layout: page title: Zenith Z-150 with Color Display and Debugger permalink: /devices/pcx86/machine/zenith/z150/cga/640kb/debugger/ +redirect_from: + - /devices/pc/machine/zenith/z150/cga/640kb/debugger/ machines: - type: pcx86 id: z150 diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.md b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.md index 7dab3633a..b0b852878 100644 --- a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.md +++ b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.md @@ -3,8 +3,9 @@ layout: page title: Zenith Z-150 with Color Display permalink: /devices/pcx86/machine/zenith/z150/cga/640kb/ redirect_from: - - /devices/pcx86/machine/zenith/z150/ - - /devices/pcx86/machine/zenith/z150/cga/ + - /devices/pc/machine/zenith/z150/ + - /devices/pc/machine/zenith/z150/cga/ + - /devices/pc/machine/zenith/z150/cga/640kb/ machines: - type: pcx86 id: z150 diff --git a/devices/pcx86/panel/README.md b/devices/pcx86/panel/README.md index a28e6ec94..28d3cf46c 100644 --- a/devices/pcx86/panel/README.md +++ b/devices/pcx86/panel/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC Control Panels permalink: /devices/pcx86/panel/ +redirect_from: + - /devices/pc/panel/ --- IBM PC Control Panels diff --git a/devices/pcx86/rom/5150/basic/README.md b/devices/pcx86/rom/5150/basic/README.md index 81a62368e..dc88ba3b8 100644 --- a/devices/pcx86/rom/5150/basic/README.md +++ b/devices/pcx86/rom/5150/basic/README.md @@ -3,7 +3,8 @@ layout: page title: IBM PC BASIC ROMs permalink: /devices/pcx86/rom/5150/basic/ redirect_from: - - /devices/pcx86/basic/ + - /devices/pc/basic/ + - /devices/pc/rom/5150/basic/ --- IBM PC BASIC ROMs diff --git a/devices/pcx86/rom/5170/README.md b/devices/pcx86/rom/5170/README.md index aeade50db..8771034ab 100644 --- a/devices/pcx86/rom/5170/README.md +++ b/devices/pcx86/rom/5170/README.md @@ -3,9 +3,10 @@ layout: page title: IBM PC AT (Model 5170) ROMs permalink: /devices/pcx86/rom/5170/ redirect_from: - - /devices/pcx86/5170/ - - /devices/pcx86/bios/5170/ - - /devices/pcx86/rom/5170/bios/ + - /devices/pc/5170/ + - /devices/pc/bios/5170/ + - /devices/pc/rom/5170/bios/ + - /devices/pc/rom/5170/ --- IBM PC AT (Model 5170) ROM Revisions diff --git a/devices/pcx86/rom/README.md b/devices/pcx86/rom/README.md index d5b56e3c4..b559080f9 100644 --- a/devices/pcx86/rom/README.md +++ b/devices/pcx86/rom/README.md @@ -3,7 +3,8 @@ layout: page title: IBM PC ROMs permalink: /devices/pcx86/rom/ redirect_from: - - /devices/pcx86/bios/ + - /devices/pc/bios/ + - /devices/pc/rom/ --- IBM PC ROMs diff --git a/devices/pcx86/rom/att/6300/README.md b/devices/pcx86/rom/att/6300/README.md index 01482f22e..2f09e9b1c 100644 --- a/devices/pcx86/rom/att/6300/README.md +++ b/devices/pcx86/rom/att/6300/README.md @@ -2,6 +2,8 @@ layout: page title: AT&T 6300 ROM BIOS permalink: /devices/pcx86/rom/att/6300/ +redirect_from: + - /devices/pc/rom/att/6300/ --- AT&T 6300 ROM BIOS diff --git a/devices/pcx86/rom/cdp/mpc1600/README.md b/devices/pcx86/rom/cdp/mpc1600/README.md index 758a7875b..0fad220c1 100644 --- a/devices/pcx86/rom/cdp/mpc1600/README.md +++ b/devices/pcx86/rom/cdp/mpc1600/README.md @@ -2,6 +2,8 @@ layout: page title: Columbia Data Products MPC 1600 ROM BIOS permalink: /devices/pcx86/rom/cdp/mpc1600/ +redirect_from: + - /devices/pc/rom/cdp/mpc1600/ --- Columbia Data Products MPC 1600 ROM BIOS diff --git a/devices/pcx86/rom/compaq/README.md b/devices/pcx86/rom/compaq/README.md index 52848bc28..31a0f5ecf 100644 --- a/devices/pcx86/rom/compaq/README.md +++ b/devices/pcx86/rom/compaq/README.md @@ -3,7 +3,8 @@ layout: page title: COMPAQ ROMs permalink: /devices/pcx86/rom/compaq/ redirect_from: - - /devices/pcx86/rom/compaq/bios/ + - /devices/pc/rom/compaq/bios/ + - /devices/pc/rom/compaq/ --- COMPAQ ROMs diff --git a/devices/pcx86/rom/compaq/deskpro386/README.md b/devices/pcx86/rom/compaq/deskpro386/README.md index 8c9f845f7..dc623af4a 100644 --- a/devices/pcx86/rom/compaq/deskpro386/README.md +++ b/devices/pcx86/rom/compaq/deskpro386/README.md @@ -3,9 +3,10 @@ layout: page title: COMPAQ DeskPro 386 ROMs permalink: /devices/pcx86/rom/compaq/deskpro386/ redirect_from: - - /devices/pcx86/bios/compaq/deskpro386/ - - /devices/pcx86/compaq/deskpro386/ - - /devices/pcx86/rom/compaq/bios/deskpro386/ + - /devices/pc/bios/compaq/deskpro386/ + - /devices/pc/compaq/deskpro386/ + - /devices/pc/rom/compaq/bios/deskpro386/ + - /devices/pc/rom/compaq/deskpro386/ --- COMPAQ DeskPro 386 ROMs diff --git a/devices/pcx86/rom/compaq/portable/README.md b/devices/pcx86/rom/compaq/portable/README.md index e11c845b8..e3f00b0fd 100644 --- a/devices/pcx86/rom/compaq/portable/README.md +++ b/devices/pcx86/rom/compaq/portable/README.md @@ -2,6 +2,8 @@ layout: page title: Compaq Portable Computer ROMs permalink: /devices/pcx86/rom/compaq/portable/ +redirect_from: + - /devices/pc/rom/compaq/portable/ --- Compaq Portable Computer ROMs diff --git a/devices/pcx86/rom/compaq/portable3/README.md b/devices/pcx86/rom/compaq/portable3/README.md index 3c194ab6c..e7acfa835 100644 --- a/devices/pcx86/rom/compaq/portable3/README.md +++ b/devices/pcx86/rom/compaq/portable3/README.md @@ -3,7 +3,8 @@ layout: page title: COMPAQ Portable III ROMs permalink: /devices/pcx86/rom/compaq/portable3/ redirect_from: - - /devices/pcx86/compaq/portable3/ + - /devices/pc/rom/compaq/portable3/ + - /devices/pc/compaq/portable3/ --- COMPAQ Portable III ROMs diff --git a/devices/pcx86/rom/olivetti/m24/README.md b/devices/pcx86/rom/olivetti/m24/README.md index 3cf2b2a79..650832edf 100644 --- a/devices/pcx86/rom/olivetti/m24/README.md +++ b/devices/pcx86/rom/olivetti/m24/README.md @@ -2,6 +2,9 @@ layout: page title: Olivetti M24 ROM BIOS permalink: /devices/pcx86/rom/olivetti/m24/ +redirect_from: + - /devices/pc/rom/olivetti/m24/ + - /devices/pcx86/rom/olivetti/ --- Olivetti M24 ROM BIOS diff --git a/devices/pcx86/rom/zenith/z150/README.md b/devices/pcx86/rom/zenith/z150/README.md index 529250de7..32bd30472 100644 --- a/devices/pcx86/rom/zenith/z150/README.md +++ b/devices/pcx86/rom/zenith/z150/README.md @@ -2,6 +2,9 @@ layout: page title: Zenith Data Systems Z-150 ROM BIOS permalink: /devices/pcx86/rom/zenith/z150/ +redirect_from: + - /devices/pc/rom/zenith/z150/ + - /devices/pcx86/rom/zenith/ --- Zenith Data Systems Z-150 ROM BIOS diff --git a/devices/pcx86/video/README.md b/devices/pcx86/video/README.md index 12d5c8daf..6eec01391 100644 --- a/devices/pcx86/video/README.md +++ b/devices/pcx86/video/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC Video Adapters permalink: /devices/pcx86/video/ +redirect_from: + - /devices/pc/video/ --- IBM PC Video Adapters diff --git a/devices/pcx86/video/ati/README.md b/devices/pcx86/video/ati/README.md index 51e88621c..43199f967 100644 --- a/devices/pcx86/video/ati/README.md +++ b/devices/pcx86/video/ati/README.md @@ -2,6 +2,8 @@ layout: page title: ATI Video Adapters permalink: /devices/pcx86/video/ati/ +redirect_from: + - /devices/pc/video/ati/ --- ATI Video Adapters diff --git a/devices/pcx86/video/ati/vga/README.md b/devices/pcx86/video/ati/vga/README.md index fe5b936d3..2e6b6858b 100644 --- a/devices/pcx86/video/ati/vga/README.md +++ b/devices/pcx86/video/ati/vga/README.md @@ -2,6 +2,8 @@ layout: page title: ATI VGA Wonder-16 permalink: /devices/pcx86/video/ati/vga/ +redirect_from: + - /devices/pc/video/ati/vga/ --- ATI VGA Wonder-16 diff --git a/devices/pcx86/video/cdp/README.md b/devices/pcx86/video/cdp/README.md index db9bde6a5..77626eb84 100644 --- a/devices/pcx86/video/cdp/README.md +++ b/devices/pcx86/video/cdp/README.md @@ -2,6 +2,8 @@ layout: page title: Columbia Data Products Video Adapters permalink: /devices/pcx86/video/cdp/ +redirect_from: + - /devices/pc/video/cdp/ --- Columbia Data Products Video Adapters diff --git a/devices/pcx86/video/cdp/cga/README.md b/devices/pcx86/video/cdp/cga/README.md index c8af395d9..2a2d84db6 100644 --- a/devices/pcx86/video/cdp/cga/README.md +++ b/devices/pcx86/video/cdp/cga/README.md @@ -2,6 +2,8 @@ layout: page title: Columbia Data Products Color Graphics Adapter (CGA) permalink: /devices/pcx86/video/cdp/cga/ +redirect_from: + - /devices/pc/video/cdp/cga/ --- Columbia Data Products Color Graphics Adapter (CGA) diff --git a/devices/pcx86/video/compaq/README.md b/devices/pcx86/video/compaq/README.md index e4257648a..ef8ad6823 100644 --- a/devices/pcx86/video/compaq/README.md +++ b/devices/pcx86/video/compaq/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ Video Adapters permalink: /devices/pcx86/video/compaq/ +redirect_from: + - /devices/pc/video/compaq/ --- COMPAQ Video Adapters diff --git a/devices/pcx86/video/compaq/ega/README.md b/devices/pcx86/video/compaq/ega/README.md index d3aeeb600..a62abd72f 100644 --- a/devices/pcx86/video/compaq/ega/README.md +++ b/devices/pcx86/video/compaq/ega/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ Enhanced Color Graphics Board (EGA) permalink: /devices/pcx86/video/compaq/ega/ +redirect_from: + - /devices/pc/video/compaq/ega/ --- COMPAQ Enhanced Color Graphics Board (EGA) diff --git a/devices/pcx86/video/compaq/vga/README.md b/devices/pcx86/video/compaq/vga/README.md index 77b32db0b..2fd17639c 100644 --- a/devices/pcx86/video/compaq/vga/README.md +++ b/devices/pcx86/video/compaq/vga/README.md @@ -2,6 +2,8 @@ layout: page title: COMPAQ Video Graphics Controller (VGA) permalink: /devices/pcx86/video/compaq/vga/ +redirect_from: + - /devices/pc/video/compaq/vga/ --- COMPAQ Video Graphics Controller (VGA) diff --git a/devices/pcx86/video/ibm/README.md b/devices/pcx86/video/ibm/README.md index 862f3596f..b37b9e8ae 100644 --- a/devices/pcx86/video/ibm/README.md +++ b/devices/pcx86/video/ibm/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC Video Configurations permalink: /devices/pcx86/video/ibm/ +redirect_from: + - /devices/pc/video/ibm/ --- IBM PC Video Configurations diff --git a/devices/pcx86/video/ibm/cga/README.md b/devices/pcx86/video/ibm/cga/README.md index 7ebdb8abb..4def98518 100644 --- a/devices/pcx86/video/ibm/cga/README.md +++ b/devices/pcx86/video/ibm/cga/README.md @@ -2,6 +2,8 @@ layout: page title: IBM Color Graphics Adapter (CGA) permalink: /devices/pcx86/video/ibm/cga/ +redirect_from: + - /devices/pc/video/ibm/cga/ --- IBM Color Graphics Adapter (CGA) diff --git a/devices/pcx86/video/ibm/ega/README.md b/devices/pcx86/video/ibm/ega/README.md index 44b40cddd..839278893 100644 --- a/devices/pcx86/video/ibm/ega/README.md +++ b/devices/pcx86/video/ibm/ega/README.md @@ -2,6 +2,8 @@ layout: page title: IBM Enhanced Graphics Adapter (EGA) permalink: /devices/pcx86/video/ibm/ega/ +redirect_from: + - /devices/pc/video/ibm/ega/ --- IBM Enhanced Graphics Adapter (EGA) diff --git a/devices/pcx86/video/ibm/vga/README.md b/devices/pcx86/video/ibm/vga/README.md index c73753830..ddb3be516 100644 --- a/devices/pcx86/video/ibm/vga/README.md +++ b/devices/pcx86/video/ibm/vga/README.md @@ -2,6 +2,8 @@ layout: page title: IBM Video Graphics Array (VGA) permalink: /devices/pcx86/video/ibm/vga/ +redirect_from: + - /devices/pc/video/ibm/vga/ --- IBM Video Graphics Array (VGA) diff --git a/devices/pcx86/video/paradise/README.md b/devices/pcx86/video/paradise/README.md index f5af9acd3..206069970 100644 --- a/devices/pcx86/video/paradise/README.md +++ b/devices/pcx86/video/paradise/README.md @@ -2,6 +2,8 @@ layout: page title: Paradise Video Adapters permalink: /devices/pcx86/video/paradise/ +redirect_from: + - /devices/pc/video/paradise/ --- Paraside Video Adapters diff --git a/devices/pcx86/video/paradise/vga/README.md b/devices/pcx86/video/paradise/vga/README.md index abee0377f..d7978f082 100644 --- a/devices/pcx86/video/paradise/vga/README.md +++ b/devices/pcx86/video/paradise/vga/README.md @@ -2,6 +2,8 @@ layout: page title: "Paradise VGA Board: WDVGA PLUS 16" permalink: /devices/pcx86/video/paradise/vga/ +redirect_from: + - /devices/pc/video/paradise/vga/ --- Paradise VGA Board: WDVGA PLUS 16 diff --git a/disks/pcx86/cpm/1.1b/machine.md b/disks/pcx86/cpm/1.1b/machine.md index 6d56d24a7..3e5740df5 100644 --- a/disks/pcx86/cpm/1.1b/machine.md +++ b/disks/pcx86/cpm/1.1b/machine.md @@ -3,7 +3,8 @@ layout: page title: "IBM PC (Model 5150) running CP/M-86 v1.1B" permalink: /disks/pcx86/cpm/1.1b/ redirect_from: - - /disks/pcx86/cpm/machine.xml/ + - /disks/pc/cpm/machine.xml/ + - /disks/pc/cpm/1.1b/ machines: - type: pcx86 id: ibm5150 diff --git a/disks/pcx86/dos/microsoft/3.30/README.md b/disks/pcx86/dos/microsoft/3.30/README.md index 112141b66..7e88b687b 100644 --- a/disks/pcx86/dos/microsoft/3.30/README.md +++ b/disks/pcx86/dos/microsoft/3.30/README.md @@ -3,7 +3,7 @@ layout: page title: Microsoft MS-DOS 3.30 permalink: /disks/pcx86/dos/microsoft/3.30/ redirect_from: - - /disks/pcx86/dos/microsoft/3.30a/ + - /disks/pc/dos/microsoft/3.30a/ --- Microsoft MS-DOS 3.30 diff --git a/disks/pcx86/dos/microsoft/4.0M/README.md b/disks/pcx86/dos/microsoft/4.0M/README.md index eb9ddfc61..e76eebd24 100644 --- a/disks/pcx86/dos/microsoft/4.0M/README.md +++ b/disks/pcx86/dos/microsoft/4.0M/README.md @@ -2,6 +2,11 @@ layout: page title: Multitasking MS-DOS 4.00 permalink: /disks/pcx86/dos/microsoft/4.0M/ +redirect_from: + - /configs/pc/machines/5160/cga/640kb/dos400m/ + - /devices/pc/machine/5160/cga/640kb/dos400m/ + - /disks/pc/dos/microsoft/4.0M/ + - /videos/pcjs/ machines: - type: pcx86 id: ibm5160 @@ -12,10 +17,6 @@ machines: path: /disks/pcx86/dos/microsoft/4.0M/MSDOS400M-DISK1.json B: path: /disks/pcx86/dos/microsoft/4.0M/MSDOS400M-DISK2.json -redirect_from: - - /devices/pcx86/machine/5160/cga/640kb/dos400m/ - - /configs/pc/machines/5160/cga/640kb/dos400m/ - - /videos/pcjs/ --- Multitasking MS-DOS 4.00 diff --git a/disks/pcx86/os2/misc/1.0/88286/README.md b/disks/pcx86/os2/misc/1.0/88286/README.md index cb87fd4b2..5abe8984d 100644 --- a/disks/pcx86/os2/misc/1.0/88286/README.md +++ b/disks/pcx86/os2/misc/1.0/88286/README.md @@ -2,6 +2,8 @@ layout: page title: OS/2 1.0 Debugger Boot Disk permalink: /disks/pcx86/os2/misc/1.0/88286/ +redirect_from: + - /disks/pc/os2/misc/1.0/debugger/ machines: - id: ibm5170 type: pcx86 @@ -10,8 +12,6 @@ machines: autoMount: A: path: /disks/pcx86/os2/misc/1.0/OS210-88286.json -redirect_from: - - /disks/pcx86/os2/misc/1.0/debugger/ --- OS/2 1.0 Debugger Boot Disk diff --git a/disks/pcx86/unix/sco/xenix/README.md b/disks/pcx86/unix/sco/xenix/README.md index 0401bac9f..be8c56503 100644 --- a/disks/pcx86/unix/sco/xenix/README.md +++ b/disks/pcx86/unix/sco/xenix/README.md @@ -3,8 +3,7 @@ layout: page title: SCO Xenix permalink: /disks/pcx86/unix/sco/xenix/ redirect_from: - - /disks/pcx86/xenix/ - - /disks/pcx86/xenix/sco/ + - /disks/pc/unix/sco/xenix/ --- SCO Xenix diff --git a/disks/pcx86/windows/1.01/README.md b/disks/pcx86/windows/1.01/README.md index 365e60352..001c09f40 100644 --- a/disks/pcx86/windows/1.01/README.md +++ b/disks/pcx86/windows/1.01/README.md @@ -2,17 +2,18 @@ layout: page title: Microsoft Windows 1.01 permalink: /disks/pcx86/windows/1.01/ +redirect_from: + - /configs/pc/machines/5160/ega/640kb/win101/ + - /devices/pc/machine/5160/ega/640kb/win101/ + - /devices/pc/machine/5160/ega/640kb/win101/debugger/ + - /disks/pc/win/win101/ + - /disks/pc/windows/1.01/ machines: - type: pcx86 id: ibm5160 state: ibm5160-ega.json config: /devices/pcx86/machine/5160/ega/640kb/machine.xml drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/PCDOS200-WIN101-EGA.json"}]' -redirect_from: - - /configs/pc/machines/5160/ega/640kb/win101/ - - /devices/pcx86/machine/5160/ega/640kb/win101/ - - /devices/pcx86/machine/5160/ega/640kb/win101/debugger/ - - /disks/pcx86/win/win101/ --- Microsoft Windows 1.01 diff --git a/disks/pcx86/windows/2.03/README.md b/disks/pcx86/windows/2.03/README.md index cb272791a..218ca26e6 100644 --- a/disks/pcx86/windows/2.03/README.md +++ b/disks/pcx86/windows/2.03/README.md @@ -3,7 +3,8 @@ layout: page title: Microsoft Windows 2.03 permalink: /disks/pcx86/windows/2.03/ redirect_from: - - /disks/pcx86/win/win203/ + - /disks/pc/win/win203/ + - /disks/pc/windows/2.03/ --- Microsoft Windows 2.03 diff --git a/disks/pcx86/windows/2.0x/README.md b/disks/pcx86/windows/2.0x/README.md index a916357c0..24d52e219 100644 --- a/disks/pcx86/windows/2.0x/README.md +++ b/disks/pcx86/windows/2.0x/README.md @@ -2,6 +2,9 @@ layout: page title: Microsoft Windows/386 2.0x permalink: /disks/pcx86/windows/2.0x/ +redirect_from: + - /disks/pc/windows/2.01/ + - /disks/pc/windows/2.0x/ machines: - type: pcx86 id: deskpro386 @@ -9,8 +12,6 @@ machines: config: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/COMPAQ310-WIN386201-VGA.json"}]' autoMount: '' -redirect_from: - - /disks/pcx86/windows/2.01/ --- Microsoft Windows/386 2.0 existed as the following "point releases": diff --git a/disks/pcx86/windows/3.00/README.md b/disks/pcx86/windows/3.00/README.md index 1cca5e10f..3af7e5c26 100644 --- a/disks/pcx86/windows/3.00/README.md +++ b/disks/pcx86/windows/3.00/README.md @@ -3,7 +3,8 @@ layout: page title: Microsoft Windows 3.00 permalink: /disks/pcx86/windows/3.00/ redirect_from: - - /devices/pcx86/machine/5170/ega/1152kb/win300/ + - /devices/pc/machine/5170/ega/1152kb/win300/ + - /disks/pc/windows/3.00/ machines: - type: pcx86 id: ibm5170-win300 diff --git a/disks/pcx86/windows/win95/4.00.499/README.md b/disks/pcx86/windows/win95/4.00.499/README.md index a326e7450..b49792301 100644 --- a/disks/pcx86/windows/win95/4.00.499/README.md +++ b/disks/pcx86/windows/win95/4.00.499/README.md @@ -3,7 +3,8 @@ layout: page title: Microsoft Windows 95 (Build 499) permalink: /disks/pcx86/windows/win95/4.00.499/ redirect_from: - - /disks/pcx86/windows/win95/build499/ + - /disks/pc/windows/win95/build499/ + - /disks/pc/windows/win95/4.00.499/ machines: - type: pcx86 id: deskpro386 diff --git a/docs/about/README.md b/docs/about/README.md index 1b1995323..8be12b0de 100644 --- a/docs/about/README.md +++ b/docs/about/README.md @@ -1,16 +1,16 @@ --- layout: page -title: JavaScript Machines +title: About PCjs menu_title: About menu_order: 9 permalink: /docs/about/ --- -## About JavaScript Machines +## About PCjs -The JavaScript Machines Project is a collection of computer simulations written in [JavaScript](/modules/). -It has been released on GitHub as the [PCjs Project](https://github.com/jeffpar/pcjs), a copy of which -is hosted here at [{{ site.pcjs.domain }}]({{ site.url }}/) (formerly [jsmachines.net](http://jsmachines.net/)). +The [PCjs Project](https://github.com/jeffpar/pcjs) is a collection of computer simulations written in +[JavaScript](/modules/). The project is maintained on GitHub and is hosted here at +[{{ site.pcjs.domain }}]({{ site.url }}/) (formerly [jsmachines.net](http://jsmachines.net/)). The goals of the project are to create fast, full-featured simulations of classic computer hardware, help people understand how these early machines worked, make it easy to experiment with different machine @@ -25,37 +25,34 @@ capabilities can be found in the [Documentation](/docs/). ### Emulating the Challenger 1P -The first JavaScript Machines simulation was [C1Pjs](/docs/c1pjs/), a simulation of the +The first PCjs simulation was [C1Pjs](/docs/c1pjs/), a simulation of the Challenger 1P, which was a 6502-based microcomputer introduced by Ohio Scientific in 1978. -C1Pjs v1.0 was released in July 2012, originally on ecpsim.org and cpusim.org, and then -[jsmachines.net](http://jsmachines.net/), which has since become [{{ site.pcjs.domain }}]({{ site.url }}/). -More information about the first release of C1Pjs was also [posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) -on the [OSI Discussion Forum](http://osiweb.org/osiforum/index.php) at [osiweb.org](http://osiweb.org/). +C1Pjs v1.0 was released in July 2012. More information about the first release of C1Pjs was +[posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) on the +[OSI Discussion Forum](http://osiweb.org/osiforum/index.php) at [osiweb.org](http://osiweb.org/). --- ### Emulating the IBM PC -The next JavaScript Machines simulation was [PCx86](/docs/about/pcx86/), which simulates the original IBM PC, IBM PC XT, -and IBM PC AT. Browse the [source code](/modules/pcx86/) here or on [GitHub](https://github.com/jeffpar/pcjs). +The next PCjs simulation was [PCx86](/docs/about/pcx86/), which simulates the original IBM PC, IBM PC XT, +and IBM PC AT. PCx86 v1.0 was released in late 2012. Browse the source code [here](/modules/pcx86/) or on +[GitHub](https://github.com/jeffpar/pcjs). [PCx86](/docs/about/pcx86/) emulates the Intel 8088, 80186, 80286 and 80386 CPUs, as well as IBM Monochrome Display Adapter (MDA), Color Graphics Adapter (CGA), Enhanced Graphics Adapter (EGA), and Video Graphics Array (VGA) video cards, along with assorted motherboard and expansion bus components. It also includes an optional [Debugger](/docs/pcx86/debugger/) and a user-configurable [Control Panel](/docs/pcx86/panel/). -PCx86 v1.0 was released on [jsmachines.net](http://jsmachines.net/) in late 2012, and the JavaScript Machines Project, -with its second full-featured machine emulation, was launched. - Read [About PCx86](/docs/about/pcx86/) to learn more about its history, features, and upcoming improvements. --- -### Migrating to Node: The PCjs Project +### Migrating to Node -The JavaScript Machines Project was migrated to a [Node.js](http://nodejs.org) web server in 2014, and became the -PCjs Project. +The PCjs web server was originally written in PHP and hosted at [jsmachines.net](http://jsmachines.net/), but in 2014, +it was migrated to a [Node.js](http://nodejs.org) web server and hosted at [pcjs.org](http://www.pcjs.org/). The goals included: @@ -63,11 +60,18 @@ The goals included: - Leveraging the Node.js web server to provide more sophisticated I/O capabilities - Improving overall website design, including structure, appearance and responsiveness -The PCjs web server includes a number of custom Node modules that provide many of the same server-side features +The PCjs Node web server includes a number of custom Node modules that provide many of the same server-side features found on [jsmachines.net](http://jsmachines.net/), including new ROM and disk image conversion APIs, and a Markdown module that supports a subset of the [Markdown syntax](http://daringfireball.net/projects/markdown/syntax), including extensions to the link syntax that make it easy to embed C1Pjs and PCx86 machine files in Markdown documents. +### Migrating to GitHub Pages + +To simplify hosting requirements, the PCjs Project was migrated to GitHub Pages in late 2015. The project still +includes the original Node-based web server, which is useful for development and debugging, but for production sites +(including [pcjs.org](http://www.pcjs.org/), using Jekyll to generate a static copy of the project for the web is the +preferred solution. + --- License diff --git a/index.md b/index.md index 31ec74934..f0993d877 100644 --- a/index.md +++ b/index.md @@ -11,9 +11,9 @@ machines: config: /devices/c1p/machine/8kb/large/machine.xml --- -Welcome to PCjs, home of the first IBM PC simulation to run in your web browser without -any plugins. It was released in Fall 2012 as part of the [PCjs Project](https://github.com/jeffpar/pcjs), -which includes: +Welcome to PCjs, home of [PCx86](/docs/pcx86/), the original IBM PC simulation written entirely JavaScript. +It was added in Fall 2012 to the [PCjs Project](https://github.com/jeffpar/pcjs), which now includes the following +JavaScript Machines: * [PCx86](/docs/pcx86/), an x86-based IBM PC and PC-compatible emulator * [PC8080](/modules/pc8080/), an 8080-based generic machine emulator