From 09c25590b83adbc3760ac38b05623f44c9de6a1e Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 12 Sep 2017 11:52:49 -0700 Subject: [PATCH 1/2] Minor /pubs tweaks after consolidation --- pubs/README.md | 43 ++++++++++++++++++++++--------------------- pubs/about/README.md | 18 ++++++++++-------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/pubs/README.md b/pubs/README.md index 30871b626..a91a19632 100644 --- a/pubs/README.md +++ b/pubs/README.md @@ -13,39 +13,40 @@ Documentation and Publication Archive Preliminary documentation is available for the following PCjs machines: -* [C1Pjs](/pubs/c1pjs/) -* [PCx86](/pubs/pcx86/) +* [C1Pjs](c1pjs/) +* [PCx86](pcx86/) -For general historical interest, the project includes a [Publication Archive](/pubs/) that covers: +For general historical interest, the project includes a Publication Archive that covers: -* [IBM PCs and Compatibles](/pubs/pc/) - * [CPU Documents](/pubs/pc/reference/intel/) - * [Datasheets](/pubs/pc/datasheets/) - * [Magazines](/pubs/pc/magazines/) - * [Programming Guides](/pubs/pc/programming/) - * [Reference Manuals](/pubs/pc/reference/) - * [Software User and Development Guides](/pubs/pc/software/) (eg, [DOS](/pubs/pc/software/dos/), [OS/2](/pubs/pc/software/os2/), [Windows](/pubs/pc/software/windows/)) -* [Digital Equipment Corporation (DEC)](/pubs/dec/) - * [PDP-11](/pubs/dec/pdp11/) - * [VT100](/pubs/dec/vt100/) -* [Ohio Scientific's 6502-based Challenger 1P](/pubs/c1p/) - * [Datasheets](/pubs/c1p/datasheets/) - * [Programming Guides/Samples](/pubs/c1p/programming/) - * [Reference Manuals](/pubs/c1p/techref/) +* [IBM PCs and Compatibles](pc/) + * [CPU Documents](pc/reference/intel/) + * [Datasheets](pc/datasheets/) + * [Magazines](pc/magazines/) + * [Programming Guides](pc/programming/) + * [Reference Manuals](pc/reference/) + * [Software User and Development Guides](pc/software/) (eg, [DOS](pc/software/dos/), [OS/2](pc/software/os2/), [Windows](pc/software/windows/)) +* [Digital Equipment Corporation (DEC)](dec/) + * [PDP-10](dec/pdp10/) + * [PDP-11](dec/pdp11/) + * [VT100](dec/vt100/) +* [Ohio Scientific's 6502-based Challenger 1P](c1p/) + * [Datasheets](c1p/datasheets/) + * [Programming Guides/Samples](c1p/programming/) + * [Reference Manuals](c1p/techref/) {% if site.developer %} Eventually, the project may also provide summaries of all supported CPU instructions; e.g.: -* [x86 Instructions](/pubs/x86/) -* [6502 Instructions](/pubs/6502/) +* [x86 Instructions](x86/) +* [6502 Instructions](6502/) {% endif %} -Finally, here's an eclectic collection of personal documents, ranging from early PC debugging notes to old program +Finally, we have an eclectic collection of personal documents, ranging from early PC debugging notes to old program listings and more: -* [Personal Documents of Dubious Historical Interest](/pubs/personal/) +* [Personal Documents of Dubious Historical Interest](personal/) --- diff --git a/pubs/about/README.md b/pubs/about/README.md index 42c5f04cd..13e83c104 100644 --- a/pubs/about/README.md +++ b/pubs/about/README.md @@ -45,8 +45,8 @@ Read [About PCx86](/pubs/about/pcx86/) to learn more about its history, features ### Migrating to Node The PCjs web server was originally written in PHP and hosted by [DreamHost](https://www.dreamhost.com/) as -[jsmachines.net](http://jsmachines.net/), but in 2014, it was migrated to a [Node.js](http://nodejs.org) web server -and hosted by [Amazon Web Services](https://aws.amazon.com/elasticbeanstalk/) as [pcjs.org](http://www.pcjs.org/). +[jsmachines.net](http://jsmachines.net/), but in 2014, it was migrated to a [Node.js](http://nodejs.org) web server and +hosted by [Amazon Web Services](https://aws.amazon.com/elasticbeanstalk/) as [{{ site.pcjs.domain }}]({{ site.url }}/). The goals included: @@ -61,15 +61,16 @@ including extensions to the link syntax that make it easy to embed PCjs machines ### Migrating to GitHub Pages -To simplify hosting requirements, the PCjs Project was migrated to [GitHub Pages](https://pages.github.com/) in late 2015. -The project still includes the original Node-based web server, which is useful for development and debugging, but for -production sites (including [pcjs.org](http://www.pcjs.org/)), using Jekyll to generate a static copy of the project for -the web is the preferred solution. +To simplify hosting requirements, the PCjs Project was migrated to [GitHub Pages](https://pages.github.com/) in late +2015. The project still includes the original Node-based web server, which is useful for development and debugging, +but for production sites (including [{{ site.pcjs.domain }}]({{ site.url }}/)), using Jekyll to generate a static copy +of the project for the web is the preferred solution. --- License ---- +------- + The [PCjs Project](https://github.com/jeffpar/pcjs) is now an open-source project on [GitHub](http://github.com/). All published portions are free for redistribution and/or modification under the terms of the [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License, @@ -85,6 +86,7 @@ or computer that runs any version of this software. See [LICENSE](/LICENSE) for details. More Information ---- +---------------- + If you have questions or run into any problems, feel free to [tweet](http://twitter.com/jeffpar) or [email](mailto:Jeff@pcjs.org). From f090a0bd1dda15db2ea47a010a3838ab48617714 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 12 Sep 2017 13:05:53 -0700 Subject: [PATCH 2/2] Added some redirects for the most common /docs pages (now part of /pubs) --- pubs/about/README.md | 2 ++ pubs/about/pcx86/README.md | 1 + pubs/c1pjs/README.md | 1 + pubs/c1pjs/embed/README.md | 1 + pubs/pcx86/README.md | 1 + 5 files changed, 6 insertions(+) diff --git a/pubs/about/README.md b/pubs/about/README.md index 13e83c104..8894b90e6 100644 --- a/pubs/about/README.md +++ b/pubs/about/README.md @@ -4,6 +4,8 @@ title: About PCjs menu_title: About menu_order: 9 permalink: /pubs/about/ +redirect_from: + - /docs/about/ --- ## About PCjs diff --git a/pubs/about/pcx86/README.md b/pubs/about/pcx86/README.md index 4bce23f9c..30d7bb30d 100644 --- a/pubs/about/pcx86/README.md +++ b/pubs/about/pcx86/README.md @@ -5,6 +5,7 @@ permalink: /pubs/about/pcx86/ redirect_from: - /pc/ - /pcjs/ + - /docs/about/pcx86/ --- About PCx86 diff --git a/pubs/c1pjs/README.md b/pubs/c1pjs/README.md index 1913b3bd9..c544e0cb9 100644 --- a/pubs/c1pjs/README.md +++ b/pubs/c1pjs/README.md @@ -9,6 +9,7 @@ machines: redirect_from: - /c1p/ - /c1pjs/ + - /docs/c1pjs/ --- C1Pjs Documentation diff --git a/pubs/c1pjs/embed/README.md b/pubs/c1pjs/embed/README.md index 2cafd3341..22a3713d4 100644 --- a/pubs/c1pjs/embed/README.md +++ b/pubs/c1pjs/embed/README.md @@ -9,6 +9,7 @@ machines: redirect_from: - /configs/c1p/embed/ - /demos/c1p/embed.html + - /docs/c1pjs/embed/ --- Embedding The C1Pjs Simulator diff --git a/pubs/pcx86/README.md b/pubs/pcx86/README.md index 32c3e2b6d..af6c6e1e5 100644 --- a/pubs/pcx86/README.md +++ b/pubs/pcx86/README.md @@ -4,6 +4,7 @@ title: PCx86 Documentation permalink: /pubs/pcx86/ redirect_from: - /docs/pcjs/ + - /docs/pcx86/ machines: - id: ibm5150 type: pcx86