From bf14d08d9a891377f952ba8eb1d4076253938fe9 Mon Sep 17 00:00:00 2001
From: Adam <adam111316@users.noreply.github.com>
Date: Sat, 22 Nov 2014 10:53:58 +0800
Subject: [PATCH 1/2] Update changelog for 0.4.0 release

---
 CHANGES.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7a289c4c..970c81c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-### 0.x.x (2014-11-xx xx:xx:xx UTC)
+### 0.4.0 (2014-11-22 02:52:00 UTC)
 
 * Change footer stats to not add newlines when copy/pasting from them
 * Remove redundant references from Config/Help & Info
@@ -45,10 +45,6 @@
 * Change case of labels in General Config/Interface/Timezone
 * Split enabled from not enabled providers in the Configure Provider drop down on the Providers Options tab 
 
-[develop changelog]
-* Fix typo for commit "ShowData handler" i.e. SHA-1:3eec217
-* Fix adding show from TVRage API
-
 
 ### 0.3.1 (2014-11-19 16:40:00 UTC)
 

From d735d81ed58124d8a54132c5ba2c8dd492fc4599 Mon Sep 17 00:00:00 2001
From: JackDandy <JackDandy@users.noreply.github.com>
Date: Sat, 22 Nov 2014 23:30:09 +0000
Subject: [PATCH 2/2] Fix typo on General Config/Misc.

---
 CHANGES.md                                       | 1 +
 gui/slick/interfaces/default/config_general.tmpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 970c81c9..2186fa0c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -44,6 +44,7 @@
 * Fix failing "Providers" link on Config/Search Settings/Episode Search
 * Change case of labels in General Config/Interface/Timezone
 * Split enabled from not enabled providers in the Configure Provider drop down on the Providers Options tab 
+* Fix typo on General Config/Misc
 
 
 ### 0.3.1 (2014-11-19 16:40:00 UTC)
diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl
index 756d4d03..1b2cd342 100644
--- a/gui/slick/interfaces/default/config_general.tmpl
+++ b/gui/slick/interfaces/default/config_general.tmpl
@@ -68,7 +68,7 @@
 								<span class="component-title">Update shows on startup</span>
 								<span class="component-desc">
 									<input type="checkbox" name="update_shows_on_start" id="update_shows_on_start" #if $sickbeard.UPDATE_SHOWS_ON_START then 'checked="checked"' else ''#/>
-									<p>with information such as next air dates, show ended, etc. Disable for a faster startup as show info is sheduled to update in the background anyway</p>
+									<p>with information such as next air dates, show ended, etc. Disable for a faster startup as show info is scheduled to update in the background anyway</p>
 								</span>
 							</label>
 						</div>