Merge pull request #770 from alanyee/master

Update and rename osx to macos

.dockerignore

@@ -1,4 +1,4 @@
 docker-compose.yml
 Dockerfile
 bin/fix_macvim_external_display.sh
-bin/osx
+bin/macos

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:
 

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."

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.