More redirects and some API tweaks

README.md

@@ -349,12 +349,15 @@ where PCjs could run amok and destroy the planet.
 Other parameters that can be passed via the URL:
 
 - *autostart*: set it to "true" to allow all machines to start normally, "false" to prevent all machines from starting,
-or "no" to prevent all machines from starting *unless* they have no "Run" button.
+or "no" to prevent all machines from starting *unless* they have no "Run" button; e.g.:
-
-For example:
 
 	http://localhost:8088/?gort=debug&autostart=false
 
+- *aspect*: set it to a numeric value >= 0.3 and <= 3.33 to modify the default aspect ratio of a machine's screen on the
+specified page; e.g.:
+
+	http://localhost:8088/?aspect=2.0
+
 Updating PCjs
 ---
 

devices/pc/machine/5160/ega/256kb/machine.md

@@ -2,6 +2,8 @@
 layout: page
 title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display"
 permalink: /devices/pc/machine/5160/ega/256kb/
+redirect_from:
+  - /configs/pc/machines/5160/ega/256kb/
 machines:
   - type: pc
     id: ibm5160

devices/pc/machine/5160/ega/640kb/machine.md

@@ -2,6 +2,8 @@
 layout: page
 title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display"
 permalink: /devices/pc/machine/5160/ega/640kb/
+redirect_from:
+  - /configs/pc/machines/5160/ega/640kb/
 machines:
   - type: pc
     id: ibm5160

devices/pc/machine/5160/mda/README.md

@@ -2,6 +2,8 @@
 layout: page
 title: IBM PC Machines (Model 5160) with Monochrome (MDA) Display
 permalink: /devices/pc/machine/5160/mda/
+redirect_from:
+  - /configs/pc/machines/5160/mda/
 ---
 
 IBM PC XT with Monochrome (MDA) Display

devices/pc/machine/5170/ega/1152kb/rev1/machine.md

@@ -2,6 +2,8 @@
 layout: page
 title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk"
 permalink: /devices/pc/machine/5170/ega/1152kb/rev1/
+redirect_from:
+  - /configs/pc/machines/5170/ega/1152kb/rev1/
 machines:
   - type: pc
     id: ibm5170

devices/pc/machine/5170/ega/640kb/rev1/machine.md

@@ -2,6 +2,9 @@
 layout: page
 title: "IBM PC AT (Model 5170, 640Kb) with EGA Display"
 permalink: /devices/pc/machine/5170/ega/640kb/rev1/
+redirect_from:
+  - /configs/pc/machines/5170/ega/640kb/
+  - /configs/pc/machines/5170/ega/640kb/rev1/
 machines:
   - type: pc
     id: ibm5170

devices/pc/machine/5170/ega/README.md

@@ -2,6 +2,8 @@
 layout: page
 title: "IBM PC AT (Model 5170) with Enhanced Color Display"
 permalink: /devices/pc/machine/5170/ega/
+redirect_from:
+  - /configs/pc/machines/5170/ega/
 ---
 
 IBM PC AT with Enhanced Color Graphics (EGA) Display

devices/pc/rom/5170/README.md

@@ -5,6 +5,7 @@ permalink: /devices/pc/rom/5170/
 redirect_from:
   - /devices/pc/5170/
   - /devices/pc/bios/5170/
+  - /devices/pc/rom/5170/bios/
 ---
 
 IBM PC AT (Model 5170) BIOS

devices/pc/rom/compaq/README.md

@@ -3,6 +3,8 @@ layout: post
 title: COMPAQ BIOS ROMs
 date: 2016-02-24 14:00:00
 permalink: /devices/pc/rom/compaq/
+redirect_from:
+  - /devices/pc/rom/compaq/bios/
 ---
 
 COMPAQ BIOS ROMs

devices/pc/rom/compaq/deskpro386/README.md

@@ -4,6 +4,7 @@ title: COMPAQ DeskPro 386 ROMs
 permalink: /devices/pc/rom/compaq/deskpro386/
 redirect_from:
   - /devices/pc/compaq/deskpro386/
+  - /devices/pc/rom/compaq/bios/deskpro386/
 ---
 
 COMPAQ DeskPro 386 ROMs

disks/pc/tools/microsoft/README.md

@@ -4,7 +4,7 @@ title: Microsoft Languages and Tools
 permalink: /disks/pc/tools/microsoft/
 ---
 
-Microsoft Languages and Tools
+Microsoft Languages
 ---
 
 * Microsoft BASIC
@@ -22,12 +22,15 @@ Microsoft Languages and Tools
 * [Microsoft Macro Assembler 6.00](/disks/pc/tools/microsoft/masm/6.00/)
 * [Microsoft Macro Assembler 6.11](/disks/pc/tools/microsoft/masm/6.11/)
 * [Microsoft Mouse 5.00](/disks/pc/tools/microsoft/mouse/5.00/)
-* [Microsoft OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/)
+
-* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/)
+Microsoft SDKs
-* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/)
+---
-* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/)
+
-* Microsoft Windows SDK 2.03
+* [Microsoft OS/2 SDKs](/disks/pc/tools/microsoft/os2/sdk/)
-* Microsoft Windows SDK 3.00
+* [Microsoft Windows SDKs](/disks/pc/tools/microsoft/windows/sdk/)
+
+Microsoft Languages Newsletters
+---
 
 Below are all the "Microsoft Languages NewsLetters" that Microsoft published in
 [PC Tech Journal](/pubs/pc/magazines/pctj/), before they decided to focus exclusively

