Merge branch 'master' into gh-pages

apps/pdp10/README.md

@@ -9,5 +9,5 @@ PDP-10 Software
 
 PCjs provides the following PDP-10 software:
 
+- [PDP-10 Diagnostics](diags/)
 - [PDP-10 Opcode Tests](tests/)
-- [PDP-10 Tape Software](tapes/)

apps/pdp10/diags/README.md

@@ -0,0 +1,12 @@
+---
+layout: page
+title: PDP-10 Diagnostics
+permalink: /apps/pdp10/diags/
+---
+
+PDP-10 Diagnostics
+------------------
+
+PCjs has archived the following PDP-10 diagnostics:
+
+- [KLAD Diagnostics](klad/)

apps/pdp10/diags/klad/README.md

@@ -1,11 +1,11 @@
 ---
 layout: page
-title: PDP-10 KLAD Diagnostic Tapes
+title: PDP-10 KLAD Diagnostics
-permalink: /apps/pdp10/tapes/diags/klad/
+permalink: /apps/pdp10/diags/klad/
 ---
 
-PDP-10 KLAD Diagnostic Tapes
+PDP-10 KLAD Diagnostics
-----------------------------
+-----------------------
 
 PCjs has archived selected files from [PDP-10 KLAD Diagnostics Sources](http://pdp-10.trailing-edge.com/klad_sources/index.html),
 including:

apps/pdp10/diags/klad/dakaa/README.md

@@ -1,13 +1,13 @@
 ---
 layout: page
 title: PDP-10 KA10 Basic Instruction Diagnostic #1
-permalink: /apps/pdp10/tapes/diags/klad/dakaa/
+permalink: /apps/pdp10/diags/klad/dakaa/
 machines:
   - id: testka10
     type: pdp10
     config: /devices/pdp10/machine/ka10/test/debugger/machine.xml
     debugger: true
-    commands: a 30724 /apps/pdp10/tapes/diags/klad/dakaa/TEST.MAC
+    commands: a 30724 /apps/pdp10/diags/klad/dakaa/TEST.MAC
 ---
 
 PDP-10 KA10 Basic Instruction Diagnostic #1
@@ -21,9 +21,9 @@ Resources for this test include:
 
 - [Instructions](#dakaatxt)
 - [History](#dakaahst)
-- [Source Code](#dakaamac) [[file](DAKAA.MAC.txt)]
+- [Source Code](#dakaamac)
-- [MACRO-10 Listing](#dakaalst) [[file](DAKAA.LST.txt)]
+- [MACRO-10 Listing](DAKAA.LST.txt)
-- [Additional Information](#dakaaseq)
+- [Additional Information](http://archive.pcjs.org/apps/pdp10/diags/klad/dakaa/DAKAA.SEQ.txt)
 
 {% include machine.html id="testka10" %}
 
@@ -32,7 +32,7 @@ The Debugger's assemble ("a") command can be used to test the new built-in
 of the [MACRO-10](http://archive.pcjs.org/pubs/dec/pdp10/tops10/02_1973AsmRef_macro.pdf) assembly language.
 This command:
 
-	a 30724 /apps/pdp10/tapes/diags/klad/dakaa/TEST.MAC
+	a 30724 /apps/pdp10/diags/klad/dakaa/TEST.MAC
 
 will automatically read the [TEST.MAC](TEST.MAC.txt) source file (a slightly modified copy of [DAKAA.MAC](DAKAA.MAC.txt)),
 assemble it, and then load the binary output at the specified address.
@@ -276,19 +276,8 @@ ORIGINAL RELEASE:	16-MAR-72
 DAKAA.MAC
 ---------
 
+[[Download](DAKAA.MAC.txt)]
+
 {% highlight text %}
 {% include_relative DAKAA.MAC.txt %}
 {% endhighlight %}
-
-DAKAA.LST
----------
-
-{% highlight text %}
-{% include_relative DAKAA.LST.txt %}
-{% endhighlight %}
-
-DAKAA.SEQ
----------
-
-To view the contents of **DAKAA.SEQ**, the source of all the above information, click
-[here](http://archive.pcjs.org/apps/pdp10/tapes/diags/klad/dakaa/DAKAA.SEQ.txt).

apps/pdp10/diags/klad/dakad/README.md

@@ -1,13 +1,13 @@
 ---
 layout: page
 title: PDP-10 KA10 Basic Instruction Diagnostic #4
-permalink: /apps/pdp10/tapes/diags/klad/dakad/
+permalink: /apps/pdp10/diags/klad/dakad/
 machines:
   - id: testka10
     type: pdp10
     config: /devices/pdp10/machine/ka10/test/debugger/machine.xml
     debugger: true
-    commands: a 30724 /apps/pdp10/tapes/diags/klad/dakad/TEST.MAC
+    commands: a 30724 /apps/pdp10/diags/klad/dakad/TEST.MAC
 ---
 
 PDP-10 KA10 Basic Instruction Diagnostic #4
@@ -21,9 +21,9 @@ Resources for this test include:
 
 - [Instructions](#dakadtxt)
 - [History](#dakadhst)
-- [Source Code](#dakadmac) [[file](DAKAD.MAC.txt)]
+- [Source Code](#dakadmac)
-- [MACRO-10 Listing](#dakadlst) [[file](DAKAD.LST.txt)]
+- [MACRO-10 Listing](DAKAD.LST.txt)
-- [Additional Information](#dakadseq)
+- [Additional Information](http://archive.pcjs.org/apps/pdp10/diags/klad/dakad/DAKAD.SEQ.txt)
 
 {% include machine.html id="testka10" %}
 
@@ -32,7 +32,7 @@ The Debugger's assemble ("a") command can be used to test the new built-in
 of the [MACRO-10](http://archive.pcjs.org/pubs/dec/pdp10/tops10/02_1973AsmRef_macro.pdf) assembly language.
 This command:
 
-	a 30724 /apps/pdp10/tapes/diags/klad/dakad/TEST.MAC
+	a 30724 /apps/pdp10/diags/klad/dakad/TEST.MAC
 
 will automatically read the [TEST.MAC](TEST.MAC.txt) source file (a slightly modified copy of [DAKAD.MAC](DAKAD.MAC.txt)),
 assemble it, and then load the binary output at the specified address.  Use the command `db 30724` to dump the first few words
@@ -254,7 +254,7 @@ DAKAD.HST
 
 ```
 	THIS IS A HISTORY OF THE DEVELOPMENT OF MAINDEC-10-DAKAD
-                                                                                                                           SEQ 0006
+
 ************************************************************************
 
 PRODUCT CODE:		MAINDEC-10-DAKAD
@@ -280,25 +280,13 @@ ORIGINAL AUTHOR:	RICHARD MALISKA
 ORIGINAL RELEASE:	16-MAR-72
 
 ************************************************************************
-
 ```
 
 DAKAD.MAC
 ---------
 
+[[Download](DAKAD.MAC.txt)]
+ 
 {% highlight text %}
 {% include_relative DAKAD.MAC.txt %}
 {% endhighlight %}
-
-DAKAD.LST
----------
-
-{% highlight text %}
-{% include_relative DAKAD.LST.txt %}
-{% endhighlight %}
-
-DAKAD.SEQ
----------
-
-To view the contents of **DAKAD.SEQ**, the source of all the above information, click
-[here](http://archive.pcjs.org/apps/pdp10/tapes/diags/klad/dakad/DAKAD.SEQ.txt).

apps/pdp10/tapes/README.md

@@ -7,6 +7,4 @@ permalink: /apps/pdp10/tapes/
 PDP-10 Software Tapes
 ---------------------
 
-PCjs has archived the following PDP-10 software from tape:
+PCjs has not yet archived any PDP-10 software from tape.
-
-- [PDP-10 Diagnostic Tapes](diags/)

apps/pdp10/tapes/diags/README.md

@@ -1,12 +0,0 @@
----
-layout: page
-title: PDP-10 Diagnostic Tapes
-permalink: /apps/pdp10/tapes/diags/
----
-
-PDP-10 Diagnostic Tapes
------------------------
-
-PCjs has archived the following PDP-10 diagnostic tapes:
-
-- [KLAD Diagnostic Tapes](klad/)