Skip to content

Commit 853a47a

Browse files
committed
Update OS X nomenaclature to macOS
1 parent b231597 commit 853a47a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ that Visual Studio Code provides.
1010

1111
- **Windows 7 through 10** with PowerShell v3 and higher
1212
- **Linux** with PowerShell v6 (all PowerShell-supported distribtions)
13-
- **Mac OS X** with PowerShell v6
13+
- **macOS and OS X** with PowerShell v6
1414

1515
Read the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/learning-powershell/using-vscode.md)
1616
to get more details on how to use the extension on these platforms.
@@ -67,7 +67,7 @@ Restart Visual Studio Code and try to reproduce the problem. Once you are done
6767
that, zip up the logs in the corresponding folder for your operating system:
6868

6969
- **Windows**: `$HOME\.vscode\extensions\ms-vscode.PowerShell-<CURRENT VERSION>\logs`
70-
- **Linux and Mac OS X**: `~/.vscode/extensions/ms-vscode.PowerShell-<CURRENT VERSION>/logs`
70+
- **Linux and macOS**: `~/.vscode/extensions/ms-vscode.PowerShell-<CURRENT VERSION>/logs`
7171

7272
You have two options for sending us the logs:
7373

docs/troubleshooting.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
This document contains troubleshooting steps for commonly reported issues when using the
44
PowerShell extension for Visual Studio Code.
55

6-
## Mac OS X
6+
## macOS (OS X)
77

88
### 1. PowerShell IntelliSense does not work, can't debug scripts
99

10-
The most common problem when the PowerShell extension doesn't work on Mac OS X is that
10+
The most common problem when the PowerShell extension doesn't work on macOS is that
1111
OpenSSL is not installed. You can check for the installation of OpenSSL by looking for
1212
the following files:
1313

@@ -30,7 +30,7 @@ do not have OpenSSL installed.
3030

3131
#### Installing OpenSSL via Homebrew
3232

33-
We **highly recommend** that you use [Homebrew](http://brew.sh) to install OpenSSL. The PowerShell distribution for OS X
33+
We **highly recommend** that you use [Homebrew](http://brew.sh) to install OpenSSL. The PowerShell distribution for macOS
3434
has built-in support for Homebrew's OpenSSL library paths. If you install with Homebrew, you will avoid
3535
[security concerns](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#openssl)
3636
around creating symbolic links in your `/usr/local/lib` path which are needed when using other means of installation.

src/session.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -454,15 +454,15 @@ export class SessionManager {
454454
else if (os.platform() == "darwin") {
455455
powerShellExePath = "/usr/local/bin/powershell";
456456

457-
// Check for OpenSSL dependency on OS X. Look for the default Homebrew installation
457+
// Check for OpenSSL dependency on macOS. Look for the default Homebrew installation
458458
// path and if that fails check the system-wide library path.
459459
if (!(utils.checkIfFileExists("/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib") &&
460460
utils.checkIfFileExists("/usr/local/opt/openssl/lib/libssl.1.0.0.dylib")) &&
461461
!(utils.checkIfFileExists("/usr/local/lib/libcrypto.1.0.0.dylib") &&
462462
utils.checkIfFileExists("/usr/local/lib/libssl.1.0.0.dylib"))) {
463463
var thenable =
464464
vscode.window.showWarningMessage(
465-
"The PowerShell extension will not work without OpenSSL on Mac OS X",
465+
"The PowerShell extension will not work without OpenSSL on macOS and OS X",
466466
"Show Documentation");
467467

468468
thenable.then(

0 commit comments

Comments
 (0)