From a610bad6cc59cfa5fabd14bb948e460fc63161e6 Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Tue, 5 Sep 2017 00:09:57 -0700
Subject: [PATCH 1/4] Update and rename osx to macos

---
 bin/{osx => macos} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename bin/{osx => macos} (98%)

diff --git a/bin/osx b/bin/macos
similarity index 98%
rename from bin/osx
rename to bin/macos
index 5a28c551..57cb126a 100755
--- a/bin/osx
+++ b/bin/macos
@@ -1,5 +1,5 @@
 # Gratuitously stolen from @mathiasbynens
-# https://github.com/mathiasbynens/dotfiles/blob/master/.osx
+# https://github.com/mathiasbynens/dotfiles/blob/master/.macos
 
 # Disable menu bar transparency
 defaults write NSGlobalDomain AppleEnableMenuBarTransparency -bool false
@@ -244,4 +244,4 @@ defaults write com.google.Chrome.plist AppleEnableSwipeNavigateWithScrolls -bool
 
 # Kill affected applications
 for app in Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer; do killall "$app" > /dev/null 2>&1; done
-echo "OSX Hacks Done. Note that some of these changes require a logout/restart to take effect."
+echo "macOS Hacks Done. Note that some of these changes require a logout/restart to take effect."

From 82c7752caee0333874a445e9d37f3a64ee9bd4bd Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Tue, 5 Sep 2017 00:12:38 -0700
Subject: [PATCH 2/4] Update and rename osx_tools.md to macos_tools.md

---
 doc/{osx_tools.md => macos_tools.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename doc/{osx_tools.md => macos_tools.md} (75%)

diff --git a/doc/osx_tools.md b/doc/macos_tools.md
similarity index 75%
rename from doc/osx_tools.md
rename to doc/macos_tools.md
index 356edc24..77d67775 100644
--- a/doc/osx_tools.md
+++ b/doc/macos_tools.md
@@ -2,4 +2,4 @@
 
  * NValt - Notational Velocity alternative fork - http://brettterpstra.com/project/nvalt/ - syncs with SimpleNote
  * Vimium for Chrome - vim style browsing. The `f` to type the two char alias of any link is worth it.
- * QuickCursor - gives you Apple-Shift-E to edit any OSX text field in vim.
+ * QuickCursor - gives you Apple-Shift-E to edit any macOS text field in vim.

From f073c2b04f36193162e34078734fde3c82c6d7cc Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Tue, 5 Sep 2017 00:13:02 -0700
Subject: [PATCH 3/4] Update README.md

Further update from osx to macos
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 97f97eb0..5fd5be6b 100644
--- a/README.md
+++ b/README.md
@@ -299,7 +299,7 @@ There you can play around, test commands, aliases, etc.
 ## Misc
 
 * [Credits & Thanks](doc/credits.md)
-* [Other recommended macOS productivity tools](doc/osx_tools.md)
+* [Other recommended macOS productivity tools](doc/macos_tools.md)
 * [Yan's Blog](https://yanpritzker.com)
 
 ### macOS Hacks
@@ -307,7 +307,7 @@ There you can play around, test commands, aliases, etc.
 The macOS file is a bash script that sets up sensible defaults for devs and power users
 under macOS. Read through it before running it. To use:
 
-    bin/osx
+    bin/macos
 
 These hacks are Lion-centric. May not work for other OS'es. My favorite mods include:
 

From ee8a71cfc580effb8e09fa105ca265c0835d35a3 Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Tue, 5 Sep 2017 17:00:30 -0700
Subject: [PATCH 4/4] Update .dockerignore

Rename .osx to .macos
---
 .dockerignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index db7ffc5f..eaf51a9a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 docker-compose.yml
 Dockerfile
 bin/fix_macvim_external_display.sh
-bin/osx
+bin/macos