From 8d2ff00747a1fd2c73c77dfe02887ea8a1941d94 Mon Sep 17 00:00:00 2001
From: sashakatin <aleksandr.katin@gmail.com>
Date: Sat, 29 Jul 2017 22:28:18 +0200
Subject: [PATCH] Add wording consistency for update/upgrade controversy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change main command for updating to “update_oh_my_zsh”. Seems to be
more conventional and human-readable. Some internal stuff still keeps
“upgrade”. Needs thorough testing. And maybe a transitional message for
existing users
---
 README.md                       | 8 ++++----
 lib/functions.zsh               | 4 ++--
 tools/check_for_upgrade.sh      | 2 +-
 tools/{upgrade.sh => update.sh} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename tools/{upgrade.sh => update.sh} (100%)

diff --git a/README.md b/README.md
index 54107b1cb..f93f8b21c 100644
--- a/README.md
+++ b/README.md
@@ -164,13 +164,13 @@ If you would like to override the functionality of a plugin distributed with Oh
 
 ## Getting Updates
 
-By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
+By default, you will be prompted to check for updates every few weeks. If you would like `oh-my-zsh` to automatically update itself without prompting you, set the following in your `~/.zshrc`:
 
 ```shell
 DISABLE_UPDATE_PROMPT=true
 ```
 
-To disable automatic upgrades, set the following in your `~/.zshrc`:
+To disable automatic updates, set the following in your `~/.zshrc`:
 
 ```shell
 DISABLE_AUTO_UPDATE=true
@@ -178,10 +178,10 @@ DISABLE_AUTO_UPDATE=true
 
 ### Manual Updates
 
-If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
+If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
 
 ```shell
-upgrade_oh_my_zsh
+update_oh_my_zsh
 ```
 
 Magic!
diff --git a/lib/functions.zsh b/lib/functions.zsh
index f30653784..7f14992e3 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -6,8 +6,8 @@ function uninstall_oh_my_zsh() {
   env ZSH=$ZSH sh $ZSH/tools/uninstall.sh
 }
 
-function upgrade_oh_my_zsh() {
-  env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
+function update_oh_my_zsh() {
+  env ZSH=$ZSH sh $ZSH/tools/update.sh
 }
 
 function take() {
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index a57f6da0f..378cbab21 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -11,7 +11,7 @@ function _update_zsh_update() {
 }
 
 function _upgrade_zsh() {
-  env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
+  env ZSH=$ZSH sh $ZSH/tools/update.sh
   # update the zsh file
   _update_zsh_update
 }
diff --git a/tools/upgrade.sh b/tools/update.sh
similarity index 100%
rename from tools/upgrade.sh
rename to tools/update.sh