Skip to content

Commit 3b430b9

Browse files
committed
8250596: Update remaining manpage references from "OS X" to "macOS"
Reviewed-by: mullan, cjplummer, dholmes, sspitsyn
1 parent 948f3b3 commit 3b430b9

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

src/java.base/share/man/keytool.1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -2354,7 +2354,7 @@ file.
23542354
The security properties file is called \f[V]java.security\f[R], and
23552355
resides in the security properties directory:
23562356
.IP \[bu] 2
2357-
\f[B]Linux and OS X:\f[R] \f[V]java.home/lib/security\f[R]
2357+
\f[B]Linux and macOS:\f[R] \f[V]java.home/lib/security\f[R]
23582358
.IP \[bu] 2
23592359
\f[B]Windows:\f[R] \f[V]java.home\[rs]lib\[rs]security\f[R]
23602360
.PP
@@ -2632,7 +2632,7 @@ A certificates file named \f[V]cacerts\f[R] resides in the security
26322632
properties directory:
26332633
.RS
26342634
.IP \[bu] 2
2635-
\f[B]Linux and OS X:\f[R] \f[I]JAVA_HOME\f[R]\f[V]/lib/security\f[R]
2635+
\f[B]Linux and macOS:\f[R] \f[I]JAVA_HOME\f[R]\f[V]/lib/security\f[R]
26362636
.IP \[bu] 2
26372637
\f[B]Windows:\f[R] \f[I]JAVA_HOME\f[R]\f[V]\[rs]lib\[rs]security\f[R]
26382638
.PP
@@ -2643,8 +2643,8 @@ System administrators can configure and manage that file with the
26432643
type.
26442644
The \f[V]cacerts\f[R] keystore file ships with a default set of root CA
26452645
certificates.
2646-
For Linux, OS X, and Windows, you can list the default certificates with
2647-
the following command:
2646+
For Linux, macOS, and Windows, you can list the default certificates
2647+
with the following command:
26482648
.RS
26492649
.PP
26502650
\f[V]keytool -list -cacerts\f[R]

src/jdk.jartool/share/man/jarsigner.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -197,8 +197,8 @@ The keystore is by default stored in a file named \f[V].keystore\f[R] in
197197
the user\[aq]s home directory, as determined by the \f[V]user.home\f[R]
198198
system property.
199199
.PP
200-
\f[B]Linux and OS X:\f[R] \f[V]user.home\f[R] defaults to the user\[aq]s
201-
home directory.
200+
\f[B]Linux and macOS:\f[R] \f[V]user.home\f[R] defaults to the
201+
user\[aq]s home directory.
202202
.PP
203203
The input stream from the \f[V]-keystore\f[R] option is passed to the
204204
\f[V]KeyStore.load\f[R] method.
@@ -1159,7 +1159,7 @@ KeyUsage extension that doesn\[aq]t allow it to sign a file, the
11591159
\f[V]-strict\f[R] option is specified.
11601160
.PP
11611161
\f[B]Note:\f[R] Exit codes are reused because only the values from 0 to
1162-
255 are legal on Linux and OS X.
1162+
255 are legal on Linux and macOS.
11631163
.PP
11641164
The following sections describes the names, codes, and descriptions of
11651165
the errors and warnings that the \f[V]jarsigner\f[R] command can issue.

src/jdk.jcmd/share/man/jstat.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -548,7 +548,7 @@ The \f[I]lvmid\f[R] is typically, but not necessarily, the operating
548548
system\[aq]s process identifier for the target JVM process.
549549
You can use the \f[V]jps\f[R] command to determine the \f[I]lvmid\f[R]
550550
provided the JVM processes is not running in a separate docker instance.
551-
You can also determine the \f[I]lvmid\f[R] on Linux and OS X platforms
551+
You can also determine the \f[I]lvmid\f[R] on Linux and macOS platforms
552552
with the \f[V]ps\f[R] command, and on Windows with the Windows Task
553553
Manager.
554554
.TP

src/jdk.jdeps/share/man/jdeprscan.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,7 @@ Provides a search path for resolution of dependent classes.
116116
directories separated by the system-specific path separator.
117117
For example:
118118
.IP \[bu] 2
119-
\f[B]Linux and OS X:\f[R]
119+
\f[B]Linux and macOS:\f[R]
120120
.RS 2
121121
.RS
122122
.PP

src/jdk.jdeps/share/man/jdeps.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -275,7 +275,7 @@ classes in that containing archive are analyzed.
275275
The following example demonstrates analyzing the dependencies of the
276276
\f[V]Notepad.jar\f[R] file.
277277
.PP
278-
\f[B]Linux and OS X:\f[R]
278+
\f[B]Linux and macOS:\f[R]
279279
.IP
280280
.nf
281281
\f[CB]

src/jdk.jlink/share/man/jmod.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -223,7 +223,7 @@ create --class-path mods/com.greetings --module-path mlib
223223
--cmds commands --config configfiles --header-files src/h
224224
--libs lib --main-class com.greetings.Main
225225
--man-pages man --module-version 1.0
226-
--os-arch \[dq]x86_x64\[dq] --os-name \[dq]Mac OS X\[dq]
226+
--os-arch \[dq]x86_x64\[dq] --os-name \[dq]macOS\[dq]
227227
--os-version \[dq]10.10.5\[dq] greetingsmod
228228
\f[R]
229229
.fi
@@ -248,7 +248,7 @@ The following is an example of creating a JMOD file:
248248
jmod create --class-path mods/com.greetings --cmds commands
249249
--config configfiles --header-files src/h --libs lib
250250
--main-class com.greetings.Main --man-pages man --module-version 1.0
251-
--os-arch \[dq]x86_x64\[dq] --os-name \[dq]Mac OS X\[dq]
251+
--os-arch \[dq]x86_x64\[dq] --os-name \[dq]macOS\[dq]
252252
--os-version \[dq]10.10.5\[dq] greetingsmod
253253
\f[R]
254254
.fi
@@ -396,7 +396,7 @@ from the directory \f[V]jmodhashex\f[R].
396396
Run the following command from the \f[V]jmodhashex2\f[R] directory:
397397
.RS 4
398398
.IP \[bu] 2
399-
\f[B]Linux and OS X:\f[R]
399+
\f[B]Linux and macOS:\f[R]
400400
.RS 2
401401
.RS
402402
.PP

src/jdk.jstatd/share/man/jstatd.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
1+
.\" Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
22
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
.\"
44
.\" This code is free software; you can redistribute it and/or modify it
@@ -107,9 +107,9 @@ The \f[V]jstatd\f[R] server can monitor only JVMs for which it has the
107107
appropriate native access permissions.
108108
Therefore, the \f[V]jstatd\f[R] process must be running with the same
109109
user credentials as the target JVMs.
110-
Some user credentials, such as the root user in Linux and OS X operating
111-
systems, have permission to access the instrumentation exported by any
112-
JVM on the system.
110+
Some user credentials, such as the root user in Linux and macOS
111+
operating systems, have permission to access the instrumentation
112+
exported by any JVM on the system.
113113
A \f[V]jstatd\f[R] process running with such credentials can monitor any
114114
JVM on the system, but introduces additional security concerns.
115115
.PP

0 commit comments

Comments
 (0)