Merge branch 'master' into gh-pages

docs/about/README.md

@@ -25,7 +25,6 @@ capabilities can be found in the [Documentation](/docs/).
 
 The first PCjs simulation was [C1Pjs](/docs/c1pjs/), which emulates the
 Challenger 1P, a 6502-based microcomputer introduced by Ohio Scientific in 1978.
-
 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/).

docs/c1pjs/README.md

@@ -15,8 +15,8 @@ C1Pjs Documentation
 ---
 
 C1Pjs is a JavaScript simulation of the Challenger 1P, an 8-bit 6502-based microcomputer
-manufactured by Ohio Scientific in 1978.  The base configuration included 4Kb of RAM and an
+manufactured by Ohio Scientific in 1978.  The base configuration included an 8Kb BASIC-in-ROM from Microsoft
-8Kb BASIC-in-ROM from Microsoft.  Below is a simulation of the 8Kb model.
+and 4Kb of RAM (user-expandable to 8Kb).  Below is a simulation of the 8Kb RAM configuration.
 
 After you've read the Documentation, check out our other [C1P Machine Configurations](/devices/c1p/machine/),
 learn how [Customize and Embed](embed/) your own machines, read the [Source Code](/modules/c1pjs/), and

docs/pcx86/examples/components.xsl

@@ -240,7 +240,7 @@
 					<xsl:when test="$url != ''"><div class="{$CSSCLASS}-reference">[<a href="{$url}">XML</a>]</div></xsl:when>
 					<xsl:otherwise/>
 				</xsl:choose>
-				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
+				<xsl:if test="$APPCLASS = 'pcx86'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
 					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>

modules/shared/templates/components.xsl

@@ -241,7 +241,7 @@
 					<xsl:when test="$url != ''"><div class="{$CSSCLASS}-reference">[<a href="{$url}">XML</a>]</div></xsl:when>
 					<xsl:otherwise/>
 				</xsl:choose>
-				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
+				<xsl:if test="$APPCLASS = 'pcx86'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
 					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
@@ -1034,8 +1034,8 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="memory">
-			<!-- PCjs uses this to determine the amount of Video memory installed; in retrospect, "bufferSize"
+			<!-- PCx86 uses this to determine the amount of Video memory installed; in retrospect, "bufferSize"
-			might seem like	a better choice for the name, but PCjs doesn't use ANY of the "buffer" properties,
+			might seem like	a better choice for the name, but PCx86 doesn't use ANY of the "buffer" properties,
 			because it supports dynamic frame buffers (ie, frame buffers whose location and size change according
 			to the programmed mode).  PC8080 machines use the "buffer" properties instead, because their frame
 			buffers generally have a fixed location, size, and format. -->

versions/pc8080/1.23.0/components.xsl

@@ -240,7 +240,7 @@
 					<xsl:when test="$url != ''"><div class="{$CSSCLASS}-reference">[<a href="{$url}">XML</a>]</div></xsl:when>
 					<xsl:otherwise/>
 				</xsl:choose>
-				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
+				<xsl:if test="$APPCLASS = 'pcx86'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
 					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>

versions/pcx86/1.23.0/components.xsl

@@ -240,7 +240,7 @@
 					<xsl:when test="$url != ''"><div class="{$CSSCLASS}-reference">[<a href="{$url}">XML</a>]</div></xsl:when>
 					<xsl:otherwise/>
 				</xsl:choose>
-				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
+				<xsl:if test="$APPCLASS = 'pcx86'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
 					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>