disks/pc/tools/microsoft/os2/sdk/README.md

@@ -0,0 +1,11 @@
+---
+layout: page
+title: Microsoft OS/2 SDKs
+permalink: /disks/pc/tools/microsoft/os2/sdk/
+---
+
+Microsoft OS/2 SDKs
+---
+
+* [Microsoft OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/)
+

disks/pc/tools/microsoft/windows/README.md

@@ -0,0 +1,19 @@
+---
+layout: page
+title: Microsoft Windows DDKs and SDKs
+permalink: /disks/pc/tools/microsoft/windows/
+---
+
+Microsoft Windows DDKs
+---
+
+* Microsoft Windows DDK 3.10
+
+Microsoft Windows SDKs
+---
+
+* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/)
+* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/)
+* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/)
+* Microsoft Windows SDK 2.03
+* Microsoft Windows SDK 3.00

disks/pc/tools/microsoft/windows/sdk/README.md

@@ -0,0 +1,14 @@
+---
+layout: page
+title: Microsoft Windows SDKs
+permalink: /disks/pc/tools/microsoft/windows/sdks/
+---
+
+Microsoft Windows SDKs
+---
+
+* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/)
+* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/)
+* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/)
+* Microsoft Windows SDK 2.03
+* Microsoft Windows SDK 3.00

disks/pc/windows/2.03/README.md

@@ -2,6 +2,8 @@
 layout: page
 title: Microsoft Windows 2.03
 permalink: /disks/pc/windows/2.03/
+redirect_from:
+  - /disks/pc/win/win203/
 ---
 
 Microsoft Windows 2.03

disks/pc/windows/3.00/README.md

@@ -2,6 +2,8 @@
 layout: page
 title: Microsoft Windows 3.00
 permalink: /disks/pc/windows/3.00/
+redirect_from:
+  - /devices/pc/machine/5170/ega/1152kb/win300/
 machines:
   - type: pc
     id: ibm5170-win300

modules/diskdump/lib/diskdump.js

@@ -688,28 +688,39 @@ DiskDump.API = function(aParms)
     var sFormat = aParms[DumpAPI.QUERY.FORMAT] || DumpAPI.FORMAT.JSON;
     var fComments = (aParms[DumpAPI.QUERY.COMMENTS]? true : false);
 
-    var disk = new DiskDump(sDisk, null, sFormat, fComments);
+    if (sDisk) {
-
+        var disk = new DiskDump(sDisk, null, sFormat, fComments);
-    disk.loadFile(function(err) {
+        disk.loadFile(function(err) {
-        if (!err) {
+            if (!err) {
-            var sData, sType, fBase64;
+                var sData, sType, fBase64;
-            if (sFormat == DumpAPI.FORMAT.IMG) {
+                if (sFormat == DumpAPI.FORMAT.IMG) {
-                sType = "octet-stream";
+                    sType = "octet-stream";
-                var buf = disk.convertToIMG();
+                    var buf = disk.convertToIMG();
-                if (buf) {
+                    if (buf) {
-                    sData = disk.encodeAsBase64(buf);
+                        sData = disk.encodeAsBase64(buf);
-                    fBase64 = true;
+                        fBase64 = true;
+                    }
+                } else {
+                    sType = "json";
+                    sData = disk.convertToJSON();
+                }
+                if (sData) {
+                    var sFileName = str.getBaseName(disk.sDiskPath, true) + '.' + sFormat;
+                    var sAlert = web.downloadFile(sData, sType, fBase64, sFileName);
+                    web.alertUser(sAlert);
+                } else {
+                    web.alertUser("No data.");
                 }
             } else {
-                sType = "json";
+                web.alertUser(err.message);
-                sData = disk.convertToJSON();
             }
-            if (sData) {
+        });
-                var sAlert = web.downloadFile(sData, sType, fBase64);
+    } else {
-                web.alertUser(sAlert);
+        /*
-            }
+         * The client-side API currently supports DumpAPI.QUERY.DISK requests only (eg, not DumpAPI.QUERY.FILE).
-        }
+         */
-    });
+        web.alertUser("Unsupported API request.");
+    }
 };
 
 /**

modules/shared/lib/weblib.js

@@ -644,7 +644,7 @@ web.downloadFile = function(sData, sType, fBase64, sFileName)
         sAlert = 'Check your Downloads folder for ' + sFileName + '.';
     } else {
         window.open(sURI);
-        sAlert = 'Check your browser for a new window/tab containing the requested data (' + sFileName + ').';
+        sAlert = 'Check your browser for a new window/tab containing the requested data' + (sFileName? (' (' + sFileName + ')') : '') + '.';
     }
     return sAlert;
 };

pubs/pc/reference/ibm/5170/techref/README.md

@@ -0,0 +1,12 @@
+---
+layout: page
+title: IBM 5170 Technical Reference
+permalink: /pubs/pc/reference/ibm/5170/techref/
+---
+
+IBM 5170 Technical Reference
+---
+
+* [IBM 5170 Technical Reference, March 1984](/pubs/pc/reference/ibm/5170/techref/1984-03/)
+* [IBM 5170 Technical Reference, September 1985](/pubs/pc/reference/ibm/5170/techref/1985-09/)
+* [IBM 5170 Technical Reference, March 1986](/pubs/pc/reference/ibm/5170/techref/1986-03/)