From 6594401d2f2fee62a8de9818306bc420ea10380e Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Thu, 1 Aug 2013 14:54:50 -0400
Subject: [PATCH 1/4] if mktg, redirects faq to mktg. else, to '/help'

---
 lms/templates/help_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 41a751aae4..5aae550fd9 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -106,7 +106,7 @@ discussion_link = get_discussion_link(course) if course else None
     ).format(
         open_time=open_time,
         close_time=close_time,
-        link_start='<a href="/help" target="_blank">',
+        link_start='<a href="{}" target="_blank">'.format(marketing_link('FAQ')),
         link_end='</a>'
     )}
     </p>

From 970f5f60d3589070862debd06235f1182b40f0a3 Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Tue, 13 Aug 2013 12:53:39 -0400
Subject: [PATCH 2/4] fix syntax error in help_modal

---
 lms/templates/help_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 5aae550fd9..84cb690a03 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -193,7 +193,7 @@ discussion_link = get_discussion_link(course) if course else None
 % if settings.FEEDBACK_SUBMISSION_EMAIL:
             htmlStr += " " + _.template(
               gettext("Please {link_start}send us e-mail{link_end}."),
-              {link_start: '<a href="#" id="feedback_email">', link_end='</a>'},
+              {link_start: '<a href="#" id="feedback_email">', link_end: '</a>'},
               {interpolate: /\{(.+?)\}/g})
 % else:
             // If no email is configured, we can't do much other than

From 5fd09ca1ee31f9503bcce13dbb6cb3f68cee3796 Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Tue, 13 Aug 2013 16:11:51 -0400
Subject: [PATCH 3/4] add dummy FEEDBACK_SUBMISSION_EMAIL for debugging

---
 lms/envs/dev.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 622ff6acf7..d423e1f347 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -31,6 +31,8 @@ MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True
 MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
 MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = False
 
+FEEDBACK_SUBMISSION_EMAIL = "dummy@dummy.org"
+
 WIKI_ENABLED = True
 
 LOGGING = get_logger_config(ENV_ROOT / "log",

From 72fdc414ca43707364e7c5deb846dba689e0f48d Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Wed, 14 Aug 2013 10:57:03 -0400
Subject: [PATCH 4/4] change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev
 settings

---
 lms/envs/dev.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index d423e1f347..1ed0aa5810 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -31,7 +31,7 @@ MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True
 MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
 MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = False
 
-FEEDBACK_SUBMISSION_EMAIL = "dummy@dummy.org"
+FEEDBACK_SUBMISSION_EMAIL = "dummy@example.com"
 
 WIKI_ENABLED = True