Merge branch 'master' into gh-pages

README.md

@@ -1,7 +1,7 @@
 PCjs Machines
 ===
 
-Welcome to PCjs, home of [PCx86](/docs/pcx86/), the original IBM PC simulation written entirely JavaScript.  It is
+Welcome to PCjs, home of [PCx86](/docs/pcx86/), the original IBM PC simulation that runs in your web browser.  It is
 one of several JavaScript Machines in the [PCjs Project](https://github.com/jeffpar/pcjs), an open-source project that
 includes:
 

disks/pcx86/README.md

@@ -59,7 +59,7 @@ computer diagnostics, programming tools, and more.
 ### Tests
 
 * [PC Diagnostics](diags/)
-* [VGA "Black Book" Tests](/tests/pc/vga/)
+* [VGA "Black Book" Tests](/tests/pcx86/vga/)
 
 ---
 

disks/pcx86/library.xml

@@ -105,7 +105,7 @@
 		<manifest ref="/apps/pcx86/1987/thinktank/manifest.xml" disk="disk01"/>
 		<manifest ref="/apps/pcx86/1992/moria/manifest.xml" disk="disk01"/>
 		<manifest ref="/pubs/pc/programming/manifest.xml"/>
-		<disk path="/tests/pc/vga/VGABIN.json">VGA Tests (Black Book)</disk>
+		<disk path="/tests/pcx86/vga/VGABIN.json">VGA Tests (Black Book)</disk>
 	</control>
 	<control type="button" binding="loadDrive">Load</control>
 	<control type="button" binding="saveDrive" padright="8px">Save</control>

tests/pcx86/80386/README.md

@@ -1,7 +1,9 @@
 ---
 layout: page
 title: 80386 Tests
-permalink: /tests/pc/80386/
+permalink: /tests/pcx86/80386/
+redirect_from:
+  - /tests/pc/80386/
 ---
 
 Overview

tests/pcx86/80386/test386.asm

@@ -38,7 +38,7 @@
 ;   The code which attempts to update myGDT and addrGDT will have no effect when installed as a ROM,
 ;   which is fine, because those data structures are predefined with appropriate ROM-based addresses.
 ;
-;   See the machine definition file in /modules/pcjs/bin/test386.json for a configuration that can
+;   See the machine definition file in /modules/pcx86/bin/test386.json for a configuration that can
 ;   load this file as a ROM image.
 ;
 ;   REAL32 Notes

tests/pcx86/README.md

@@ -1,11 +1,13 @@
 ---
 layout: page
 title: PC Test Resources
-permalink: /tests/pc/
+permalink: /tests/pcx86/
+redirect_from:
+  - /tests/pc/
 ---
 
-PC Test Resources
----
+PCx86 Test Resources
+--------------------
 
 * [80386 Tests](80386/)
 * [Trace Utility](trace/)

tests/pcx86/trace/README.md

@@ -1,10 +1,12 @@
 ---
 layout: page
 title: PC Trace Utility
-permalink: /tests/pc/trace/
+permalink: /tests/pcx86/trace/
+redirect_from:
+  - /tests/pc/trace/
 ---
 
-WARNING: This utility is obsolete.  It has been superseded by [test386](/tests/pc/80386/),
+WARNING: This utility is obsolete.  It has been superseded by [test386](/tests/pcx86/80386/),
 which, going forward, serves as our new model for instruction-level testing.  As a result,
 the **traceLog()** functionality mentioned below has been removed from the PCjs source code
 (but you can always dig it back up if you really want it).
@@ -43,15 +45,15 @@ every time the machine is loaded, via the DiskDump API.  This is useful when you
 generating new test results:
 
 ```xml
-<fdc id="fdcNEC" automount='{B:{name:"Trace Tests",path:"/tests/pc/trace/trace.com;trace.txt"}}'/>
+<fdc id="fdcNEC" automount='{B:{name:"Trace Tests",path:"/tests/pcx86/trace/trace.com;trace.txt"}}'/>
 ```
 
 Alternatively, if you want to run the tests in another virtual PC environment (eg, VMware Fusion),
 you can create an IMG disk image from a directory using DiskDump's command-line interface:
 
-	cd ~/Sites/pcjs/tests/pc
-	node ~/Sites/pcjs/modules/diskdump/bin/diskdump --dir=trace --format=img --output=trace.img
+	cd tests/pcx86
+	node ../../modules/diskdump/bin/diskdump --dir=trace --format=img --output=trace.img
  
 OS X users can also create an ISO image like so:
 
-	hdiutil makehybrid -o ~/Sites/pcjs/tests/pc/trace.iso ~/Sites/pcjs/tests/pc/trace -iso -joliet
+	hdiutil makehybrid -o tests/pcx86/trace.iso tests/pcx86/trace -iso -joliet

tests/pcx86/vga/README.md

@@ -1,7 +1,9 @@
 ---
 layout: page
 title: VGA "Black Book" Tests
-permalink: /tests/pc/vga/
+permalink: /tests/pcx86/vga/
+redirect_from:
+  - /tests/pc/vga/
 machines:
   - type: pcx86
     id: deskpro386
@@ -11,7 +13,7 @@ machines:
       A:
         path: /disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json
       B:
-        path: /tests/pc/vga/VGABIN.json
+        path: /tests/pcx86/vga/VGABIN.json
 ---
 
 VGA "Black Book" Tests
@@ -100,7 +102,7 @@ Also, I've updated the PCjs [Library](/disks/pcx86/library.xml) disk collection
 built from the sources in this directory:
 
 ```xml
-<disk path="/tests/pc/vga/VGABIN.json">VGA Tests (Black Book)</disk>
+<disk path="/tests/pcx86/vga/VGABIN.json">VGA Tests (Black Book)</disk>
 ```
 
 The "VGA Tests (Black Book)" disk image (VGABIN) was built with this command:
@@ -113,7 +115,7 @@ the files in that directory (including any subdirectories) every time that disk
 burden on the server, it's best to do this only when running PCjs from a local PCjs web server.
 
 ```xml
-<disk path="/tests/pc/vga/">VGA Tests (Black Book)</disk>
+<disk path="/tests/pcx86/vga/">VGA Tests (Black Book)</disk>
 ```
 
 One advantage of using [DiskDump](/modules/diskdump/) is that it automatically converts linefeeds in known text files