Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpar committed Nov 24, 2023
2 parents 30475ab + 28220a1 commit 072fd18
Show file tree
Hide file tree
Showing 6 changed files with 1,217 additions and 10 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2255,6 +2255,7 @@
"REDIR",
"redirector",
"Redirector",
"redistributable",
"refid",
"REGD",
"REGDOTCMD",
Expand Down
6 changes: 3 additions & 3 deletions _developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ url: "http://localhost:4000"
# of unbundled modules (yet), and since the server does not offer any means of controlling XSL rendering (yet),
# the <machine> tag of each XML file must set 'uncompiled' to "true" in order to use uncompiled scripts.
#
# 'site.pcjs.localdisks' can be turned if on you have local copies of PCjs disk images; be sure to remove
# '/disks' from the "exclude" section below as well.
# 'site.pcjs.localdisks' can be turned if on you have local copies of PCjs disk images; be sure to also
# remove '/disks' from the "exclude" section below, and change `softwareLocal` to 'software'.
#
# See https://github.com/jeffpar/pcjs/wiki/Using-a-Local-Web-Server#accessing-disk-images-locally for more
# information.
Expand Down Expand Up @@ -48,7 +48,7 @@ exclude:
- /software/pcx86/sys/dos/microsoft/2.11/src
- /tools/pc/disks

software:
softwareLocal:
decdisks:
server: /disks/decdisks
diskettes:
Expand Down
5 changes: 3 additions & 2 deletions software/pcx86/sdk/windows/3.00/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: "Microsoft Windows SDK 3.00 (Standard Mode)"
title: Microsoft Windows SDK 3.00 (Standard Mode)
permalink: /software/pcx86/sdk/windows/3.00/
preview: https://diskettes.pcjs.org/pcx86/sdk/windows/3.00/WIN30SDK-1200K-DEVTOOLS.jpg
machines:
Expand All @@ -11,7 +11,8 @@ machines:
drives: '[{name:"30Mb Hard Disk",type:3,path:"/harddisks/pcx86/30mb/MSDOS500-WIN300-VGA.json"}]'
autoMount:
A: None
B: "Windows SDK 3.00 (1200K Disk 1)"
B: Windows SDK 3.00 (1200K Disk 1)
autoType: MODE COM2:9600,N,8,1\rWDEB386 /C:2 C:\\WINDOWS\\WIN.COM\r
---

NOTE: The machine below is an IBM PC AT (8Mhz), which can only run Windows 3.00 in Standard Mode. There is also an [Enhanced Mode](enhanced/) configuration that uses a Compaq Deskpro 386 (16Mhz), but there are some issues with that configuration that need to be resolved before it is usable.
Expand Down
5 changes: 3 additions & 2 deletions software/pcx86/sdk/windows/3.00/enhanced/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: "Microsoft Windows SDK 3.00 (Enhanced Mode)"
title: Microsoft Windows SDK 3.00 (Enhanced Mode)
permalink: /software/pcx86/sdk/windows/3.00/enhanced/
preview: https://diskettes.pcjs.org/pcx86/sdk/windows/3.00/WIN30SDK-1200K-DEVTOOLS.jpg
machines:
Expand All @@ -11,7 +11,8 @@ machines:
drives: '[{name:"30Mb Hard Disk",type:3,path:"/harddisks/pcx86/30mb/MSDOS500-WIN300-VGA.json"}]'
autoMount:
A: None
B: "Windows SDK 3.00 (1200K Disk 1)"
B: Windows SDK 3.00 (1200K Disk 1)
autoType: MODE COM2:9600,N,8,1\rWDEB386 /C:2 C:\\WINDOWS\\WIN.COM\r
---

{% include machine.html id="deskpro386" %}
Loading

0 comments on commit 072fd18

Please sign in to comment.