Merge ~tbmb/launchpad:update-links into launchpad:master

[Toto Bille]

Update links to new careers page.

Update links to new careers page.

[Kristian Glass (doismellburning)]

review: Approve

[Kristian Glass (doismellburning)]

Thanks!

[Otto Co-Pilot (otto-copilot)]

A commit message must be set
https://jenkins.ols.canonical.com/online-services/job/launchpad/502/

[Thiago F. Pappacena (pappacena)]

I'll set the commit message and merge this one.

Thanks again, Toto!

review: Approve

diff --git a/lib/lp/app/browser/doc/base-layout.txt b/lib/lp/app/browser/doc/base-layout.txt
index ddf10c1..f9eb8b7 100644
--- a/lib/lp/app/browser/doc/base-layout.txt
+++ b/lib/lp/app/browser/doc/base-layout.txt
@@ -150,7 +150,7 @@ Page Footers
     Data privacy https://www.ubuntu.com/legal/dataprivacy
     Contact Launchpad Support /feedback
     Blog http://blog.launchpad.net/
-    Careers http://www.canonical.com/about-canonical/careers
+    Careers https://canonical.com/careers
     System status https://twitter.com/launchpadstatus
     Get the code! https://dev.launchpad.net/
 
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 938d47d..175551d 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -301,7 +301,7 @@
 	>Blog</a>
       <tal:careers_link condition="not: features/baselayout.careers_link.disabled">
 	&nbsp;&bull;&nbsp;
-	<a href="http://www.canonical.com/about-canonical/careers"
+	<a href="https://canonical.com/careers"
 		>Careers</a>
       </tal:careers_link>
       &nbsp;&bull;&nbsp;