Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2016-04-30 12:27:10 -07:00
commit f4a284f48e
4 changed files with 35 additions and 5 deletions

View file

@ -5,7 +5,7 @@ in the Front Matter of our Markdown documents, for compatibility with the Jekyll
'id' (eg, "ibm5150")
'name' (eg, "IBM PC (Model 5150) with Monochrome Display")
'type' (eg. "pc", "c1p", etc)
'type' (eg. "c1p", "pc", "pc8080")
'debugger' (default is false)
'config' (default is "machine.xml")
'template' (default is "machine.xsl")