Merge pull request atomantic#27 from alanyee/master

Update docs

config.js

@@ -3,7 +3,7 @@ module.exports = {
     // http://conqueringthecommandline.com/book/ack_ag
     'ack',
     'ag',
-    // Install GNU core utilities (those that come with OS X are outdated)
+    // Install GNU core utilities (those that come with macOS are outdated)
     // Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
     'coreutils',
     'dos2unix',

configs/hosts

@@ -38,7 +38,7 @@
 # 		see: http://support.microsoft.com/kb/2764944
 # You may have to use Notepad and "Run as Administrator"
 #
-# For Linux, Unix, or OS X place this file at "/etc/hosts" or on some
+# For Linux, Unix, or macOS place this file at "/etc/hosts" or on some
 #    systems at "/private/etc/hosts". You will require root access to do
 #    this. Saving this file to "~/hosts" will allow you to run something
 #    like "sudo cp ~/hosts /etc/hosts".

homedir/.vim/colors/solarized.vim

@@ -485,7 +485,7 @@ exe "let s:fmt_stnd     = ' ".s:vmode."=NONE".s:s.      " term=NONE".s:s."'"
 exe "let s:fmt_revr     = ' ".s:vmode."=NONE".s:r.      " term=NONE".s:r."'"
 exe "let s:fmt_revb     = ' ".s:vmode."=NONE".s:r.s:b.  " term=NONE".s:r.s:b."'"
 " revbb (reverse bold for bright colors) is only set to actual bold in low
-" color terminals (t_co=8, such as OS X Terminal.app) and should only be used
+" color terminals (t_co=8, such as macOS Terminal.app) and should only be used
 " with colors 8-15.
 exe "let s:fmt_revbb    = ' ".s:vmode."=NONE".s:r.s:bb.   " term=NONE".s:r.s:bb."'"
 exe "let s:fmt_revbbu   = ' ".s:vmode."=NONE".s:r.s:bb.s:u." term=NONE".s:r.s:bb.s:u."'"

homedir/.vimrc

@@ -256,11 +256,11 @@ au FileType c set omnifunc=ccomplete#Complete
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 nnoremap <C-b> <C-b>3<C-e> "  Make overlap 3 extra on control-b
 
-" Yank text to the OS X clipboard
+" Yank text to the macOS clipboard
 noremap <leader>y "*y
 noremap <leader>yy "*Y
 
-" Preserve indentation while pasting text from the OS X clipboard
+" Preserve indentation while pasting text from the macOS clipboard
 noremap <leader>p :set paste<CR>:put  *<CR>:set nopaste<CR>
 
 " esformatter

package.json

@@ -1,7 +1,7 @@
 {
   "name": "dotfiles",
   "version": "4.4.3",
-  "description": "atomantic dotfiles for osx",
+  "description": "atomantic dotfiles for macos",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"