Permalink
Browse files

"Mac OS X" -> "Mac OS"

Although "macOS" is the correct name for Apple's current desktop OS,
we've decided to go with "Mac OS" to cover all of Apple's Unix-like
desktop OS versions. The label "Mac OS" is more readable, clear in
context (i.e., unlikely to be confused with the Mac OSes that
proceeded Mac OS X), and as likely to match Apple's future OS names
as anything.
1 parent 5cc5bb7 commit 710320e3dc82ffa2565188677fc9c88711722f1c @mflatt mflatt committed Dec 23, 2016
Showing with 180 additions and 183 deletions.
  1. +4 −4 INSTALL.txt
  2. +3 −3 Makefile
  3. +1 −1 pkgs/compiler-lib/compiler/commands/exe.rkt
  4. +1 −1 pkgs/net-doc/net/scribblings/dns.scrbl
  5. +2 −2 pkgs/net-doc/net/scribblings/osx-ssl.scrbl
  6. +2 −2 pkgs/net-doc/net/scribblings/sendurl.scrbl
  7. +1 −1 pkgs/racket-doc/file/scribblings/tar.scrbl
  8. +2 −2 pkgs/racket-doc/file/scribblings/zip.scrbl
  9. +5 −5 pkgs/racket-doc/openssl/openssl.scrbl
  10. +1 −1 pkgs/racket-doc/pkg/scribblings/strip.scrbl
  11. +1 −1 pkgs/racket-doc/scribblings/foreign/intro.scrbl
  12. +1 −1 pkgs/racket-doc/scribblings/foreign/ns.scrbl
  13. +1 −1 pkgs/racket-doc/scribblings/foreign/objc.scrbl
  14. +1 −1 pkgs/racket-doc/scribblings/getting-started/getting-started.scrbl
  15. +1 −1 pkgs/racket-doc/scribblings/guide/module-basics.scrbl
  16. +2 −2 pkgs/racket-doc/scribblings/guide/scripts.scrbl
  17. +1 −1 pkgs/racket-doc/scribblings/guide/welcome.scrbl
  18. +4 −4 pkgs/racket-doc/scribblings/inside/embedding.scrbl
  19. +4 −4 pkgs/racket-doc/scribblings/inside/extensions.scrbl
  20. +1 −1 pkgs/racket-doc/scribblings/inside/memory.scrbl
  21. +1 −1 pkgs/racket-doc/scribblings/inside/overview.scrbl
  22. +4 −4 pkgs/racket-doc/scribblings/inside/ports.scrbl
  23. +1 −1 pkgs/racket-doc/scribblings/inside/subprocesses.scrbl
  24. +2 −2 pkgs/racket-doc/scribblings/inside/threads.scrbl
  25. +2 −2 pkgs/racket-doc/scribblings/raco/bundle-api.scrbl
  26. +1 −1 pkgs/racket-doc/scribblings/raco/dist.scrbl
  27. +10 −10 pkgs/racket-doc/scribblings/raco/exe-api.scrbl
  28. +2 −2 pkgs/racket-doc/scribblings/raco/exe-dylib-path.scrbl
  29. +3 −3 pkgs/racket-doc/scribblings/raco/exe.scrbl
  30. +11 −11 pkgs/racket-doc/scribblings/raco/launcher.scrbl
  31. +1 −1 pkgs/racket-doc/scribblings/raco/setup.scrbl
  32. +1 −1 pkgs/racket-doc/scribblings/reference/bytes.scrbl
  33. +3 −3 pkgs/racket-doc/scribblings/reference/encodings.scrbl
  34. +2 −3 pkgs/racket-doc/scribblings/reference/eval.scrbl
  35. +4 −4 pkgs/racket-doc/scribblings/reference/file-ports.scrbl
  36. +12 −13 pkgs/racket-doc/scribblings/reference/filesystem.scrbl
  37. +1 −1 pkgs/racket-doc/scribblings/reference/futures.scrbl
  38. +1 −1 pkgs/racket-doc/scribblings/reference/logging.scrbl
  39. +1 −1 pkgs/racket-doc/scribblings/reference/mz.rkt
  40. +1 −1 pkgs/racket-doc/scribblings/reference/places.scrbl
  41. +4 −4 pkgs/racket-doc/scribblings/reference/runtime.scrbl
  42. +5 −5 pkgs/racket-doc/scribblings/reference/startup.scrbl
  43. +8 −8 pkgs/racket-doc/scribblings/reference/subprocess.scrbl
  44. +1 −1 pkgs/racket-doc/scribblings/reference/unix-paths.scrbl
  45. +1 −1 pkgs/racket-doc/xml/xml.scrbl
  46. +1 −1 pkgs/racket-index/scribblings/main/start.scrbl
  47. +1 −1 pkgs/racket-test/tests/racket/embed-in-c.rkt
  48. +1 −1 racket/collects/compiler/distribute.rkt
  49. +2 −2 racket/collects/compiler/embed.rkt
  50. +1 −1 racket/collects/compiler/private/xform.rkt
  51. +1 −1 racket/collects/db/private/sqlite3/connection.rkt
  52. +1 −1 racket/collects/openssl/libcrypto.rkt
  53. +1 −1 racket/collects/openssl/private/macosx.rkt
  54. +3 −3 racket/src/README
  55. +14 −14 racket/src/configure
  56. +5 −5 racket/src/foreign/libffi/configure
  57. +2 −2 racket/src/mac/README.txt
  58. +9 −10 racket/src/native-libs/README.txt
  59. +1 −1 racket/src/native-libs/build.rkt
  60. +1 −1 racket/src/native-libs/cmdline.rkt
  61. +14 −14 racket/src/racket/configure.ac
