Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Mac OS X / OS X with macOS #952

Merged
1 commit merged into from
Oct 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions layouts/partials/primary-download-matrix.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
</tr>

<tr>
<th>Mac OS X Installer (.pkg)</th>
<th>macOS Installer (.pkg)</th>
<td colspan="6"><a href="https://nodejs.org/dist/{{version.node}}/node-{{version.node}}.pkg">64-bit</a></td>
</tr>

<tr>
<th>Mac OS X Binaries (.tar.gz)</th>
<th>macOS Binaries (.tar.gz)</th>
<td colspan="6"><a href="https://nodejs.org/dist/{{version.node}}/node-{{version.node}}-darwin-x64.tar.gz">64-bit</a></td>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion locale/en/get-involved/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ If you have found what you believe to be an issue with Node.js please do not hes
When reporting an issue we also need as much information about your environment that you can include. We never know what information will be pertinent when trying narrow down the issue. Please include at least the following information:

* Version of Node
* Platform you're running on (OS X, SunOS, Linux, Windows)
* Platform you're running on (macOS, SunOS, Linux, Windows)
* Architecture you're running on (32bit or 64bit and x86 or ARM)

The Node.js project is currently managed across a number of separate GitHub repositories, each with their own separate issues database. If possible, please direct any issues you are reporting to the appropriate repository but don't worry if things happen to get put in the wrong place, the community of contributors will be more than happy to help get you pointed in the right direction.
Expand Down
10 changes: 5 additions & 5 deletions scripts/helpers/downloads.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ const postMergeDownloads = [
'templateUrl': 'https://nodejs.org/dist/v%version%/win-x64/node.exe'
},
{
'title': 'Mac OS X 64-bit Installer',
'title': 'macOS 64-bit Installer',
'templateUrl': 'https://nodejs.org/dist/v%version%/node-v%version%.pkg'
},
{
'title': 'Mac OS X 64-bit Binary',
'title': 'macOS 64-bit Binary',
'templateUrl': 'https://nodejs.org/dist/v%version%/node-v%version%-darwin-x64.tar.gz'
},
{
Expand Down Expand Up @@ -84,15 +84,15 @@ const legacyDownloads = [
'templateUrl': 'https://nodejs.org/dist/v%version%/x64/node.exe'
},
{
'title': 'Mac OS X Universal Installer',
'title': 'macOS Universal Installer',
'templateUrl': 'https://nodejs.org/dist/v%version%/node-v%version%.pkg'
},
{
'title': 'Mac OS X 64-bit Binary',
'title': 'macOS 64-bit Binary',
'templateUrl': 'https://nodejs.org/dist/v%version%/node-v%version%-darwin-x64.tar.gz'
},
{
'title': 'Mac OS X 32-bit Binary',
'title': 'macOS 32-bit Binary',
'templateUrl': 'https://nodejs.org/dist/v%version%/node-v%version%-darwin-x86.tar.gz'
},
{
Expand Down
2 changes: 1 addition & 1 deletion static/js/download.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
switch (os) {
case 'Mac':
versionIntoHref(buttons, 'node-%version%.pkg')
downloadHead[text] = dlLocal + ' OS X (x64)'
downloadHead[text] = dlLocal + ' macOS (x64)'
break
case 'Win':
versionIntoHref(buttons, 'node-%version%-' + arch + '.msi')
Expand Down