From: nhmall Date: Fri, 4 Feb 2022 16:26:14 +0000 (-0500) Subject: update OS terminology used in some text references X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3db819478fc450d1150b7308743782498e2aa56a;p=nethack update OS terminology used in some text references --- diff --git a/Cross-compiling b/Cross-compiling index 062fbadff..c2eff9a80 100644 --- a/Cross-compiling +++ b/Cross-compiling @@ -182,7 +182,7 @@ cross-compiling possible: some research to find out if a cross-compiler exists that: - produces output for XX-Platform. - executes on a platform that you use and love (Linux, Windows, - Mac OS X are some examples of platforms that have cross-compilers + macOS are some examples of platforms that have cross-compilers for other targets available) o Then, make the community, devteam, and others aware that you're starting diff --git a/DEVEL/Developer.txt b/DEVEL/Developer.txt index ad4262bb6..99846d8c3 100644 --- a/DEVEL/Developer.txt +++ b/DEVEL/Developer.txt @@ -65,7 +65,7 @@ A. If you have never set up git on this machine before: git config --global user.name "MY NAME" git config --global user.email USER@EXAMPLE.COM You probably want to set up a credential cache. - Mac OS X: + macOS (10 - 12): git config --global credential.helper osxkeychain Windows: git config --global credential.helper store diff --git a/README b/README index 1e99c8c26..db56c5b34 100644 --- a/README +++ b/README @@ -106,15 +106,14 @@ Please read items (1), (2) and (3) BEFORE doing anything with your new code. At the time of the most recent official release, NetHack 3.6, it had been tested to run/compile on: - Intel Pentium or better (or clone) running Linux, BSDI, or - Windows (7 through 10) - Intel 80386 or greater (or clone) boxes running Linux, or BSDI - Mac OS X 10.11 (follow the instructions in sys/unix, not sys/mac) + Intel Pentium or better running Linux, BSDI, or + Windows 10 to 11 + Intel 80386 or greater boxes running Linux, or BSDI + macOS 10.11 (El Capitan) to 12 (Monterey) (follow the instructions + in sys/unix, not sys/mac) OpenVMS (aka VMS) V8.4 on Alpha and on Integrity/Itanium/IA64 - - Instructions have been provided by way of community contribution on: - msdos protected mode using djgpp including a Linux-host djgpp - cross-compile + Intel 80386 or greater running MS-DOS with DPMI + built via Linux-hosted djgpp cross-compiler Previous versions of NetHack were tested and known to run on the following systems, but it is unknown if they can still build and @@ -144,8 +143,7 @@ Please read items (1), (2) and (3) BEFORE doing anything with your new code. IBM PS/2 and AT compatibles running OS/2 1.1 - 2.0 (and probably Warp) with Microsoft 6.0, and OS/2 2.0 and up with IBM CSet++ 2.0. Intel 80386 or greater (or clone) running 386BSD - Intel 80386 or greater (or clone) boxes running MS-DOS with DPMI. - Intel x86 running a version of Windows prior to XP. + Intel x86 running a version of Windows 7 or 8 or prior to XP. Mips M2000 running RiscOS 4.1 NeXT running Mach (using BSD configuration) Palm Size PC 1.1 devices running Windows CE 2.11 diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 39a69022c..41f3fc2c8 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -3324,7 +3324,7 @@ operating systems. On .UX , Linux, -and Mac OS X it is \(lq.nethackrc\(rq in the user's home directory. +and macOS it is \(lq.nethackrc\(rq in the user's home directory. The file may not exist, but it is a normal ASCII text file and can be created with any text editor. .pg diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 2ce7e8a18..539849cbf 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -3593,7 +3593,7 @@ The default name and location of the configuration file varies on different operating systems.\\ %.lp "" -On UNIX, Linux and Mac OS X it is \mbox{``.nethackrc''} in the user's home +On UNIX, Linux and macOS it is \mbox{``.nethackrc''} in the user's home directory. The file may not exist, but it is a normal ASCII text file and can be created with any text editor.\\ diff --git a/doc/config.nh b/doc/config.nh index 484a2930e..b994d7814 100644 --- a/doc/config.nh +++ b/doc/config.nh @@ -1,7 +1,7 @@ # NetHack 3.7 config.nh $NHDT-Date: 1596498144 2020/08/03 23:42:24 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.4 $ # Copyright (c) 2016 by Pasi Kallinen # NetHack may be freely redistributed. See license for details. -# Sample config file for NetHack 3.6 +# Sample config file for NetHack 3.7 # # A '#' at the beginning of a line means the rest of the line is a comment. # @@ -9,9 +9,10 @@ # playing. # # Copy the contents of this file into -# * defaults.nh, same folder as nethack.exe or nethackW.exe (DOS, Windows) -# * ~/.nethackrc (Unix, linux, Mac OS X) +# * %USERPROFILE%\nethack\.nethackrc on Windows +# * ~/.nethackrc (Unix, linux, macOS) # * "NetHack Defaults" on pre-OSX Mac and BeOS +# * defaults.nh, same folder as nethack.exe on DOS # * NetHack.cnf on Amiga, Atari, OS/2, and VMS # # To change the configuration, comment out the unwanted lines, and diff --git a/sys/unix/NetHack.xcodeproj/.gitignore b/sys/unix/NetHack.xcodeproj/.gitignore index 72068cdad..c96f6402f 100644 --- a/sys/unix/NetHack.xcodeproj/.gitignore +++ b/sys/unix/NetHack.xcodeproj/.gitignore @@ -1,4 +1,4 @@ -# OS X temporary files that should never be committed +# macOS temporary files that should never be committed # .DS_Store .Trashes diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370 index f34a2f3b3..01f1c7a6c 100755 --- a/sys/unix/hints/macOS.370 +++ b/sys/unix/hints/macOS.370 @@ -7,13 +7,13 @@ # Tested on: # - MacOS Catalina 10.15 # -# If this doesn't work for some other version of Mac OS X, consider +# If this doesn't work for some other version of macOS, consider # making a new hints file it, rather than changing this one. # And let us know about it. # Useful info: http://www.opensource.apple.com/darwinsource/index.html #-PRE xxxx -# macOS X hints file +# macOS hints file # # note: '#-INCLUDE' is not just a comment; multiw-1 contains sections 1 to 2 diff --git a/sys/windows/Install.windows b/sys/windows/Install.windows index d0cb0a7ad..50b6e3b02 100644 --- a/sys/windows/Install.windows +++ b/sys/windows/Install.windows @@ -260,7 +260,7 @@ Setting Up window-port, which evolved from work originally done by Karl Garrison, has been used in several NetHack variants and on nethack.alt.org and on www.hardfought.org/nethack/. The optional curses window-port is - available for Windows, Mac OS X, and Unix (and also DOS). + available for Windows, macOS, and Unix (and also DOS). The Makefiles are configured by default to include the curses window-port support in your command line Makefile build. diff --git a/win/curses/Todo.txt b/win/curses/Todo.txt index b92327790..86529302a 100644 --- a/win/curses/Todo.txt +++ b/win/curses/Todo.txt @@ -122,9 +122,8 @@ OTHER DIALOGS OTHER PLATFORMS =============== - * PDCurses also work on DOS and OS/2. PDCurses for SDL and ncurses - exist for Mac OS X. Porting the curses interface to these platforms - should not be too difficult. + * PDCurses also work on DOS and OS/2. Porting the curses interface to + these platforms should not be too difficult. MISC