From 0ceacf5c13bb37eecd8147592fbb2533067522a1 Mon Sep 17 00:00:00 2001 From: Leo Lamprecht Date: Mon, 20 Jun 2016 11:29:10 +0200 Subject: [PATCH] OSX -> macOS --- CONTRIBUTING.md | 8 ++++---- docs/build-instructions/macos.md | 4 ++-- spec/environment-helpers-spec.js | 4 ++-- src/menu-manager.coffee | 2 +- src/text-editor-component.coffee | 4 ++-- src/workspace-element.coffee | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8e5056592..4f7d539ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,8 +103,8 @@ Explain the problem and include additional details to help maintainers reproduce * **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines). * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior. * **Explain which behavior you expected to see instead and why.** -* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. If you use the keyboard while following the steps, **record the GIF with the [Keybinding Resolver](https://github.com/atom/keybinding-resolver) shown**. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on OSX and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. -* **If you're reporting that Atom crashed**, include a crash report with a stack trace from the operating system. On OSX, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist. +* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. If you use the keyboard while following the steps, **record the GIF with the [Keybinding Resolver](https://github.com/atom/keybinding-resolver) shown**. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. +* **If you're reporting that Atom crashed**, include a crash report with a stack trace from the operating system. On macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist. * **If the problem is related to performance**, include a [CPU profile capture and a screenshot](http://flight-manual.atom.io/hacking-atom/sections/debugging/#diagnose-performance-problems-with-the-dev-tools-cpu-profiler) with your report. * **If the Chrome's developer tools pane is shown without you triggering it**, that normally means that an exception was thrown. The Console tab will include an entry for the exception. Expand the exception so that the stack trace is visible, and provide the full exception and stack trace in a [code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines) and as a screenshot. * **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below. @@ -184,7 +184,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com * **Provide a step-by-step description of the suggested enhancement** in as many details as possible. * **Provide specific examples to demonstrate the steps**. Include copy/pasteable snippets which you use in those examples, as [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines). * **Describe the current behavior** and **explain which behavior you expected to see instead** and why. -* **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Atom which the suggestion is related to. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on OSX and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. +* **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Atom which the suggestion is related to. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. * **Explain why this enhancement would be useful** to most Atom users and isn't something that can or should be implemented as a [community package](#atom-and-packages). * **List some other text editors or applications where this enhancement exists.** * **Specify which version of Atom you're using.** You can get the exact version by running `atom -v` in your terminal, or by starting Atom and running the `Application: About` command from the [Command Palette](https://github.com/atom/command-palette). @@ -382,7 +382,7 @@ Please open an issue on `atom/atom` if you have suggestions for new labels, and | --- | --- | --- | --- | | `windows` | [search][search-atom-repo-label-windows] | [search][search-atom-org-label-windows] | Related to Atom running on Windows. | | `linux` | [search][search-atom-repo-label-linux] | [search][search-atom-org-label-linux] | Related to Atom running on Linux. | -| `mac` | [search][search-atom-repo-label-mac] | [search][search-atom-org-label-mac] | Related to Atom running on OSX. | +| `mac` | [search][search-atom-repo-label-mac] | [search][search-atom-org-label-mac] | Related to Atom running on macOS. | | `documentation` | [search][search-atom-repo-label-documentation] | [search][search-atom-org-label-documentation] | Related to any type of documentation (e.g. [API documentation](https://atom.io/docs/api/latest/) and the [flight manual](http://flight-manual.atom.io/)). | | `performance` | [search][search-atom-repo-label-performance] | [search][search-atom-org-label-performance] | Related to performance. | | `security` | [search][search-atom-repo-label-security] | [search][search-atom-org-label-security] | Related to security. | diff --git a/docs/build-instructions/macos.md b/docs/build-instructions/macos.md index 8761be7aa..f829ace26 100644 --- a/docs/build-instructions/macos.md +++ b/docs/build-instructions/macos.md @@ -21,5 +21,5 @@ ## Troubleshooting -### OSX build error reports in atom/atom -* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Aos-x&type=Issues) to get a list of reports about build errors on OSX. +### macOS build error reports in atom/atom +* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Aos-x&type=Issues) to get a list of reports about build errors on macOS. diff --git a/spec/environment-helpers-spec.js b/spec/environment-helpers-spec.js index 20ec15d9f..2309be802 100644 --- a/spec/environment-helpers-spec.js +++ b/spec/environment-helpers-spec.js @@ -23,7 +23,7 @@ describe('Environment handling', () => { delete process._originalEnv }) - describe('on OSX, when PWD is not set', () => { + describe('on macOS, when PWD is not set', () => { beforeEach(() => { options.platform = 'darwin' }) @@ -67,7 +67,7 @@ describe('Environment handling', () => { }) }) - describe('on a platform other than OSX', () => { + describe('on a platform other than macOS', () => { beforeEach(() => { options.platform = 'penguin' }) diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index 67076dbfa..ebebfa3f3 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -176,7 +176,7 @@ class MenuManager unmerge: (menu, item) -> MenuHelpers.unmerge(menu, item) - # OSX can't handle displaying accelerators for multiple keystrokes. + # macOS can't handle displaying accelerators for multiple keystrokes. # If they are sent across, it will stop processing accelerators for the rest # of the menu items. filterMultipleKeystroke: (keystrokesByCommand) -> diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee index 40b18d794..e6fc0dc15 100644 --- a/src/text-editor-component.coffee +++ b/src/text-editor-component.coffee @@ -371,7 +371,7 @@ class TextEditorComponent # Workaround of the accented character suggestion feature in macOS. # This will only occur when the user is not composing in IME mode. - # When the user selects a modified character from the OSX menu, `textInput` + # When the user selects a modified character from the macOS menu, `textInput` # will occur twice, once for the initial character, and once for the # modified character. However, only a single keypress will have fired. If # this is the case, select backward to replace the original character. @@ -551,7 +551,7 @@ class TextEditorComponent {detail, shiftKey, metaKey, ctrlKey} = event - # CTRL+click brings up the context menu on OSX, so don't handle those either + # CTRL+click brings up the context menu on macOS, so don't handle those either return if ctrlKey and process.platform is 'darwin' # Prevent focusout event on hidden input if editor is already focused diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee index a9b5f149e..f3bff04c6 100644 --- a/src/workspace-element.coffee +++ b/src/workspace-element.coffee @@ -46,7 +46,7 @@ class WorkspaceElement extends HTMLElement updateGlobalTextEditorStyleSheet: -> fontFamily = @config.get('editor.fontFamily') - # TODO: There is a bug in how some emojis (e.g. ❤️) are rendered on OSX. + # TODO: There is a bug in how some emojis (e.g. ❤️) are rendered on macOS. # This workaround should be removed once we update to Chromium 51, where the # problem was fixed. fontFamily += ', "Apple Color Emoji"' if process.platform is 'darwin'