Skip to content

Commit

Permalink
Rename "Mac OS X" to "macOS" in comments
Browse files Browse the repository at this point in the history
This only changes references in text for human consumption. It leaves
out renaming paths because that can cause breaking changes.

Related issue sorin-ionescu#1449.
  • Loading branch information
ashishgandhi authored and lalonde committed Feb 28, 2019
1 parent 77b73cd commit 811adf0
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions modules/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Initializes OCaml package management.
OSX
---

Defines Mac OS X aliases and functions.
Defines macOS aliases and functions.

Pacman
------
Expand All @@ -132,7 +132,7 @@ Provides aliases and functions for the Pacman package manager and frontends.
Perl
----

Enables local Perl module installation on Mac OS X and defines alises.
Enables local Perl module installation on macOS and defines alises.

Prompt
------
Expand Down
2 changes: 1 addition & 1 deletion modules/command-not-found/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [[ -s '/etc/zsh_command_not_found' ]]; then
# Load command-not-found on Arch Linux-based distributions.
elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
source '/usr/share/doc/pkgfile/command-not-found.zsh'
# Load command-not-found on Mac OS X when homebrew tap is configured.
# Load command-not-found on macOS when homebrew tap is configured.
elif (( $+commands[brew] )) && brew command command-not-found-init > /dev/null 2>&1; then
eval "$(brew command-not-found-init)"
# Return if requirements are not found.
Expand Down
6 changes: 3 additions & 3 deletions modules/osx/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OSX
===

Defines [Mac OS X][1] aliases and functions.
Defines [macOS][1] aliases and functions.

Settings
--------
Expand Down Expand Up @@ -34,8 +34,8 @@ Functions
- `tab` creates a new tab (works in both _Terminal_ and [_iTerm_][3]).
- `ql` previews files in Quick Look.
- `osx-rm-dir-metadata` deletes .DS\_Store, \_\_MACOSX cruft.
- `osx-ls-download-history` displays the Mac OS X download history.
- `osx-rm-download-history` deletes the Mac OS X download history.
- `osx-ls-download-history` displays the macOS download history.
- `osx-rm-download-history` deletes the macOS download history.

Authors
-------
Expand Down
2 changes: 1 addition & 1 deletion modules/osx/functions/osx-ls-download-history
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Displays the Mac OS X download history.
# Displays the macOS download history.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion modules/osx/functions/osx-rm-download-history
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Deletes the Mac OS X download history.
# Deletes the macOS download history.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion modules/osx/init.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Defines Mac OS X aliases and functions.
# Defines macOS aliases and functions.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions modules/perl/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Perl
====

Enables local [Perl][1] module installation on Mac OS X and defines aliases.
Enables local [Perl][1] module installation on macOS and defines aliases.

Local Module Installation
-------------------------

Perl versions older than 5.14 do not support the local installation of Perl
modules natively. This module allows for local installation of Perl modules on
Mac OS X in *~/Library/Perl/5.12* by altering the environment.
macOS in *~/Library/Perl/5.12* by altering the environment.

### Usage

Expand Down
2 changes: 1 addition & 1 deletion modules/perl/init.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Enables local Perl module installation on Mac OS X and defines aliases.
# Enables local Perl module installation on macOS and defines aliases.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion modules/python/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ elif (( $+commands[pyenv] )); then
eval "$(pyenv init -)"

# Prepend PEP 370 per user site packages directory, which defaults to
# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
# ~/Library/Python on macOS and ~/.local elsewhere, to PATH. The
# path can be overridden using PYTHONUSERBASE.
else
if [[ -n "$PYTHONUSERBASE" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion modules/rsync/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Rsync

Defines [rsync][1] aliases.

Mac OS X users are encouraged to use [Bombich's rsync][2], which has HFS+
macOS users are encouraged to use [Bombich's rsync][2], which has HFS+
enhancements.

Aliases
Expand Down
2 changes: 1 addition & 1 deletion modules/rsync/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if grep -q 'xattrs' <(rsync --help 2>&1); then
_rsync_cmd="${_rsync_cmd} --acls --xattrs"
fi

# Mac OS X and HFS+ Enhancements
# macOS and HFS+ Enhancements
# http://help.bombich.com/kb/overview/credits#opensource
if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then
_rsync_cmd="${_rsync_cmd} --crtimes --fileflags --protect-decmpfs --force-change"
Expand Down
4 changes: 2 additions & 2 deletions modules/tmux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Aliases
Caveats
-------

On Mac OS X, launching tmux can cause the error **launch_msg(...): Socket is not
On macOS, launching tmux can cause the error **launch_msg(...): Socket is not
connected** to be displayed, which can be fixed by installing
[reattach-to-user-namespace][3], available in [Homebrew][4], and adding the
following to *tmux.conf*:
Expand All @@ -71,7 +71,7 @@ following to *tmux.conf*:
set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
```

Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
Furthermore, tmux is known to cause **kernel panics** on macOS. A discussion
about this and Prezto has already been [opened][2].

Authors
Expand Down
2 changes: 1 addition & 1 deletion modules/utility/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if zstyle -t ':prezto:module:utility:grep' color; then
alias grep="${aliases[grep]:-grep} --color=auto"
fi

# Mac OS X Everywhere
# macOS Everywhere
if [[ "$OSTYPE" == darwin* ]]; then
alias o='open'
elif [[ "$OSTYPE" == cygwin* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion runcoms/zpreztorc
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
# zstyle ':prezto:module:history-substring-search' globbing-flags ''

#
# OS X
# macOS
#

# Set the keyword used by `mand` to open man pages in Dash.app
Expand Down

0 comments on commit 811adf0

Please sign in to comment.