All references to GitHub project files should use the "master" branch

README.md

@@ -13,7 +13,7 @@ machines:
 
 Welcome to [PCjs](/docs/about/pcjs/), the first IBM PC simulation to run in your web browser without any plugins.
 It was added to the [JavaScript Machines](/docs/about/) project in Fall 2012, and it is now part of the
-[PCjs Project](https://github.com/jeffpar/pcjs/tree/gh-pages) on GitHub.  The project includes:
+[PCjs Project](https://github.com/jeffpar/pcjs) on GitHub.  The project includes:
 
 * [PCjs](/docs/about/pcjs/), a simulation of the original IBM PC (circa 1981)
 * [C1Pjs](/docs/c1pjs/), a simulation of the OSI Challenger 1P (circa 1978)

_posts/2015-12-10-rebuilding-the-pcjs-website.md

@@ -67,13 +67,14 @@ the following values, depending on whether you want an IBM PC or Challenger 1P,
 - c1p
 - c1p-dbg
 
-and `id` can be any identifier you want to use to embed the machine.  You may also use `config` to specify a machine XML
+and `id` can be any identifier you want to use to embed the machine.  You may also use `config` to specify a machine
-configuration file if not using the default `machine.xml`; `template` to specify an alternate XSL template file if not
+XML configuration file if not using the default `machine.xml`; `template` to specify an alternate XSL template file
-using the default `components.xsl` file; `state` to specify a JSON-encoded machine state file if the machine requires a
+if not using the default `components.xsl`; `state` to specify a JSON-encoded machine state file if the machine requires
-predefined state; and `uncompiled` may be set to *true* to force a machine to use uncompiled sources, overriding the
+a predefined state; and `uncompiled` may be set to *true* to force a machine to use uncompiled sources, overriding the
 value of `site.pcjs.compiled` in **_config.yml**.
 
-For example, the PCjs home page contains two machines, and so this appears at the top of the root [README.md](https://raw.githubusercontent.com/jeffpar/pcjs/gh-pages/README.md):
+For example, the PCjs home page contains two machines, so this appears at the top of the root
+[README.md](https://raw.githubusercontent.com/jeffpar/pcjs/master/README.md):
 
 	machines:
 	  - type: pc
@@ -85,14 +86,15 @@ For example, the PCjs home page contains two machines, and so this appears at th
 
 I will continue to include a Node web server with the PCjs project, but it's now intended for development
 purposes only (not production servers).  I've updated the PCjs MarkOut component to parse any "Front Matter"
-at the top of the PCjs Markdown files, and to convert all new Jekyll-style embedded machines to the old format,
+at the top of the PCjs Markdown files, and to convert all new Jekyll-style embedded machines and screenshots
-so that pages generated by the Node web server will function more-or-less as before.
+to the older Markdown-compatible formats, so pages generated by the Node web server should still function
+as before.  But there are no guarantees.
 
-A word of warning: if you decide to run/alternate between Jekyll's web server (WEBrick) and the built-in Node
+WARNING: If you decide to run/alternate between Jekyll's web server (WEBrick) and the built-in Node web
-web server (server.js), you should run "grunt clean" before starting either one, to clean up any old **index.html**
+server (server.js), you should run "grunt clean" before starting either one, to remove any old **index.html**
-files; otherwise, Jekyll's server may pick up the wrong files.  It's easy to tell when this happens, because
+files; otherwise, Jekyll may inadvertently propagate those files to its "_site" folder.  It's easy to tell
-you'll see the wrong color scheme: the Node web server was designed to use *dark* colors, whereas the Jekyll web
+when this happens, because you'll see the wrong color scheme: Node web server pages were designed to use *dark*
-server uses *light* colors.
+colors, whereas Jekyll web server pages currently use *light* colors.
 
 *[@jeffpar](http://twitter.com/jeffpar)*  
 *December 10, 2015*

apps/c1p/README.md

@@ -7,7 +7,7 @@ permalink: /apps/c1p/
 Challenger 1P Applications
 ---
 
-See [GitHub](https://github.com/jeffpar/pcjs/tree/gh-pages/apps/c1p) for program listings and configuration files.
+See [GitHub](https://github.com/jeffpar/pcjs/tree/master/apps/c1p) for program listings and configuration files.
 
 The C1P serial port has no configurable hardware features.  However, there is a "demo" property that can
 be set, causing the machine to load some built-in demonstration code via the serial port when it starts up.

blog/README.md

@@ -6,8 +6,8 @@ menu_order: 2
 permalink: /blog/
 ---
 
-Keep tabs on the [PCjs Project](https://github.com/jeffpar/pcjs/tree/gh-pages) on GitHub: [Releases](https://github.com/jeffpar/pcjs/releases), [Issues](https://github.com/jeffpar/pcjs/issues),
+Keep tabs on the [PCjs Project](https://github.com/jeffpar/pcjs) on GitHub: [Releases](https://github.com/jeffpar/pcjs/releases), [Issues](https://github.com/jeffpar/pcjs/issues),
-and [Commits](https://github.com/jeffpar/pcjs/commits/gh-pages).
+and [Commits](https://github.com/jeffpar/pcjs/commits/master).
 
 For random musings about PCjs, web technologies, old hardware and software, and more, read on.
 

disks/pc/README.md

@@ -110,7 +110,7 @@ in [PC Tech Journal](/pubs/pc/magazines/pctj/).
 * Microsoft Flight Simulator
 
 Learn more about
-[Disk Sets](https://github.com/jeffpar/pcjs/tree/gh-pages/disks/pc) in the
+[Disk Sets](https://github.com/jeffpar/pcjs/tree/master/disks/pc) in the
 [PCjs Project](https://github.com/jeffpar/pcjs) on [GitHub](https://github.com/).
 
 {% if page.developer %}

docs/about/pcjs/README.md

@@ -9,7 +9,7 @@ About PCjs
 
 PCjs is a IBM PC/XT/AT simulator written entirely in JavaScript.  It's designed to load and run extremely
 fast, it works well in all modern web browsers (both desktop and mobile), and it's easy to customize.  It is part of
-the [PCjs Project](https://github.com/jeffpar/pcjs/tree/gh-pages), an open source project on [GitHub](http://github.com/).
+the [PCjs Project](https://github.com/jeffpar/pcjs), an open source project on [GitHub](http://github.com/).
 
 Check out the [Demos](/#demos) on the home page, and all the other PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/)
 and [Machine](/devices/pc/machine/) demos, including an IBM PC XT "[Server Array](/devices/pc/machine/5160/cga/256kb/array/)"