View
@@ -53,7 +53,7 @@ If you stick with this repository, then you have several options:
Quick Instructions: In-place Build
==================================
-On Unix (including Linux) and Mac OS X, `make' (or `make in-place')
+On Unix (including Linux) and Mac OS, `make' (or `make in-place')
creates a build in the "racket" directory.
On Windows with Microsoft Visual Studio (any version between 2008/9.0
@@ -81,7 +81,7 @@ installs into "<dir>" (which must be an absolute path) with binaries
in "<dir>/bin", packages in "<dir>/share/racket/pkgs", documentation
in "<dir>/share/racket/doc", etc.
-On Mac OS X, `make unix-style PREFIX=<dir>' builds and installs into
+On Mac OS, `make unix-style PREFIX=<dir>' builds and installs into
"<dir>" (which must be an absolute path) with binaries in "<dir>/bin",
packages in "<dir>/share/pkgs", documentation in "<dir>/doc", etc.
@@ -321,7 +321,7 @@ normalizing the Windows results to "i386-win32" and "x86_63-win32",
-<dist-suffix> is omitted unless a `#:dist-suffix' string is specified
for the client in the site configuration, and <ext> is
platform-specific: ".sh" for Unix (including Linux), ".dmg" or ".pkg"
-for Mac OS X, and ".exe" for Windows.
+for Mac OS, and ".exe" for Windows.
Generating Installer Web Sites
------------------------------
@@ -517,7 +517,7 @@ In more detail:
To create a ".tgz" archive instead of an installer (or any
platform), set `TGZ_MODE' to "--tgz".
- For a Mac OS X installer, set `SIGN_IDENTITY' as the name to
+ For a Mac OS installer, set `SIGN_IDENTITY' as the name to
which the signing certificate is associated. Set `MAC_PKG_MODE'
to "--mac-pkg" to create a ".pkg" installer instead of a ".dmg"
image.
View
@@ -98,7 +98,7 @@ win32-as-is:
$(WIN32_RUN_RACO) setup $(ALL_PLT_SETUP_OPTIONS)
# ------------------------------------------------------------
-# Unix-style build (Unix and Mac OS X, only)
+# Unix-style build (Unix and Mac OS, only)
PREFIX =
@@ -234,7 +234,7 @@ SOURCE_MODE =
# name or installation path:
VERSIONLESS_MODE =
-# Set to "--mac-pkg" to create ".pkg"-based installers for Mac OS X,
+# Set to "--mac-pkg" to create ".pkg"-based installers for Mac OS,
# instead of a ".dmg" for drag-and-drop installation:
MAC_PKG_MODE =
@@ -271,7 +271,7 @@ BUILD_STAMP =
# the default as the version number:
INSTALL_NAME =
-# For Mac OS X, a signing identity (spaces allowed) for binaries in an
+# For Mac OS, a signing identity (spaces allowed) for binaries in an
# installer:
SIGN_IDENTITY =
@@ -49,7 +49,7 @@
(exe-embedded-collects-dest dir)]
[("--ico") .ico-file "Set Windows icon for executable"
(exe-aux (cons (cons 'ico .ico-file) (exe-aux)))]
- [("--icns") .icns-file "Set Mac OS X icon for executable"
+ [("--icns") .icns-file "Set Mac OS icon for executable"
(exe-aux (cons (cons 'icns .icns-file) (exe-aux)))]
[("--orig-exe") "Use original executable instead of stub"
(exe-aux (cons (cons 'original-exe? #t) (exe-aux)))]
@@ -104,7 +104,7 @@ for @racket["ollie.cs.rice.edu"] might be @racket["cs.rice.edu"].}
@defproc[(dns-find-nameserver) (or/c string? false/c)]{
Attempts to find the address of a nameserver on the present system.
-On Unix and Mac OS X, this procedure parses @filepath{/etc/resolv.conf} to
+On Unix and Mac OS, this procedure parses @filepath{/etc/resolv.conf} to
extract the first nameserver address. On Windows, it runs
@exec{nslookup.exe}.}
@@ -3,11 +3,11 @@
(for-label net/osx-ssl
openssl))
-@title[#:tag "osx-ssl"]{OS X Native SSL: Secure Communication}
+@title[#:tag "osx-ssl"]{Mac OS Native SSL: Secure Communication}
@defmodule[net/osx-ssl]{The @racketmodname[net/osx-ssl] module
offers a fraction of the functionality of @racketmodname[openssl] and
-works only on OS X, but it has the advantage that it works before
+works only on Mac OS, but it has the advantage that it works before
OpenSSL libraries are installed.}
@history[#:added "6.3.0.12"]
@@ -24,7 +24,7 @@ On Windows, @racket[send-url] normally uses @racket[shell-execute]
to launch a browser. (If the URL appears to contain a fragment, it may
use an intermediate redirecting file due to a bug in IE7.)
-On Mac OS X, @racket[send-url] runs @exec{osascript} to start the
+On Mac OS, @racket[send-url] runs @exec{osascript} to start the
user's chosen browser.
On Unix, @racket[send-url] uses a user-preference, or when none is
@@ -80,7 +80,7 @@ above.}
@defproc[(send-url/mac [url string?]
[#:browser browser (or/c string? #f) #f])
void?]{
- Like @racket[send-url], but only for use on a Mac OS X machine.
+ Like @racket[send-url], but only for use on a Mac OS machine.
The optional @racket[browser] argument, if present, should be the name
of a browser installed on the system. For example,
@@ -11,7 +11,7 @@ resulting archives contain only directories, files, and symbolic
links, and owner information is not preserved; the owner that is
stored in the archive is always ``root.''
-Symbolic links (on Unix and Mac OS X) are not followed by default.}
+Symbolic links (on Unix and Mac OS) are not followed by default.}
@defproc[(tar [tar-file path-string?]
@@ -5,7 +5,7 @@
@defmodule[file/zip]{The @racketmodname[file/zip] library provides
utilities to create @exec{zip} archive files, which are compatible
-with both Windows and Unix (including Mac OS X) unpacking. The actual
+with both Windows and Unix (including Mac OS) unpacking. The actual
compression is implemented by @racket[deflate].}
@defproc[(zip [zip-file path-string?] [path path-string?] ...
@@ -33,7 +33,7 @@ resulting @exec{zip} file, up to the current directory (using
Files are packaged as usual for
@exec{zip} files, including permission bits for both Windows and Unix
-(including Mac OS X). The permission bits are determined by
+(including Mac OS). The permission bits are determined by
@racket[file-or-directory-permissions], which does not preserve the
distinction between owner/group/other permissions. Also, symbolic
links are always followed.
@@ -28,10 +28,10 @@ or with the Racket distribution. In particular:
@filepath{libeay32.dll} and @filepath{ssleay32.dll}, which are
included in the Racket distribution for Windows.}
-@item{For Mac OS X, @racketmodname[openssl] depends on
+@item{For Mac OS, @racketmodname[openssl] depends on
@filepath{libssl.dylib} and @filepath{libcrypto.dylib}. Although those
-libraries are provided by Mac OS X 10.2 and later, their use is
-deprecated, so the Racket distribution for Mac OS X includes newer
+libraries are provided by Mac OS 10.2 and later, their use is
+deprecated, so the Racket distribution for Mac OS includes newer
versions.}
@item{For Unix, @racketmodname[openssl] depends on
@@ -462,7 +462,7 @@ immediately. Only supported on Windows.}
@item{If @racket[src] is @racket[(list 'macosx-keychain _path)], then
the certificates from the keychain stored at @racket[_path] are loaded
-immediately. Only supported on Mac OS X.}
+immediately. Only supported on Mac OS.}
]
@@ -493,7 +493,7 @@ on the platform:
@tt{SSL_CERT_FILE} and @tt{SSL_CERT_DIR} environment variables, if the
variables are set, or the system-wide default locations otherwise.}
-@item{On Mac OS X, the default sources consist of the system keychain
+@item{On Mac OS, the default sources consist of the system keychain
for root certificates: @racket['(macosx-keychain
"/System/Library/Keychains/SystemRootCertificates.keychain")].}
@@ -199,7 +199,7 @@ or @racket[move-man-pages] definitions in an @filepath{info.rkt} file,
retrieving them if they are not present at referenced location but are
present in a user-specific target directory (i.e., the directory
reported by @racket[find-user-lib-dir], @racket[find-user-share-dir],
-or @racket[find-user-man-dir], respectively). On Mac OS X, when an
+or @racket[find-user-man-dir], respectively). On Mac OS, when an
unmoved file for @racket[move-foreign-libs] is a Mach-O file that
includes a reference to another library in one of the directories reported by
@racket[(get-lib-search-dirs)], then the reference is changed to a
@@ -60,7 +60,7 @@ To use the FFI, you must have in mind
The library corresponds to a file with a suffix such as
@filepath{.dll}, @filepath{.so}, or @filepath{.dylib} (depending on
the platform), or it might be a library within a @filepath{.framework}
-directory on Mac OS X.
+directory on Mac OS.
Knowing the library's name and/or path is often the trickiest part of
using the FFI. Sometimes, when using a library name without a path
@@ -8,7 +8,7 @@
The @racketmodname[ffi/unsafe/nsalloc] and
@racketmodname[ffi/unsafe/nsstring] libraries provide basic
-facilities for working with Cocoa and/or Mac OS X Foundation
+facilities for working with Cocoa and/or Mac OS Foundation
libraries (usually along with @racket[ffi/objc]).
@; ----------------------------------------
@@ -111,7 +111,7 @@ Defines each @racket[class-id] to the class (a value with FFI type
A class accessed by @racket[import-class] is normally declared as a
side effect of loading a foreign library. For example, if you want to
-import the class @tt{NSString} on Mac OS X, the @filepath{Foundation}
+import the class @tt{NSString} on Mac OS, the @filepath{Foundation}
framework must be loaded, first. Beware that if you use
@racket[import-class] in DrRacket or a module that @racket[require]s
@racketmodname[racket/gui/base], then @filepath{Foundation} will have
@@ -15,7 +15,7 @@ Start menu. In Windows Vista or newer, you can just type @exec{DrRacket}. You c
also run it from its folder, which you can find in @onscreen{Program Files} →
@onscreen{Racket} → @onscreen{DrRacket}.
-On Mac OS X, double click on the @onscreen{DrRacket} icon. It is probably in a
+On Mac OS, double click on the @onscreen{DrRacket} icon. It is probably in a
@onscreen{Racket} folder that you dragged into your
@onscreen{Applications} folder. If you want to use command-line tools, instead,
Racket executables are in the @filepath{bin} directory of the @onscreen{Racket}
@@ -247,7 +247,7 @@ installation or one of the directories reported by
the list of searched directories by setting the @envvar{PLTCOLLECTS}
environment variable.@margin-note*{If you set @envvar{PLTCOLLECTS},
include an empty path in by starting the value with a colon (Unix and
-Mac OS X) or semicolon (Windows) so that the original search paths are
+Mac OS) or semicolon (Windows) so that the original search paths are
preserved.} The best option, however, is to add a @tech{package}.
Creating a package @emph{does not} mean that you have to register with
@@ -4,12 +4,12 @@
@title[#:tag "scripts"]{Scripts}
Racket files can be turned into executable scripts on Unix and Mac
-OS X. On Windows, a compatibility layer like Cygwin support the
+OS. On Windows, a compatibility layer like Cygwin support the
same kind of scripts, or scripts can be implemented as batch files.
@section{Unix Scripts}
-In a Unix environment (including Linux and Mac OS X), a Racket file can
+In a Unix environment (including Linux and Mac OS), a Racket file can
be turned into an executable script using the shell's @as-index{@tt{#!}}
convention. The first two characters of the file must be @litchar{#!};
the next character must be either a space or @litchar{/}, and the
@@ -181,7 +181,7 @@ To package the program as an executable, you have a few options:
the program. See @secref[#:doc '(lib
"scribblings/raco/raco.scrbl") "exe"] for more information.}
- @item{With Unix or Mac OS X, you can turn the program file into an
+ @item{With Unix or Mac OS, you can turn the program file into an
executable script by inserting the line
@margin-note{See @secref["scripts"] for more information on
@@ -51,7 +51,7 @@ To embed Racket CGC in a program, follow these steps:
use. (@filepath{Racket.exe} and @filepath{GRacket.exe} use the latter
strategy.)
- On Mac OS X, dynamic libraries are provided by the
+ On Mac OS, dynamic libraries are provided by the
@filepath{Racket} framework, which is typically installed in
@filepath{lib} sub-directory of the installation. Supply
@exec{-framework Racket} to @exec{gcc} when linking, along
@@ -160,7 +160,7 @@ to Racket objects can be kept in registers, stack variables, or
structures allocated with @cppi{scheme_malloc}. In an embedding
application on some platforms, static variables are also automatically
registered as roots for garbage collection (but see notes below
-specific to Mac OS X and Windows).
+specific to Mac OS and Windows).
For example, the following is a simple embedding program which
evaluates all expressions provided on the command line and displays
@@ -232,7 +232,7 @@ executable, but the embedding application must call
@cppi{scheme_set_exec_cmd} to set the executable path (typically
@cpp{argv[0]}) before declaring modules.
-On Mac OS X, or on Windows when Racket is compiled to a DLL
+On Mac OS, or on Windows when Racket is compiled to a DLL
using Cygwin, the garbage collector cannot find static variables
automatically. In that case, @cppi{scheme_main_setup} must be called with a
non-zero first argument.
@@ -286,7 +286,7 @@ In addition, some library details are different:
separate library for 3m analogous to CGC's
@filepath{libmzgc@italic{x}.lib}.}
- @item{On Mac OS X, 3m dynamic libraries are provided by the
+ @item{On Mac OS, 3m dynamic libraries are provided by the
@filepath{Racket} framework, just as for CGC, but as a version
suffixed with @filepath{_3m}.}
@@ -80,17 +80,17 @@ steps:
but it locates a C compiler on the system and launches it with the
appropriate compilation flags. If the platform is a relatively
standard Unix system, a Windows system with either Microsoft's C
- compiler or @exec{gcc} in the path, or a Mac OS X system with Apple's
+ compiler or @exec{gcc} in the path, or a Mac OS system with Apple's
developer tools installed, then using @|mzc| is typically easier than
working with the C compiler directly. Use the @as-index{@DFlag{cgc}}
flag to indicate that the build is for use with Racket CGC.}
@item{Link the extension C/C++ files with
- @as-index{@filepath{mzdyn.o}} (Unix, Mac OS X) or
+ @as-index{@filepath{mzdyn.o}} (Unix, Mac OS) or
@as-index{@filepath{mzdyn.obj}} (Windows) to create a shared object. The
resulting shared object should use the extension @filepath{.so} (Unix),
- @filepath{.dll} (Windows), or @filepath{.dylib} (Mac OS X).
+ @filepath{.dll} (Windows), or @filepath{.dylib} (Mac OS).
The @filepath{mzdyn} object file is distributed in the installation's
@filepath{lib} directory. For Windows, the object file is in a
@@ -184,7 +184,7 @@ must be extended as follows:
@as-index{@DFlag{3m}} flags, @cpp{MZ_PRECISE_GC} is automatically
defined.}
- @item{Link with @as-index{@filepath{mzdyn3m.o}} (Unix, Mac OS X) or
+ @item{Link with @as-index{@filepath{mzdyn3m.o}} (Unix, Mac OS) or
@as-index{@filepath{mzdyn3m.obj}} (Windows) to create a shared
object. When using @|mzc|, use the @DFlag{ld} and @DFlag{3m} flags
to link to these libraries.}
@@ -882,7 +882,7 @@ requires a few frames.
If @var{stack_end} is @cpp{NULL}, then the stack end is computed
automatically: the stack size assumed to be the limit reported by
-@cpp{getrlimit} on Unix and Mac OS X, or it is assumed to be the
+@cpp{getrlimit} on Unix and Mac OS, or it is assumed to be the
stack reservation of the executable (or 1 MB if parsing the
executable fails) on Windows; if this size is greater than 8 MB, then 8 MB is
assumed, instead; the size is decremented by 50000 bytes
@@ -130,7 +130,7 @@ for the original place.
Racket implements threads for Racket programs without aid from the
operating system, so that Racket threads are cooperative from the
perspective of C code. On Unix, stand-alone Racket uses a single
-OS-implemented thread. On Windows and Mac OS X, stand-alone
+OS-implemented thread. On Windows and Mac OS, stand-alone
Racket uses a few private OS-implemented threads for background
tasks, but these OS-implemented threads are never exposed by the
Racket API.
@@ -994,7 +994,7 @@ from position @var{d} in @var{bytes}. If @var{d} is non-zero, then
[FSSpec* spec]
[int isdir])]{
-Mac OS X only: Converts an @cppi{FSSpec} record (defined by Mac OS X)
+Mac OS only: Converts an @cppi{FSSpec} record (defined by Mac OS)
into a pathname string. If @var{spec} contains only directory
information (via the @cpp{vRefNum} and @cpp{parID} fields),
@var{isdir} should be @cpp{1}, otherwise it should be @cpp{0}.}
@@ -1004,11 +1004,11 @@ information (via the @cpp{vRefNum} and @cpp{parID} fields),
[FSSpec* spec]
[intptr_t* type])]{
-Mac OS X only: Converts a pathname into an @cppi{FSSpec} record
-(defined by Mac OS X), returning @cpp{1} if successful and @cpp{0}
+Mac OS only: Converts a pathname into an @cppi{FSSpec} record
+(defined by Mac OS), returning @cpp{1} if successful and @cpp{0}
otherwise. If @var{type} is not @cpp{NULL} and @var{filename} is a
file that exists, @var{type} is filled with the file's four-character
-Mac OS X type. If @var{type} is not @cpp{NULL} and @var{filename} is
+Mac OS type. If @var{type} is not @cpp{NULL} and @var{filename} is
not a file that exists, @var{type} is filled with @cpp{0}.}
@function[(char* scheme_os_getcwd
@@ -4,7 +4,7 @@
@title{Subprocesses}
-On Unix and Mac OS X, subprocess handling involves
+On Unix and Mac OS, subprocess handling involves
@as-index[@cpp{fork}], @as-index[@cpp{waitpid}], and
@as-index[@cpp{SIGCHLD}], which creates a variety of issues within an
embedding application. On Windows, subprocess handling is more
@@ -604,7 +604,7 @@ The @cpp{scheme_add_fd_handle} function is useful for implementing
the second procedure passed to @cpp{scheme_wait_until}, or for
implementing a custom input port.
-On Unix and Mac OS X, this function has no effect.}
+On Unix and Mac OS, this function has no effect.}
@function[(void scheme_add_fd_eventmask
@@ -621,7 +621,7 @@ The event mask is only used when some handle is installed with
@cpp{scheme_add_fd_handle}. This awkward restriction may force you
to create a dummy semaphore that is never posted.
-On Unix, and Mac OS X, this function has no effect.}
+On Unix, and Mac OS, this function has no effect.}
@function[(void scheme_add_evt
[Scheme_Type type]
Oops, something went wrong.

0 comments on commit 710320e

Please sign in to comment.