Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2016-05-04 15:52:11 -07:00
commit c2a9d45fcd
6 changed files with 12 additions and 12 deletions

View file

@ -7,9 +7,9 @@ It was added to the [JavaScript Machines](/docs/about/) project in Fall 2012, an
The project includes the following web-based emulators:
* [PCjs](/docs/pcjs/), an IBM PC and PC-compatible emulator
* [PC8080](/modules/pc8080/), an 8080-based machine emulator
* [C1Pjs](/docs/c1pjs/), a simulation of the 6502-based OSI Challenger 1P
* [PCjs](/docs/pcjs/), an x86-based IBM PC and PC-compatible emulator
* [PC8080](/modules/pc8080/), a 8080-based generic machine emulator
* [C1Pjs](/docs/c1pjs/), a 6502-based Ohio Scientific Challenger 1P emulator
PCjs first simulated the 4.77Mhz 8088-based IBM PC, and has steadily evolved to support more classic x86 machines,
including the IBM PC XT, the 80286-based IBM PC AT, and the 80386-based COMPAQ DeskPro 386. PCjs fully supports

View file

@ -17,9 +17,9 @@ It was added to the [JavaScript Machines](/docs/about/) project in Fall 2012, an
The project includes the following web-based emulators:
* [PCjs](/docs/pcjs/), an IBM PC and PC-compatible emulator
* [PC8080](/modules/pc8080/), an 8080-based machine emulator
* [C1Pjs](/docs/c1pjs/), a simulation of the 6502-based OSI Challenger 1P
* [PCjs](/docs/pcjs/), an x86-based IBM PC and PC-compatible emulator
* [PC8080](/modules/pc8080/), an 8080-based generic machine emulator
* [C1Pjs](/docs/c1pjs/), a 6502-based Ohio Scientific Challenger 1P emulator
PCjs first simulated the 4.77Mhz 8088-based IBM PC, and has steadily evolved to support more classic x86 machines,
including the IBM PC XT, the 80286-based IBM PC AT, and the 80386-based COMPAQ DeskPro 386. PCjs fully supports

View file

@ -12,9 +12,9 @@ It is our *private* counterpart to the **node_modules** folder, where all *publi
The project includes these emulation modules:
* [PCjs](pcjs/), the x86-based PC Emulation Module
* [PC8080](pc8080/), the 8080-based Machine Emulation Module
* [C1Pjs](c1pjs/), the 6502-based Challenger 1P Emulation Module
* [PCjs](pcjs/), the x86-based PC emulation module
* [PC8080](pc8080/), the 8080-based machine emulation module
* [C1Pjs](c1pjs/), the 6502-based Challenger 1P emulation module
along with variety of Node support modules, such as:

View file

@ -9,7 +9,7 @@ Challenger 1P Emulation Module (C1Pjs)
Overview
---
C1Pjs is an 6502-based Machine Emulation Module for the [Ohio Scientific Challenger 1P](/docs/c1pjs/).
C1Pjs is our 6502-based machine emulation module for the [Ohio Scientific Challenger 1P](/docs/c1pjs/).
C1Pjs is currently comprised of the following non-shared components, as listed in [package.json](../../package.json)
(see the *c1pJSFiles* property):

View file

@ -9,7 +9,7 @@ permalink: /modules/pc8080/
Overview
---
PC8080 is an 8080-based Machine Emulation Module. The code is derived from [PCjs](/modules/pcjs/).
PC8080 is our 8080-based machine emulation module. The code is derived from [PCjs](/modules/pcjs/).
It is still a work-in-progress. See the list of available [PC8080 Machines](/devices/pc8080/machine/).

View file

@ -9,7 +9,7 @@ IBM PC Emulation Module (PCjs)
Overview
---
The PCjs IBM PC Emulation Module is the engine underlying all our [IBM PC Machines](/devices/pc/machine/).
The PCjs IBM PC emulation module is the engine powering all our [IBM PC Machines](/devices/pc/machine/).
This module divides PC functionality into variety of logical and visual components.
In general, each JavaScript file is responsible for a single component or set of related components (eg,