Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2017-09-12 13:06:06 -07:00
commit 520aedde81
5 changed files with 6 additions and 0 deletions

View file

@ -4,6 +4,8 @@ title: About PCjs
menu_title: About menu_title: About
menu_order: 9 menu_order: 9
permalink: /pubs/about/ permalink: /pubs/about/
redirect_from:
- /docs/about/
--- ---
## About PCjs ## About PCjs

View file

@ -5,6 +5,7 @@ permalink: /pubs/about/pcx86/
redirect_from: redirect_from:
- /pc/ - /pc/
- /pcjs/ - /pcjs/
- /docs/about/pcx86/
--- ---
About PCx86 About PCx86

View file

@ -9,6 +9,7 @@ machines:
redirect_from: redirect_from:
- /c1p/ - /c1p/
- /c1pjs/ - /c1pjs/
- /docs/c1pjs/
--- ---
C1Pjs Documentation C1Pjs Documentation

View file

@ -9,6 +9,7 @@ machines:
redirect_from: redirect_from:
- /configs/c1p/embed/ - /configs/c1p/embed/
- /demos/c1p/embed.html - /demos/c1p/embed.html
- /docs/c1pjs/embed/
--- ---
Embedding The C1Pjs Simulator Embedding The C1Pjs Simulator

View file

@ -4,6 +4,7 @@ title: PCx86 Documentation
permalink: /pubs/pcx86/ permalink: /pubs/pcx86/
redirect_from: redirect_from:
- /docs/pcjs/ - /docs/pcjs/
- /docs/pcx86/
machines: machines:
- id: ibm5150 - id: ibm5150
type: pcx86 type: pcx86