From 71fa2547be6028e74f00a1f83be406a13afd26dd Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 13:39:57 -0800 Subject: [PATCH 01/34] Allow a default machine name to appear as a placeholder while the script(s) load --- _includes/machine-engines.html | 22 ++++++++++++++++++++++ _includes/machine.html | 11 ++++++++++- disks/README.md | 4 ++-- index.md | 1 + modules/markout/lib/markout.js | 5 +++-- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 1179183e6..35466034a 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -1,3 +1,25 @@ +{% comment %} +As documented in /modules/markout/lib/markout.js, the following machine properties are recognized in Front Matter: + + 'id' (eg, "ibm5150") + 'name' (eg, "IBM PC (Model 5150) with Monochrome Display") + 'type' (eg, "pc" or "pc-dbg") + 'config' (eg, "machine.xml") + 'template' (eg, "machine.xsl") + 'uncompiled' (eg, true) + 'parms' + +and the following properties (along with any property not listed above) will be added to the 'parms' property: + + 'automount' (eg, {"A":{"name":"OS/2 FOOTBALL Boot Disk (v7.68.17)","path":"/disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json"}}) + 'state' (eg, "state.json") + 'messages' (eg, "disk") + +Of all the above properties, the following are purely cosmetic: + + 'name' (used by machine.html, not machine-engines.html) + +{% endcomment %} {% for machine in page.machines %} {% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %} {% unless machine.config %} diff --git a/_includes/machine.html b/_includes/machine.html index 69a0ef37f..7b1e4619e 100644 --- a/_includes/machine.html +++ b/_includes/machine.html @@ -1 +1,10 @@ -
+
+ {% assign machine_name = "PCjs: The Virtual IBM PC" %} + {% for machine in page.machines %} + {% if include.id == machine.id and machine.name%} + {% assign machine_name = machine.name %} + {% break %} + {% endif %} + {% endfor %} + [{{ machine_name }}] +
diff --git a/disks/README.md b/disks/README.md index adb26e5d8..28d00a608 100644 --- a/disks/README.md +++ b/disks/README.md @@ -21,5 +21,5 @@ with the *format* parameter set to `img` instead of `json`. For example: In fact, when browsing the disk archives, the PCjs web server automatically provides "onclick" handlers for links to JSON-encoded disk images, which will invoke the API for you. -See **Creating PCjs-Compatible Disk Images** in the [PCjs Documentation](/docs/pcjs/) for more information -about supported disks and formats. +See **Creating PCjs-Compatible Disk Images** in the [PCjs Documentation](/docs/pcjs/#creating-pcjs-compatible-disk-images) +for more information about supported disks and formats. diff --git a/index.md b/index.md index 22d10b56f..f730ecb2d 100644 --- a/index.md +++ b/index.md @@ -4,6 +4,7 @@ permalink: / machines: - type: pc id: ibm5150 + name: "IBM PC (Model 5150) with Monochrome Display" config: /devices/pc/machine/5150/mda/64kb/machine.xml - type: c1p id: demoC1P diff --git a/modules/markout/lib/markout.js b/modules/markout/lib/markout.js index 9fb3f8476..3e49e3fbb 100644 --- a/modules/markout/lib/markout.js +++ b/modules/markout/lib/markout.js @@ -314,7 +314,8 @@ MarkOut.aHTMLEntities = { * to the 'parms' object as a string property. * * 'id' (eg, "ibm5150") - * 'type' (eg, "pc") + * 'name' (eg, "IBM PC (Model 5150) with Monochrome Display") + * 'type' (eg, "pc" or "pc-dbg") * 'config' (eg, "machine.xml") * 'template' (eg, "machine.xsl") * 'uncompiled' (eg, true) @@ -328,7 +329,7 @@ MarkOut.aHTMLEntities = { * * and any other string-based property you wish to pass through to PCjs (via the embedPC() sParms parameter). */ -MarkOut.aFMReservedMachineProps = ['id', 'type', 'config', 'template', 'uncompiled', 'automount', 'parms']; +MarkOut.aFMReservedMachineProps = ['id', 'name', 'type', 'config', 'template', 'uncompiled', 'automount', 'parms']; /** * convertMD() From 964eed08ea27cfcfbaebf90aae6f8f13e4ff9208 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 14:55:16 -0800 Subject: [PATCH 02/34] Some Jekyll tweaks for developer/debug mode --- _developer.yml | 87 +++++++++++++++++++++++ disks/pc/windows/win95/4.00.950/README.md | 14 +++- modules/htmlout/lib/htmlout.js | 4 +- modules/pcjs/lib/defines.js | 4 +- modules/shared/lib/nodebug.js | 2 +- 5 files changed, 105 insertions(+), 6 deletions(-) diff --git a/_developer.yml b/_developer.yml index 1beee110a..d7b3c5ddc 100644 --- a/_developer.yml +++ b/_developer.yml @@ -2,3 +2,90 @@ developer: true pcjs: compiled: false + # + # Since pcjs.compiled is false, the following scripts will be included instead, in the order listed; + # and since nodebug.js is included immediately after defines.js, DEBUG code is disabled by default. + # + # Note that the Node web server is considerably smarter than the Jekyll templates we're using; Node + # will automatically skip (or include) nodebug.js depending on whether the server is in DEBUG mode, + # and will include nodebugger.js (and skip debugger.js) if DEBUGGER is disabled. The Node server + # also ensures that only one uncompiled copy of each of JavaScript file is included on a given page, + # regardless how many different machines are loaded on the page. + # + # But, you're a developer, otherwise you wouldn't be starting Jekyll like this: + # + # bundle exec jekyll serve --config _config.yml,_developer.yml + # + # so deal with it! ;-) + # + # NOTE: If you're debugging PCjs source code, you'll probably be happier using a JetBrains IDE like WebStorm, + # launching PCjs pages via Node rather than Jekyll, and using the JetBrains Chrome debugger plug-in. + # + pc_scripts: + - /modules/shared/lib/defines.js + - /modules/shared/lib/nodebug.js + - /modules/shared/lib/diskapi.js + - /modules/shared/lib/dumpapi.js + - /modules/shared/lib/reportapi.js + - /modules/shared/lib/userapi.js + - /modules/shared/lib/strlib.js + - /modules/shared/lib/usrlib.js + - /modules/shared/lib/weblib.js + - /modules/shared/lib/component.js + - /modules/pcjs/lib/defines.js + - /modules/pcjs/lib/x86.js + - /modules/pcjs/lib/interrupts.js + - /modules/pcjs/lib/messages.js + - /modules/pcjs/lib/panel.js + - /modules/pcjs/lib/bus.js + - /modules/pcjs/lib/memory.js + - /modules/pcjs/lib/cpu.js + - /modules/pcjs/lib/x86seg.js + - /modules/pcjs/lib/x86cpu.js + - /modules/pcjs/lib/x86fpu.js + - /modules/pcjs/lib/x86func.js + - /modules/pcjs/lib/x86ops.js + - /modules/pcjs/lib/x86op0f.js + - /modules/pcjs/lib/x86modb.js + - /modules/pcjs/lib/x86modw.js + - /modules/pcjs/lib/x86modb16.js + - /modules/pcjs/lib/x86modw16.js + - /modules/pcjs/lib/x86modb32.js + - /modules/pcjs/lib/x86modw32.js + - /modules/pcjs/lib/x86modsib.js + - /modules/pcjs/lib/chipset.js + - /modules/pcjs/lib/rom.js + - /modules/pcjs/lib/ram.js + - /modules/pcjs/lib/keyboard.js + - /modules/pcjs/lib/video.js + - /modules/pcjs/lib/parallelport.js + - /modules/pcjs/lib/serialport.js + - /modules/pcjs/lib/mouse.js + - /modules/pcjs/lib/disk.js + - /modules/pcjs/lib/fdc.js + - /modules/pcjs/lib/hdc.js + - /modules/pcjs/lib/debugger.js + - /modules/pcjs/lib/state.js + - /modules/pcjs/lib/computer.js + - /modules/shared/lib/embed.js + c1p_scripts: + - /modules/shared/lib/defines.js + - /modules/shared/lib/nodebug.js + - /modules/shared/lib/dumpapi.js + - /modules/shared/lib/reportapi.js + - /modules/shared/lib/strlib.js + - /modules/shared/lib/usrlib.js + - /modules/shared/lib/weblib.js + - /modules/shared/lib/component.js + - /modules/c1pjs/lib/defines.js + - /modules/c1pjs/lib/panel.js + - /modules/c1pjs/lib/cpu.js + - /modules/c1pjs/lib/rom.js + - /modules/c1pjs/lib/ram.js + - /modules/c1pjs/lib/keyboard.js + - /modules/c1pjs/lib/video.js + - /modules/c1pjs/lib/serial.js + - /modules/c1pjs/lib/disk.js + - /modules/c1pjs/lib/debugger.js + - /modules/c1pjs/lib/computer.js + - /modules/shared/lib/embed.js diff --git a/disks/pc/windows/win95/4.00.950/README.md b/disks/pc/windows/win95/4.00.950/README.md index 49d3ebc9b..5d1510b60 100644 --- a/disks/pc/windows/win95/4.00.950/README.md +++ b/disks/pc/windows/win95/4.00.950/README.md @@ -11,8 +11,20 @@ machines: Microsoft Windows 95 (First Retail Release) --- +Windows 95 was the successor to Windows 3.1 and included a number of important new features: + + * Support for 32-bit Windows applications + * Long mixed-case filenames (up to 255 characters) + * GUI improvements (e.g., Explorer, **Start** button, Taskbar, shortcuts) + +It was also first version of Windows that *required* an 80386 CPU (preferably a D-stepping or later). + Windows 95 was released to manufacturing on July 14, 1995 and went on sale at midnight on August 24, 1995. -More information about the Windows 95 demo below is available in the [PCjs Blog](/blog/2015/09/21/). +It 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 +internet connection. + +More information about this Windows 95 demo is available in the [PCjs Blog](/blog/2015/09/21/). {% include machine.html id="deskpro386" %} diff --git a/modules/htmlout/lib/htmlout.js b/modules/htmlout/lib/htmlout.js index c2c5cfbc6..42eeb0d60 100644 --- a/modules/htmlout/lib/htmlout.js +++ b/modules/htmlout/lib/htmlout.js @@ -1894,8 +1894,8 @@ HTMLOut.prototype.processMachines = function(aMachines, done) } } /* - * Step 2: If there's a "debugger.js" source file in the list of uncompiled files, we need to remove it, - * which we do by using the Array splice() method, removing the 1 matching element from the array. + * Step 2: If there's a "debugger.js" source file in the list of uncompiled files, we need to remove + * it, which we do by using the Array splice() method, removing the 1 matching element from the array. */ for (i = 0; i < asFiles.length; i++) { if (asFiles[i].indexOf("/debugger.js") >= 0) { diff --git a/modules/pcjs/lib/defines.js b/modules/pcjs/lib/defines.js index 587877cf3..ae8a95daa 100644 --- a/modules/pcjs/lib/defines.js +++ b/modules/pcjs/lib/defines.js @@ -93,7 +93,7 @@ var TYPEDARRAYS = (typeof ArrayBuffer !== 'undefined'); * TODO: BACKTRACK support is currently completely disabled until we have a chance to investigate the problem * discussed in Bus.addBackTrackObject(). */ -var BACKTRACK = !COMPILED; +var BACKTRACK = !COMPILED && DEBUG; /** * @define {boolean} @@ -127,7 +127,7 @@ var I386 = true; * * COMPAQ386 enables Compaq DeskPro 386 support. Requires I386 support as well (duh). */ -var COMPAQ386 = true; +var COMPAQ386 = I386; /** * @define {boolean} diff --git a/modules/shared/lib/nodebug.js b/modules/shared/lib/nodebug.js index 987751a0c..9b6375140 100644 --- a/modules/shared/lib/nodebug.js +++ b/modules/shared/lib/nodebug.js @@ -39,7 +39,7 @@ * so that all DEBUG-only code will be removed by the compiler. * * However, when we're in "development mode" and want to run uncompiled code without any DEBUG-only - * code, we must arrange for this additional file, nodebug.js, to be loaded as early as possible, + * code, we must arrange for this additional file (nodebug.js) to be loaded immediately after defines.js, * which will then set DEBUG to false at runtime. */ DEBUG = false; From 4315fb8dd3a9fd1b34327276accc64fa4128e3b9 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 16:06:52 -0800 Subject: [PATCH 03/34] Remove package.json files for internal modules (revisit this if we ever plan to publish them) --- devices/pc/machine/README.md | 7 ++++--- modules/diskdump/package.json | 19 ------------------- modules/filedump/package.json | 19 ------------------- modules/htmlout/package.json | 19 ------------------- modules/markout/package.json | 19 ------------------- modules/pcjs/package.json | 15 --------------- 6 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 modules/diskdump/package.json delete mode 100644 modules/filedump/package.json delete mode 100644 modules/htmlout/package.json delete mode 100644 modules/markout/package.json delete mode 100644 modules/pcjs/package.json diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 1a937f4c7..ccba4847c 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -39,13 +39,14 @@ Machines from our [IBM PC Application Archive](/apps/pc/): And here are some machines from our [IBM PC Disk Archive](/disks/pc/): +* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [PC-DOS 1.00](/disks/pc/dos/ibm/1.00/) * [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) * [IBM Diagnostics](/disks/pc/diags/ibm/2.20/) -* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) -* [OS/2 Prototype Disks](/disks/pc/os2/misc/) -* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/) +* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) +* [Microsoft Windows 95](/disks/pc/windows/win95/4.00.950/) +* [OS/2 Prototype Disks](/disks/pc/os2/misc/) --- diff --git a/modules/diskdump/package.json b/modules/diskdump/package.json deleted file mode 100644 index 09a3abbb1..000000000 --- a/modules/diskdump/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "diskdump", - "version": "0.2.0", - "description": "Converts disk images to/from JSON", - "main": "./lib/diskdump", - "scripts": { - "test": "echo \"error: no test specified\" && exit 1" - }, - "author": "Jeff Parsons ", - "licenses": [ - { - "type": "GPLv3", - "url": "http://www.gnu.org/licenses/gpl.html" - } - ], - "bin": { - "diskdump": "./bin/diskdump" - } -} diff --git a/modules/filedump/package.json b/modules/filedump/package.json deleted file mode 100644 index 4fe8d841d..000000000 --- a/modules/filedump/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "filedump", - "version": "0.2.0", - "description": "Converts file contents to JSON", - "main": "./lib/filedump", - "scripts": { - "test": "echo \"error: no test specified\" && exit 1" - }, - "author": "Jeff Parsons ", - "licenses": [ - { - "type": "GPLv3", - "url": "http://www.gnu.org/licenses/gpl.html" - } - ], - "bin": { - "filedump": "./bin/filedump" - } -} diff --git a/modules/htmlout/package.json b/modules/htmlout/package.json deleted file mode 100644 index 9bb8ea47b..000000000 --- a/modules/htmlout/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "htmlout", - "version": "0.1.0", - "description": "Filters HTTP requests and creates default documents from HTML templates", - "main": "./lib/htmlout", - "scripts": { - "test": "echo \"error: no test specified\" && exit 1" - }, - "author": "Jeff Parsons ", - "licenses": [ - { - "type": "GPLv3", - "url": "http://www.gnu.org/licenses/gpl.html" - } - ], - "bin": { - "example": "./bin/htmlout" - } -} diff --git a/modules/markout/package.json b/modules/markout/package.json deleted file mode 100644 index 2d518935a..000000000 --- a/modules/markout/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "markout", - "version": "0.1.0", - "description": "Transforms simplified Markdown to HTML", - "main": "./lib/markout", - "scripts": { - "test": "echo \"error: no test specified\" && exit 1" - }, - "author": "Jeff Parsons ", - "licenses": [ - { - "type": "GPLv3", - "url": "http://www.gnu.org/licenses/gpl.html" - } - ], - "bin": { - "example": "./bin/markout" - } -} diff --git a/modules/pcjs/package.json b/modules/pcjs/package.json deleted file mode 100644 index 961f05145..000000000 --- a/modules/pcjs/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "PCjs", - "version": "1.17.5", - "description": "IBM PC Emulator", - "author": "Jeff Parsons ", - "licenses": [ - { - "type": "GPLv3", - "url": "http://www.gnu.org/licenses/gpl.html" - } - ], - "bin": { - "example": "./bin/pcjs" - } -} From c3978e98599fea1880c270e17c8766a46b5848cf Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 16:12:49 -0800 Subject: [PATCH 04/34] Well, that was a bad idea (restoring package.json files for internal modules, sans outdated version numbers) --- modules/diskdump/package.json | 18 ++++++++++++++++++ modules/filedump/package.json | 18 ++++++++++++++++++ modules/htmlout/package.json | 18 ++++++++++++++++++ modules/markout/package.json | 18 ++++++++++++++++++ modules/pcjs/package.json | 14 ++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 modules/diskdump/package.json create mode 100644 modules/filedump/package.json create mode 100644 modules/htmlout/package.json create mode 100644 modules/markout/package.json create mode 100644 modules/pcjs/package.json diff --git a/modules/diskdump/package.json b/modules/diskdump/package.json new file mode 100644 index 000000000..f8aad1089 --- /dev/null +++ b/modules/diskdump/package.json @@ -0,0 +1,18 @@ +{ + "name": "diskdump", + "description": "Converts disk images to/from JSON", + "main": "./lib/diskdump", + "scripts": { + "test": "echo \"error: no test specified\" && exit 1" + }, + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "diskdump": "./bin/diskdump" + } +} diff --git a/modules/filedump/package.json b/modules/filedump/package.json new file mode 100644 index 000000000..7ede06076 --- /dev/null +++ b/modules/filedump/package.json @@ -0,0 +1,18 @@ +{ + "name": "filedump", + "description": "Converts file contents to JSON", + "main": "./lib/filedump", + "scripts": { + "test": "echo \"error: no test specified\" && exit 1" + }, + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "filedump": "./bin/filedump" + } +} diff --git a/modules/htmlout/package.json b/modules/htmlout/package.json new file mode 100644 index 000000000..9ad71115a --- /dev/null +++ b/modules/htmlout/package.json @@ -0,0 +1,18 @@ +{ + "name": "htmlout", + "description": "Filters HTTP requests and creates default documents from HTML templates", + "main": "./lib/htmlout", + "scripts": { + "test": "echo \"error: no test specified\" && exit 1" + }, + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "example": "./bin/htmlout" + } +} diff --git a/modules/markout/package.json b/modules/markout/package.json new file mode 100644 index 000000000..24cdeab38 --- /dev/null +++ b/modules/markout/package.json @@ -0,0 +1,18 @@ +{ + "name": "markout", + "description": "Transforms simplified Markdown to HTML", + "main": "./lib/markout", + "scripts": { + "test": "echo \"error: no test specified\" && exit 1" + }, + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "example": "./bin/markout" + } +} diff --git a/modules/pcjs/package.json b/modules/pcjs/package.json new file mode 100644 index 000000000..7fe69a19e --- /dev/null +++ b/modules/pcjs/package.json @@ -0,0 +1,14 @@ +{ + "name": "PCjs", + "description": "IBM PC Emulator", + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "example": "./bin/pcjs" + } +} From ee8dd23594caf3df64c3836d3ea49825343c029b Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 16:16:43 -0800 Subject: [PATCH 05/34] Two more placeholder package.json files --- modules/c1pjs/package.json | 11 +++++++++++ modules/textout/package.json | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 modules/c1pjs/package.json create mode 100644 modules/textout/package.json diff --git a/modules/c1pjs/package.json b/modules/c1pjs/package.json new file mode 100644 index 000000000..befb4ce80 --- /dev/null +++ b/modules/c1pjs/package.json @@ -0,0 +1,11 @@ +{ + "name": "C1Pjs", + "description": "Challenger 1P Emulator", + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ] +} diff --git a/modules/textout/package.json b/modules/textout/package.json new file mode 100644 index 000000000..f4271ce24 --- /dev/null +++ b/modules/textout/package.json @@ -0,0 +1,18 @@ +{ + "name": "textout", + "description": "Miscellaneous text (eg, assembly language) file transformations", + "main": "./lib/textout", + "scripts": { + "test": "echo \"error: no test specified\" && exit 1" + }, + "author": "Jeff Parsons ", + "licenses": [ + { + "type": "GPLv3", + "url": "http://www.gnu.org/licenses/gpl.html" + } + ], + "bin": { + "textout": "./bin/textout" + } +} From 5f0972e8e627f5ccd13ef5c4717d3b7294e4eeeb Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 16:31:42 -0800 Subject: [PATCH 06/34] Jekyll redirect_from doesn't work with URLs ending with .xml extension --- devices/c1p/machine/8kb/array/README.md | 1 - devices/pc/machine/5160/cga/256kb/win101/README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/devices/c1p/machine/8kb/array/README.md b/devices/c1p/machine/8kb/array/README.md index 2c0799f9f..8bac8d7b9 100644 --- a/devices/c1p/machine/8kb/array/README.md +++ b/devices/c1p/machine/8kb/array/README.md @@ -33,7 +33,6 @@ machines: redirect_from: - /configs/c1p/machines/array/ - /configs/c1p/machines/8kb/array/ - - /devices/other/c1p/array.xml --- Challenger 1P (8Kb) "Server Array" diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md index 9a59bef13..a796f39b8 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/README.md +++ b/devices/pc/machine/5160/cga/256kb/win101/README.md @@ -4,7 +4,6 @@ title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Win permalink: /devices/pc/machine/5160/cga/256kb/win101/ redirect_from: - /configs/pc/machines/5160/cga/256kb/win101/ - - /demos/pc/cga-win101/xt-cga-win101.xml - /demos/pc/cga-win101/ machines: - type: pc From 70b378f04513fa4fef838dfc5842d49858c55975 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 17:09:49 -0800 Subject: [PATCH 07/34] This seems to be the simplest way to get Jekyll to deal with an old XML URL --- demos/pc/cga-win101/xt-cga-win101.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 demos/pc/cga-win101/xt-cga-win101.xml diff --git a/demos/pc/cga-win101/xt-cga-win101.xml b/demos/pc/cga-win101/xt-cga-win101.xml new file mode 100644 index 000000000..f185edd2f --- /dev/null +++ b/demos/pc/cga-win101/xt-cga-win101.xml @@ -0,0 +1,22 @@ + + + + IBM PC XT (Model 5160) running Windows v1.01 + + + + + + From c2c6a1d31ccacde31b0441809adb4ea433b0e6a9 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 17:19:35 -0800 Subject: [PATCH 08/34] This seems to be the simplest way to get Jekyll to deal with an old XML URL --- demos/pc/cga-win101/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 demos/pc/cga-win101/README.md diff --git a/demos/pc/cga-win101/README.md b/demos/pc/cga-win101/README.md new file mode 100644 index 000000000..af8a61ac9 --- /dev/null +++ b/demos/pc/cga-win101/README.md @@ -0,0 +1,8 @@ +IBM PC XT running Windows 1.01 +--- + +This folder, and the accompanying [xt-cga-win101.xml](xt-cga-win101.xml) file, exist only because Jekyll's +"Redirect From" plugin is unable to redirect from a URL containing an ".xml" extension. + +Note that [xt-cga-win101.xml](xt-cga-win101.xml) is a copy of +[/devices/pc/machine/5160/cga/256kb/win101/machine.xml](../../../devices/pc/machine/5160/cga/256kb/win101/machine.xml). From 9a3a9c31a22a7ba077bfc15c0edc4f93120e52e8 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 17:41:19 -0800 Subject: [PATCH 09/34] Better XML redirect fix: pretend the old URL was a folder with an .xml extension --- demos/pc/cga-win101/README.md | 8 ------- demos/pc/cga-win101/xt-cga-win101.xml | 22 ------------------- devices/c1p/machine/8kb/array/README.md | 1 + .../machine/5160/cga/256kb/win101/README.md | 1 + 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 demos/pc/cga-win101/README.md delete mode 100644 demos/pc/cga-win101/xt-cga-win101.xml diff --git a/demos/pc/cga-win101/README.md b/demos/pc/cga-win101/README.md deleted file mode 100644 index af8a61ac9..000000000 --- a/demos/pc/cga-win101/README.md +++ /dev/null @@ -1,8 +0,0 @@ -IBM PC XT running Windows 1.01 ---- - -This folder, and the accompanying [xt-cga-win101.xml](xt-cga-win101.xml) file, exist only because Jekyll's -"Redirect From" plugin is unable to redirect from a URL containing an ".xml" extension. - -Note that [xt-cga-win101.xml](xt-cga-win101.xml) is a copy of -[/devices/pc/machine/5160/cga/256kb/win101/machine.xml](../../../devices/pc/machine/5160/cga/256kb/win101/machine.xml). diff --git a/demos/pc/cga-win101/xt-cga-win101.xml b/demos/pc/cga-win101/xt-cga-win101.xml deleted file mode 100644 index f185edd2f..000000000 --- a/demos/pc/cga-win101/xt-cga-win101.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - IBM PC XT (Model 5160) running Windows v1.01 - - - - - - diff --git a/devices/c1p/machine/8kb/array/README.md b/devices/c1p/machine/8kb/array/README.md index 8bac8d7b9..77f392778 100644 --- a/devices/c1p/machine/8kb/array/README.md +++ b/devices/c1p/machine/8kb/array/README.md @@ -33,6 +33,7 @@ machines: redirect_from: - /configs/c1p/machines/array/ - /configs/c1p/machines/8kb/array/ + - /devices/other/c1p/array.xml/ --- Challenger 1P (8Kb) "Server Array" diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md index a796f39b8..728ba5cc6 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/README.md +++ b/devices/pc/machine/5160/cga/256kb/win101/README.md @@ -4,6 +4,7 @@ title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Win permalink: /devices/pc/machine/5160/cga/256kb/win101/ redirect_from: - /configs/pc/machines/5160/cga/256kb/win101/ + - /demos/pc/cga-win101/xt-cga-win101.xml/ - /demos/pc/cga-win101/ machines: - type: pc From a9e59794069983b6cb9d1da37efa59afa70999d9 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 9 Feb 2016 18:15:49 -0800 Subject: [PATCH 10/34] static folders renamed to archive folders --- .gitignore | 2 +- _config.yml | 2 +- _layouts/viewer.html | 2 +- apps/README.md | 2 +- apps/pc/1981/visicalc/manifest.xml | 2 +- apps/pc/1982/esuite/manifest.xml | 2 +- apps/pc/1985/rogue/manifest.xml | 2 +- apps/pc/1987/thinktank/manifest.xml | 2 +- apps/pc/1988/moria/manifest.xml | 2 +- apps/pc/1992/moria/manifest.xml | 2 +- apps/pc/README.md | 4 +- .../5170/ega/640kb/rev1/debugger/manifest.xml | 4 +- .../pc/rom/compaq/bios/deskpro386/README.md | 4 +- devices/pc/video/ibm/ega/README.md | 2 +- disks/pc/apps/lotus/123/1.0a/manifest.xml | 8 ++-- .../pc/apps/microsoft/chart/2.02/manifest.xml | 2 +- .../apps/microsoft/winword/2.0c/manifest.xml | 12 +++--- disks/pc/apps/microsoft/word/3.0/manifest.xml | 12 +++--- disks/pc/apps/microsoft/word/3.1/manifest.xml | 16 ++++---- disks/pc/apps/microsoft/word/5.0/manifest.xml | 26 ++++++------- disks/pc/cpm/1.1b/manifest.xml | 4 +- disks/pc/diags/ibm/2.20/manifest.xml | 2 +- disks/pc/dos/compaq/1.11/manifest.xml | 2 +- disks/pc/dos/compaq/1.12/manifest.xml | 2 +- disks/pc/dos/compaq/2.12/manifest.xml | 2 +- disks/pc/dos/compaq/3.10/manifest.xml | 10 ++--- disks/pc/dos/compaq/3.31/manifest.xml | 12 +++--- disks/pc/dos/ibm/1.00/manifest.xml | 2 +- disks/pc/dos/ibm/1.10/manifest.xml | 2 +- disks/pc/dos/ibm/2.00/manifest.xml | 4 +- disks/pc/dos/ibm/2.10/manifest.xml | 4 +- disks/pc/dos/ibm/3.00/manifest.xml | 4 +- disks/pc/dos/ibm/3.10/manifest.xml | 4 +- disks/pc/dos/ibm/3.20/manifest.xml | 4 +- disks/pc/dos/ibm/3.30/manifest.xml | 6 +-- disks/pc/dos/ibm/4.00/manifest.xml | 10 ++--- disks/pc/dos/ibm/5.00/manifest.xml | 6 +-- disks/pc/dos/ibm/6.10/manifest.xml | 10 ++--- disks/pc/dos/ibm/7.00/manifest.xml | 14 +++---- disks/pc/dos/microsoft/3.20/manifest.xml | 8 ++-- disks/pc/dos/microsoft/3.21/manifest.xml | 4 +- disks/pc/dos/microsoft/3.30/manifest.xml | 4 +- disks/pc/dos/microsoft/3.31/manifest.xml | 2 +- disks/pc/dos/microsoft/4.00/manifest.xml | 12 +++--- disks/pc/dos/microsoft/4.01/720K/manifest.xml | 6 +-- disks/pc/dos/microsoft/4.01/manifest.xml | 12 +++--- disks/pc/dos/microsoft/5.00/manifest.xml | 16 ++++---- disks/pc/dos/microsoft/6.00/manifest.xml | 14 +++---- disks/pc/dos/microsoft/6.20/manifest.xml | 18 ++++----- disks/pc/dos/microsoft/6.22/manifest.xml | 16 ++++---- disks/pc/games/infocom/machine-debug.xml | 4 +- .../pc/games/microsoft/flightsim/manifest.xml | 2 +- disks/pc/minix/1.1/manifest.xml | 10 ++--- disks/pc/os2/ibm/1.0/manifest.xml | 8 ++-- disks/pc/os2/ibm/1.1/manifest.xml | 14 +++---- disks/pc/os2/ibm/1.3/manifest.xml | 20 +++++----- disks/pc/os2/microsoft/1.0/manifest.xml | 6 +-- disks/pc/os2/misc/manifest.xml | 12 +++--- .../tools/borland/pascal/3.00b/manifest.xml | 2 +- .../tools/borland/pascal/3.01a/manifest.xml | 2 +- disks/pc/tools/microsoft/basic/manifest.xml | 4 +- disks/pc/tools/microsoft/c/4.00/manifest.xml | 16 ++++---- .../pc/tools/microsoft/masm/4.00/manifest.xml | 2 +- .../tools/microsoft/mouse/5.00/manifest.xml | 4 +- .../tools/microsoft/os2/sdk/1.02/manifest.xml | 24 ++++++------ .../microsoft/windows/sdk/1.01/manifest.xml | 24 ++++++------ .../microsoft/windows/sdk/1.03/manifest.xml | 14 +++---- .../microsoft/windows/sdk/1.04/manifest.xml | 14 +++---- .../microsoft/windows/sdk/2.03/manifest.xml | 6 +-- .../microsoft/windows/sdk/3.00/manifest.xml | 20 +++++----- disks/pc/unix/ibm/pcix/1.0/manifest.xml | 38 +++++++++---------- .../unix/microport/system-v/2.3/manifest.xml | 30 +++++++-------- disks/pc/windows/1.00/manifest.xml | 8 ++-- disks/pc/windows/1.01/manifest.xml | 10 ++--- disks/pc/windows/1.02/manifest.xml | 12 +++--- disks/pc/windows/1.03/manifest.xml | 12 +++--- disks/pc/windows/1.03a/manifest.xml | 16 ++++---- disks/pc/windows/1.03b/manifest.xml | 12 +++--- disks/pc/windows/1.04/manifest.xml | 14 +++---- disks/pc/windows/2.01/manifest.xml | 6 +-- disks/pc/windows/2.03/manifest.xml | 28 +++++++------- disks/pc/windows/2.10/manifest.xml | 12 +++--- disks/pc/windows/2.11/manifest.xml | 16 ++++---- disks/pc/windows/3.00/720K/manifest.xml | 14 +++---- disks/pc/windows/3.00/manifest.xml | 10 ++--- disks/pc/windows/3.10/manifest.xml | 14 +++---- disks/pc/windows/3.11/manifest.xml | 16 ++++---- disks/pc/windows/win95/4.00.499/manifest.xml | 26 ++++++------- disks/pc/windows/win95/4.00.950/manifest.xml | 28 +++++++------- disks/pc/windows/wincomm/manifest.xml | 2 +- disks/pc/xenix/sco/8086/2.1.3/manifest.xml | 32 ++++++++-------- modules/htmlout/lib/htmlout.js | 2 +- modules/markout/lib/markout.js | 8 ++-- modules/shared/lib/netlib.js | 6 +-- notes.md | 2 +- pubs/pc/programming/manifest.xml | 6 +-- .../reference/ibm/5150/techref/manifest.xml | 2 +- .../reference/ibm/5170/techref/manifest.xml | 2 +- pubs/pc/reference/ibm/ega/manifest.xml | 2 +- pubs/pc/reference/intel/80286/manifest.xml | 2 +- 100 files changed, 461 insertions(+), 461 deletions(-) diff --git a/.gitignore b/.gitignore index e15d6c8f7..ae018efb6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ .settings node_modules npm-debug.log +archive/ /books /notes /states @@ -18,7 +19,6 @@ npm-debug.log /web private/ src/ -static/ tmp/ _site .sass-cache diff --git a/_config.yml b/_config.yml index c921bd525..6b2487f96 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,7 @@ right_brace: "}" # Build settings -exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "**/private", "src", "**/src", "**/static", "tmp", "videos", "web", ".git", ".idea"] +exclude: ["index.html", "**/index.html", "**/archive", "logs", "node_modules", "**/c64", "**/private", "src", "**/src", "tmp", "videos", "web", ".git", ".idea"] markdown: kramdown kramdown: input: GFM diff --git a/_layouts/viewer.html b/_layouts/viewer.html index 7cda7240e..2d185d246 100644 --- a/_layouts/viewer.html +++ b/_layouts/viewer.html @@ -38,7 +38,7 @@ var totalPages = parseInt(aParms['total'], 10) || 999; var frame = document.getElementById('framePDF'); if (pdf && frame) { - pdf = pdf.replace('/static/', '/'); + pdf = pdf.replace('/archive/', '/'); var i = pdf.indexOf("/pages/"); if (i > 0) { var sReturnLink = pdf.substr(0, i+1); diff --git a/apps/README.md b/apps/README.md index 4d9521f35..5a19797c1 100644 --- a/apps/README.md +++ b/apps/README.md @@ -82,7 +82,7 @@ have saved that JSON-encoded image as static file on the server, and then added <disk> entry: - + ... diff --git a/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml index 74a7714af..0c33fb670 100644 --- a/apps/pc/1981/visicalc/manifest.xml +++ b/apps/pc/1981/visicalc/manifest.xml @@ -12,7 +12,7 @@ December 16, 1981 Lotus Development - + VC.COM README.md VisiCalc License diff --git a/apps/pc/1982/esuite/manifest.xml b/apps/pc/1982/esuite/manifest.xml index 5ee5fca0c..2d702542e 100644 --- a/apps/pc/1982/esuite/manifest.xml +++ b/apps/pc/1982/esuite/manifest.xml @@ -8,7 +8,7 @@ Armonk Corporation 1982 - + Executive Suite (1982) ESUITE.COM GAME.DAT diff --git a/apps/pc/1985/rogue/manifest.xml b/apps/pc/1985/rogue/manifest.xml index 843890118..98994c09a 100644 --- a/apps/pc/1985/rogue/manifest.xml +++ b/apps/pc/1985/rogue/manifest.xml @@ -12,7 +12,7 @@ Ken Arnold Jon Lane Michael Toy - + Rogue (1985) MKOPT.EXE ROGUE.COM diff --git a/apps/pc/1987/thinktank/manifest.xml b/apps/pc/1987/thinktank/manifest.xml index dae73977f..70c2b8467 100644 --- a/apps/pc/1987/thinktank/manifest.xml +++ b/apps/pc/1987/thinktank/manifest.xml @@ -7,7 +7,7 @@ Productivity Living Videotext September 25, 1987 - + ThinkTank 2.41NP AUTOEXEC.BAT READ_ME.DB diff --git a/apps/pc/1988/moria/manifest.xml b/apps/pc/1988/moria/manifest.xml index fbc13d125..feb3db3b5 100644 --- a/apps/pc/1988/moria/manifest.xml +++ b/apps/pc/1988/moria/manifest.xml @@ -14,7 +14,7 @@ D. G. Kneller MSDOS port - + Moria v4.872 CONFIG.DOC GOD diff --git a/apps/pc/1992/moria/manifest.xml b/apps/pc/1992/moria/manifest.xml index 8de060385..df9bdd36f 100644 --- a/apps/pc/1992/moria/manifest.xml +++ b/apps/pc/1992/moria/manifest.xml @@ -92,7 +92,7 @@ Ben Schreiber Macintosh port for Think C - + Moria 5.5 EXP.DOC MORIA.CNF diff --git a/apps/pc/README.md b/apps/pc/README.md index 9d2e18cb5..b41c04374 100644 --- a/apps/pc/README.md +++ b/apps/pc/README.md @@ -32,12 +32,12 @@ Next, the [manifest](1981/visicalc/manifest.xml) required a disk image containin (VC.COM). We used the [DiskDump](/modules/diskdump/) module to create that disk image: cd apps/pc/1981/visicalc - node ../../../../modules/diskdump/bin/diskdump --path="static/VC.COM;../README.md" --format=json --output=disk.json --manifest + node ../../../../modules/diskdump/bin/diskdump --path="archive/VC.COM;../README.md" --format=json --output=disk.json --manifest The DiskDump command created a disk image named "disk.json" containing two files ("VC.COM" from the "static" subdirectory, and "README.md" from the "static" parent directory) and automatically added that disk image to the demo's [manifest](1981/visicalc/manifest.xml): - + VC.COM README.md diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml index 798c1bf70..a9cfd49d4 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml @@ -4,7 +4,7 @@ IBM PC AT References IBM 5170 Technical Reference (March 1984) - + I/O Address Map CMOS Addresses BIOS Map @@ -16,7 +16,7 @@ 80286 and 80287 Programmers Reference Manual (1987) - + Memory Organization and Segmentation VERR/VERW diff --git a/devices/pc/rom/compaq/bios/deskpro386/README.md b/devices/pc/rom/compaq/bios/deskpro386/README.md index b85c36e27..4287f9ad4 100644 --- a/devices/pc/rom/compaq/bios/deskpro386/README.md +++ b/devices/pc/rom/compaq/bios/deskpro386/README.md @@ -53,8 +53,8 @@ Similarly, [1989-04-14.json](1989-04-14/1989-04-14.json) was generated by first from the two 16Kb BIN files provided by [Al Kossow](http://www.vintage-computer.com/vcforum/member.php?2256-Al-Kossow): cd 1989-04-14 - filedump --file=static/109592-005.U11.bin --merge=static/109591-005.U13.bin --output=static/1989-04-14.rom --format=rom - filedump --file=static/1989-04-14.rom --output=1989-04-14.json + filedump --file=archive/109592-005.U11.bin --merge=archive/109591-005.U13.bin --output=archive/1989-04-14.rom --format=rom + filedump --file=archive/1989-04-14.rom --output=1989-04-14.json Dumping the ROMs --- diff --git a/devices/pc/video/ibm/ega/README.md b/devices/pc/video/ibm/ega/README.md index 81affd93b..cd6fef871 100644 --- a/devices/pc/video/ibm/ega/README.md +++ b/devices/pc/video/ibm/ega/README.md @@ -9,7 +9,7 @@ IBM EGA ROM To (re)build the JSON-encoded IBM EGA ROM with symbols, run the following command: - filedump --file=static/ibm-ega.rom --format=bytes --decimal + filedump --file=archive/ibm-ega.rom --format=bytes --decimal The symbol information in the MAP file will be automatically converted and appended to the dump of the ROM file. diff --git a/disks/pc/apps/lotus/123/1.0a/manifest.xml b/disks/pc/apps/lotus/123/1.0a/manifest.xml index 3c1082dd8..c3f8b8d8b 100644 --- a/disks/pc/apps/lotus/123/1.0a/manifest.xml +++ b/disks/pc/apps/lotus/123/1.0a/manifest.xml @@ -7,16 +7,16 @@ Productivity Lotus - + Lotus 1-2-3 (System) - + Lotus 1-2-3 (Utility) - + Lotus 1-2-3 (Graph) - + Lotus 1-2-3 (Tutorial) diff --git a/disks/pc/apps/microsoft/chart/2.02/manifest.xml b/disks/pc/apps/microsoft/chart/2.02/manifest.xml index e37e3ab97..02fcddac7 100644 --- a/disks/pc/apps/microsoft/chart/2.02/manifest.xml +++ b/disks/pc/apps/microsoft/chart/2.02/manifest.xml @@ -25,7 +25,7 @@ I would much rather post copies of original distribution disks here, but this is all we've currently got. - + MS Chart 2.02 (Unofficial) diff --git a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml index 0e68a54e5..baaeccecc 100644 --- a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml +++ b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml @@ -7,22 +7,22 @@ Word Processor Microsoft - + Word for Windows 2.0c (Disk 1) - + Word for Windows 2.0c (Disk 2) - + Word for Windows 2.0c (Disk 3) - + Word for Windows 2.0c (Disk 4) - + Word for Windows 2.0c (Disk 5) - + Word for Windows 2.0c (Disk 6) diff --git a/disks/pc/apps/microsoft/word/3.0/manifest.xml b/disks/pc/apps/microsoft/word/3.0/manifest.xml index 3fccb8253..9274314ce 100644 --- a/disks/pc/apps/microsoft/word/3.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.0/manifest.xml @@ -7,22 +7,22 @@ Word Processor Microsoft - + MS Word 3.0 (Disk 1) - + MS Word 3.0 (Disk 2) - + MS Word 3.0 (Disk 3) - + MS Word 3.0 (Disk 4) - + MS Word 3.0 (Disk 5) - + MS Word 3.0 (Disk 6) diff --git a/disks/pc/apps/microsoft/word/3.1/manifest.xml b/disks/pc/apps/microsoft/word/3.1/manifest.xml index 0abf773e0..f7cab82d1 100644 --- a/disks/pc/apps/microsoft/word/3.1/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.1/manifest.xml @@ -7,28 +7,28 @@ Word Processor Microsoft - + MS Word 3.1 (Disk 1) - + MS Word 3.1 (Disk 2) - + MS Word 3.1 (Disk 3) - + MS Word 3.1 (Disk 4) - + MS Word 3.1 (Disk 5) - + MS Word 3.1 (Disk 6) - + MS Word 3.1 (Disk 7) - + MS Word 3.1 (Disk 8) diff --git a/disks/pc/apps/microsoft/word/5.0/manifest.xml b/disks/pc/apps/microsoft/word/5.0/manifest.xml index 130ea8af8..d13ca7902 100644 --- a/disks/pc/apps/microsoft/word/5.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/5.0/manifest.xml @@ -7,43 +7,43 @@ Word Processor Microsoft - + MS Word 5.0 (Program 1) - + MS Word 5.0 (Program 2) - + MS Word 5.0 (Spell) - + MS Word 5.0 (Thesaurus) - + MS Word 5.0 (Utilities 1) - + MS Word 5.0 (Utilities 2) - + MS Word 5.0 (Utilities 3) - + MS Word 5.0 (Utilities/Print) - + MS Word 5.0 (Printers 1) - + MS Word 5.0 (Printers 2) - + MS Word 5.0 (Learning Kbd) - + MS Word 5.0 (Learning Mouse) - + MS Word 5.0 (Learning Adv) diff --git a/disks/pc/cpm/1.1b/manifest.xml b/disks/pc/cpm/1.1b/manifest.xml index 1eac4d43e..ec8ac959a 100644 --- a/disks/pc/cpm/1.1b/manifest.xml +++ b/disks/pc/cpm/1.1b/manifest.xml @@ -9,10 +9,10 @@ Eagle Computer May 20, 1983 - + CP/M-86 (Disk 1) - + CP/M-86 (Disk 2) diff --git a/disks/pc/diags/ibm/2.20/manifest.xml b/disks/pc/diags/ibm/2.20/manifest.xml index 8352841b0..5c54e62bc 100644 --- a/disks/pc/diags/ibm/2.20/manifest.xml +++ b/disks/pc/diags/ibm/2.20/manifest.xml @@ -8,7 +8,7 @@ IBM - + diff --git a/disks/pc/dos/compaq/1.11/manifest.xml b/disks/pc/dos/compaq/1.11/manifest.xml index ac0f2f471..0f16f1ea7 100644 --- a/disks/pc/dos/compaq/1.11/manifest.xml +++ b/disks/pc/dos/compaq/1.11/manifest.xml @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 1.11 diff --git a/disks/pc/dos/compaq/1.12/manifest.xml b/disks/pc/dos/compaq/1.12/manifest.xml index e0ec6118e..b8e90868b 100644 --- a/disks/pc/dos/compaq/1.12/manifest.xml +++ b/disks/pc/dos/compaq/1.12/manifest.xml @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 1.12 diff --git a/disks/pc/dos/compaq/2.12/manifest.xml b/disks/pc/dos/compaq/2.12/manifest.xml index 32311cb89..d228f6664 100644 --- a/disks/pc/dos/compaq/2.12/manifest.xml +++ b/disks/pc/dos/compaq/2.12/manifest.xml @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 2.12 diff --git a/disks/pc/dos/compaq/3.10/manifest.xml b/disks/pc/dos/compaq/3.10/manifest.xml index d484c4d21..de9cf7cfb 100644 --- a/disks/pc/dos/compaq/3.10/manifest.xml +++ b/disks/pc/dos/compaq/3.10/manifest.xml @@ -8,19 +8,19 @@ Microsoft/COMPAQ - + COMPAQ MS-DOS 3.10 (Disk 1) - + COMPAQ MS-DOS 3.10 (Disk 2) - + COMPAQ MS-DOS 3.10 (Personal) - + COMPAQ PC-DOS 3.20 Support - + COMPAQ DESKPRO 386 (1986) diff --git a/disks/pc/dos/compaq/3.31/manifest.xml b/disks/pc/dos/compaq/3.31/manifest.xml index 41463e911..111dd46b7 100644 --- a/disks/pc/dos/compaq/3.31/manifest.xml +++ b/disks/pc/dos/compaq/3.31/manifest.xml @@ -8,22 +8,22 @@ Microsoft/COMPAQ - + COMPAQ MS-DOS 3.31 (Disk 1) - + COMPAQ MS-DOS 3.31 (Disk 2) - + COMPAQ MS-DOS 3.31 (Disk 3) - + COMPAQ MS-DOS 3.31 (Disk 4) - + COMPAQ MS-DOS 3.31 (Disk 5) - + COMPAQ MS-DOS 3.31 (Diagnostics) diff --git a/disks/pc/dos/ibm/1.00/manifest.xml b/disks/pc/dos/ibm/1.00/manifest.xml index 8c208104c..d6c51a659 100644 --- a/disks/pc/dos/ibm/1.00/manifest.xml +++ b/disks/pc/dos/ibm/1.00/manifest.xml @@ -7,5 +7,5 @@ Operating System IBM/Microsoft - + diff --git a/disks/pc/dos/ibm/1.10/manifest.xml b/disks/pc/dos/ibm/1.10/manifest.xml index f61360f9e..ec5a0f3ef 100644 --- a/disks/pc/dos/ibm/1.10/manifest.xml +++ b/disks/pc/dos/ibm/1.10/manifest.xml @@ -7,5 +7,5 @@ Operating System IBM/Microsoft - + diff --git a/disks/pc/dos/ibm/2.00/manifest.xml b/disks/pc/dos/ibm/2.00/manifest.xml index 516ae6178..0d8e43ec3 100644 --- a/disks/pc/dos/ibm/2.00/manifest.xml +++ b/disks/pc/dos/ibm/2.00/manifest.xml @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 2.00 (Disk 1) - + PC-DOS 2.00 (Disk 2) diff --git a/disks/pc/dos/ibm/2.10/manifest.xml b/disks/pc/dos/ibm/2.10/manifest.xml index d1a12fc0f..12ada6878 100644 --- a/disks/pc/dos/ibm/2.10/manifest.xml +++ b/disks/pc/dos/ibm/2.10/manifest.xml @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 2.10 (Disk 1) - + PC-DOS 2.10 (Disk 2) diff --git a/disks/pc/dos/ibm/3.00/manifest.xml b/disks/pc/dos/ibm/3.00/manifest.xml index 4cd659ca3..945d8eeb4 100644 --- a/disks/pc/dos/ibm/3.00/manifest.xml +++ b/disks/pc/dos/ibm/3.00/manifest.xml @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.00 (Disk 1) - + PC-DOS 3.00 (Disk 2) diff --git a/disks/pc/dos/ibm/3.10/manifest.xml b/disks/pc/dos/ibm/3.10/manifest.xml index 22ff667ea..09c7c169b 100644 --- a/disks/pc/dos/ibm/3.10/manifest.xml +++ b/disks/pc/dos/ibm/3.10/manifest.xml @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.10 (Disk 1) - + PC-DOS 3.10 (Disk 2) diff --git a/disks/pc/dos/ibm/3.20/manifest.xml b/disks/pc/dos/ibm/3.20/manifest.xml index f1d6e7367..3fa617939 100644 --- a/disks/pc/dos/ibm/3.20/manifest.xml +++ b/disks/pc/dos/ibm/3.20/manifest.xml @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.20 (Disk 1) - + PC-DOS 3.20 (Disk 2) diff --git a/disks/pc/dos/ibm/3.30/manifest.xml b/disks/pc/dos/ibm/3.30/manifest.xml index 988db1e5a..c1c3290e1 100644 --- a/disks/pc/dos/ibm/3.30/manifest.xml +++ b/disks/pc/dos/ibm/3.30/manifest.xml @@ -7,13 +7,13 @@ Operating System IBM/Microsoft - + PC-DOS 3.30 (Disk 1) - + PC-DOS 3.30 (Disk 2) - + PC-DOS 3.30 (720K Disk) diff --git a/disks/pc/dos/ibm/4.00/manifest.xml b/disks/pc/dos/ibm/4.00/manifest.xml index 57730d536..726c0d1a7 100644 --- a/disks/pc/dos/ibm/4.00/manifest.xml +++ b/disks/pc/dos/ibm/4.00/manifest.xml @@ -7,19 +7,19 @@ Operating System IBM/Microsoft - + PC-DOS 4.00 (Disk 1) - + PC-DOS 4.00 (Disk 2) - + PC-DOS 4.00 (Disk 3) - + PC-DOS 4.00 (Disk 4) - + PC-DOS 4.00 (Disk 5) diff --git a/disks/pc/dos/ibm/5.00/manifest.xml b/disks/pc/dos/ibm/5.00/manifest.xml index 6f084cbf7..ca826ad98 100644 --- a/disks/pc/dos/ibm/5.00/manifest.xml +++ b/disks/pc/dos/ibm/5.00/manifest.xml @@ -7,13 +7,13 @@ Operating System IBM/Microsoft - + PC-DOS 5.00 (Disk 1) - + PC-DOS 5.00 (Disk 2) - + PC-DOS 5.00 (Disk 3) diff --git a/disks/pc/dos/ibm/6.10/manifest.xml b/disks/pc/dos/ibm/6.10/manifest.xml index 625bf6109..a21bcad41 100644 --- a/disks/pc/dos/ibm/6.10/manifest.xml +++ b/disks/pc/dos/ibm/6.10/manifest.xml @@ -7,19 +7,19 @@ Operating System IBM/Microsoft - + PC-DOS 6.10 (Disk 1) - + PC-DOS 6.10 (Disk 2) - + PC-DOS 6.10 (Disk 3) - + PC-DOS 6.10 (Disk 4) - + PC-DOS 6.10 (Disk 5) diff --git a/disks/pc/dos/ibm/7.00/manifest.xml b/disks/pc/dos/ibm/7.00/manifest.xml index 1386675da..01d101c1f 100644 --- a/disks/pc/dos/ibm/7.00/manifest.xml +++ b/disks/pc/dos/ibm/7.00/manifest.xml @@ -6,25 +6,25 @@ DOS Operating System IBM - + PC-DOS 7.00 (SETUP Disk 1) - + PC-DOS 7.00 (SETUP Disk 2) - + PC-DOS 7.00 (SETUP Disk 3) - + PC-DOS 7.00 (SETUP Disk 4) - + PC-DOS 7.00 (SETUP Disk 5) - + PC-DOS 7.00 (1.2M Disk) - + PC-DOS 7.00 (1.44M Disk) diff --git a/disks/pc/dos/microsoft/3.20/manifest.xml b/disks/pc/dos/microsoft/3.20/manifest.xml index da5febac3..c5cc4f8b5 100644 --- a/disks/pc/dos/microsoft/3.20/manifest.xml +++ b/disks/pc/dos/microsoft/3.20/manifest.xml @@ -7,16 +7,16 @@ Operating System Microsoft July 7, 1986 - + MS-DOS 3.20 (Disk 1) - + MS-DOS 3.20 (Disk 2) - + MS-DOS 3.20 (ProgRef 1) - + MS-DOS 3.20 (ProgRef 2) diff --git a/disks/pc/dos/microsoft/3.21/manifest.xml b/disks/pc/dos/microsoft/3.21/manifest.xml index 9a128fa41..9e5255d1f 100644 --- a/disks/pc/dos/microsoft/3.21/manifest.xml +++ b/disks/pc/dos/microsoft/3.21/manifest.xml @@ -7,10 +7,10 @@ Operating System Microsoft May 1, 1987 - + MS-DOS 3.21 (Disk 1) - + MS-DOS 3.21 (Disk 2) diff --git a/disks/pc/dos/microsoft/3.30/manifest.xml b/disks/pc/dos/microsoft/3.30/manifest.xml index 42fa268c0..23e9bff06 100644 --- a/disks/pc/dos/microsoft/3.30/manifest.xml +++ b/disks/pc/dos/microsoft/3.30/manifest.xml @@ -7,11 +7,11 @@ Operating System Microsoft - + MS-DOS 3.30 (Disk 1) - + MS-DOS 3.30 (Disk 2) diff --git a/disks/pc/dos/microsoft/3.31/manifest.xml b/disks/pc/dos/microsoft/3.31/manifest.xml index a28dae72d..d8140a380 100644 --- a/disks/pc/dos/microsoft/3.31/manifest.xml +++ b/disks/pc/dos/microsoft/3.31/manifest.xml @@ -7,7 +7,7 @@ Operating System Microsoft - + MS-DOS 3.31 (1440K Disk) diff --git a/disks/pc/dos/microsoft/4.00/manifest.xml b/disks/pc/dos/microsoft/4.00/manifest.xml index 015917f9e..cc732f395 100644 --- a/disks/pc/dos/microsoft/4.00/manifest.xml +++ b/disks/pc/dos/microsoft/4.00/manifest.xml @@ -7,22 +7,22 @@ Operating System Microsoft October 1988 - + MS-DOS 4.00 (Disk 1) - + MS-DOS 4.00 (Disk 2) - + MS-DOS 4.00 (Disk 3) - + MS-DOS 4.00 (Disk 4) - + MS-DOS 4.00 (Disk 5) - + MS-DOS 4.00 (Disk 6) diff --git a/disks/pc/dos/microsoft/4.01/720K/manifest.xml b/disks/pc/dos/microsoft/4.01/720K/manifest.xml index 8f34563fa..cb7b55cd7 100644 --- a/disks/pc/dos/microsoft/4.01/720K/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/720K/manifest.xml @@ -7,13 +7,13 @@ Operating System Microsoft April 1989 - + MS-DOS 4.01 (Disk 1) - + MS-DOS 4.01 (Disk 2) - + MS-DOS 4.01 (Disk 3) diff --git a/disks/pc/dos/microsoft/4.01/manifest.xml b/disks/pc/dos/microsoft/4.01/manifest.xml index 39b8866d4..81f11bdc6 100644 --- a/disks/pc/dos/microsoft/4.01/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/manifest.xml @@ -8,22 +8,22 @@ Microsoft April 1989 - + MS-DOS 4.01 (Disk 1) - + MS-DOS 4.01 (Disk 2) - + MS-DOS 4.01 (Disk 3) - + MS-DOS 4.01 (Disk 4) - + MS-DOS 4.01 (Disk 5) - + MS-DOS 4.01 (Disk 6) diff --git a/disks/pc/dos/microsoft/5.00/manifest.xml b/disks/pc/dos/microsoft/5.00/manifest.xml index 813a9e123..d835b868e 100644 --- a/disks/pc/dos/microsoft/5.00/manifest.xml +++ b/disks/pc/dos/microsoft/5.00/manifest.xml @@ -7,28 +7,28 @@ Operating System Microsoft - + MS-DOS 5.00 (360K Disk 1) - + MS-DOS 5.00 (360K Disk 2) - + MS-DOS 5.00 (360K Disk 3) - + MS-DOS 5.00 (360K Disk 4) - + MS-DOS 5.00 (360K Disk 5) - + MS-DOS 5.00 (720K Disk 1) - + MS-DOS 5.00 (720K Disk 2) - + MS-DOS 5.00 (720K Disk 3) diff --git a/disks/pc/dos/microsoft/6.00/manifest.xml b/disks/pc/dos/microsoft/6.00/manifest.xml index 9d3e1534d..bb8b47a86 100644 --- a/disks/pc/dos/microsoft/6.00/manifest.xml +++ b/disks/pc/dos/microsoft/6.00/manifest.xml @@ -7,25 +7,25 @@ Operating System Microsoft - + MS-DOS 6.00 (1200K Disk 1) - + MS-DOS 6.00 (1200K Disk 2) - + MS-DOS 6.00 (1200K Disk 3) - + MS-DOS 6.00 (1200K Disk 4) - + MS-DOS 6.00 (1440K Disk 1) - + MS-DOS 6.00 (1440K Disk 1) - + MS-DOS 6.00 (1440K Disk 1) diff --git a/disks/pc/dos/microsoft/6.20/manifest.xml b/disks/pc/dos/microsoft/6.20/manifest.xml index bd0232eeb..a390d2ad8 100644 --- a/disks/pc/dos/microsoft/6.20/manifest.xml +++ b/disks/pc/dos/microsoft/6.20/manifest.xml @@ -7,31 +7,31 @@ Operating System Microsoft - + MS-DOS 6.20 (1200K Disk 1) - + MS-DOS 6.20 (1200K Disk 2) - + MS-DOS 6.20 (1200K Disk 3) - + MS-DOS 6.20 (1200K Disk 4) - + MS-DOS 6.20 (1200K Supp Disk) - + MS-DOS 6.20 (1440K Disk 1) - + MS-DOS 6.20 (1440K Disk 2) - + MS-DOS 6.20 (1440K Disk 3) - + MS-DOS 6.20 (1440K Supp Disk) diff --git a/disks/pc/dos/microsoft/6.22/manifest.xml b/disks/pc/dos/microsoft/6.22/manifest.xml index 1fe31f05f..6f4d454cb 100644 --- a/disks/pc/dos/microsoft/6.22/manifest.xml +++ b/disks/pc/dos/microsoft/6.22/manifest.xml @@ -7,28 +7,28 @@ Operating System Microsoft - + MS-DOS 6.22 (1200K Disk 1) - + MS-DOS 6.22 (1200K Disk 2) - + MS-DOS 6.22 (1200K Disk 3) - + MS-DOS 6.22 (1200K Disk 4) - + MS-DOS 6.22 (1440K Disk 1) - + MS-DOS 6.22 (1440K Disk 2) - + MS-DOS 6.22 (1440K Disk 3) - + MS-DOS 6.22 (1440K Supp Disk) diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml index 5669d1d8c..a808d2ae3 100644 --- a/disks/pc/games/infocom/machine-debug.xml +++ b/disks/pc/games/infocom/machine-debug.xml @@ -5,8 +5,8 @@ - - + +