From 721818c82c1546baa7de3b2d9a278328e88ff832 Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Tue, 3 Oct 2017 13:03:39 -0700
Subject: [PATCH] Switch to correct URLs on support.getmailspring.com

---
 ISSUE_TEMPLATE.md                                         | 2 +-
 .../onboarding/lib/decorators/create-page-for-form.jsx    | 6 ++++--
 app/src/browser/application.es6                           | 3 +--
 app/src/default-client-helper.es6                         | 8 ++++++--
 app/src/key-manager.es6                                   | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 327a0973c..4948b3852 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 Thanks for taking the time to file an issue! If you have general question or a problem with your email account, take a quick look at the Mailspring Knowledge Base to see if you question is addressed there:
 
-   https://support.getmailspring.com/hc/en-us/sections/203638587-N1_
+   http://support.getmailspring.com/hc/en-us/
 
 Our team tries to respond to all GitHub issues. To make sure your issue is
 actionable, try to include the following information:
diff --git a/app/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx b/app/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
index 96f977119..dfa76d2ca 100644
--- a/app/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
+++ b/app/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
@@ -212,10 +212,12 @@ const CreatePageForForm = FormComponent => {
       let articleURL;
       if (account.emailAddress.includes('@yahoo.com')) {
         message = 'Have you enabled access through Yahoo?';
-        articleURL = 'https://support.getmailspring.com/hc/en-us/articles/115001076128';
+        articleURL =
+          'http://support.getmailspring.com//hc/en-us/articles/115001882372-Authorizing-Use-with-Yahoo';
       } else {
         message = 'Some providers require an app password.';
-        articleURL = 'https://support.getmailspring.com/hc/en-us/articles/115001056608';
+        articleURL =
+          'http://support.getmailspring.com/hc/en-us/articles/115001876051-App-Passwords';
       }
       // We don't use a FormErrorMessage component because the content
       // we need to display has HTML.
diff --git a/app/src/browser/application.es6 b/app/src/browser/application.es6
index a0cb4038e..55f00bfc1 100644
--- a/app/src/browser/application.es6
+++ b/app/src/browser/application.es6
@@ -365,8 +365,7 @@ export default class Application extends EventEmitter {
     });
 
     this.on('application:view-help', () => {
-      const helpUrl =
-        'https://support.getmailspring.com/hc/en-us/categories/200419318-Help-for-N1-users';
+      const helpUrl = 'http://support.getmailspring.com/hc/en-us';
       require('electron').shell.openExternal(helpUrl);
     });
 
diff --git a/app/src/default-client-helper.es6 b/app/src/default-client-helper.es6
index 9e0a6e51a..dd3476c1d 100644
--- a/app/src/default-client-helper.es6
+++ b/app/src/default-client-helper.es6
@@ -43,7 +43,9 @@ class Windows {
         detail: "You'll find Mailspring, along with other options, listed in Default Apps > Mail.",
       },
       () => {
-        shell.openExternal('https://support.getmailspring.com/hc/en-us/articles/229277648');
+        shell.openExternal(
+          'http://support.getmailspring.com/hc/en-us/articles/115001881412-Choose-Mailspring-as-the-default-mail-client-on-Windows'
+        );
       }
     );
   }
@@ -76,7 +78,9 @@ class Windows {
               detail: "Click 'Learn More' to view instructions in our knowledge base.",
             },
             () => {
-              shell.openExternal('https://support.getmailspring.com/hc/en-us/articles/229277648');
+              shell.openExternal(
+                'http://support.getmailspring.com/hc/en-us/articles/115001881412-Choose-Mailspring-as-the-default-mail-client-on-Windows'
+              );
             }
           );
         }
diff --git a/app/src/key-manager.es6 b/app/src/key-manager.es6
index bf85b1692..ca6fb74ca 100644
--- a/app/src/key-manager.es6
+++ b/app/src/key-manager.es6
@@ -94,7 +94,7 @@ class KeyManager {
 
   _try(fn) {
     const ERR_MSG =
-      "We couldn't store your password securely! For more information, visit https://support.getmailspring.com/hc/en-us/articles/223790028";
+      "We couldn't store your password securely! For more information, visit http://support.getmailspring.com/hc/en-us/articles/115001875571";
     try {
       if (!fn()) {
         remote.dialog.showErrorBox('Password Management Error', ERR_MSG);