Merge branch 'master' into next-release

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Jeff Parsons 2017-01-28 23:03:22 -08:00 committed by Jeff Parsons
commit 38dc1d1f42
4 changed files with 82 additions and 81 deletions

View file

@ -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
8Kb BASIC-in-ROM from Microsoft. Below is a simulation of the 8Kb model.
manufactured by Ohio Scientific in 1978. The base configuration included an 8Kb BASIC-in-ROM from Microsoft
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