https links and some magical SEO shit

8 files changed, 50 insertions, 31 deletions

diff --git a/.htaccess b/.htaccess
index 422dcb1d..da4edd20 100644
--- a/.htaccess
+++ b/.htaccess
@@ -27,3 +27,21 @@ ExpiresByType image/x-icon "access 1 year"
 ExpiresDefault "access 1 month"
 </IfModule>
 ## EXPIRES CACHING ##
+
+Redirect 301 /features /#features
+Redirect 301 /installation /#installation
+Redirect 301 /linux /#linux
+Redirect 301 /windows /#windows
+Redirect 301 /osx /#osx
+Redirect 301 /macos /#osx
+Redirect 301 /dependencies /#dependencies
+Redirect 301 /security-considerations /#security-considerations
+Redirect 301 /planned-features /#planned-features
+Redirect 301 /known-issues /#known-issues
+Redirect 301 /faq /#faq
+Redirect 301 /cant-save-a-password /#cant-save-a-password
+Redirect 301 /i-have-an-issue-with-gnome-keyring /#i-have-an-issue-with-gnome-keyring
+Redirect 301 /can-i-import-from-keepass-lastpass-or-x /#can-i-import-from-keepass-lastpass-or-x
+Redirect 301 /current-FAQ /#current-FAQ
+Redirect 301 /where-can-i-ask-for-help /#where-can-i-ask-for-help
+Redirect 301 /changelogs /#changelogs
diff --git a/404.html b/404.html
index cfdeee30..caac1880 100644
--- a/404.html
+++ b/404.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
     <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.2</small></h1>
-        <p>QtPass is a multi-platform GUI for <a href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p>QtPass is a multi-platform GUI for <a href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -133,7 +133,7 @@
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/changelog.1.1.html b/changelog.1.1.html
index 225a570d..07aed70c 100644
--- a/changelog.1.1.html
+++ b/changelog.1.1.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
 <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.1</small></h1>
-        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a title="QtPass project" href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -251,7 +251,7 @@
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/changelog.beta.html b/changelog.beta.html
index b675b7ad..e0fc7d7b 100644
--- a/changelog.beta.html
+++ b/changelog.beta.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
 <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>beta</small></h1>
-        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a title="QtPass project" href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -229,7 +229,7 @@
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/changelog.html b/changelog.html
index e7ec496c..57ae9b31 100644
--- a/changelog.html
+++ b/changelog.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
 <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.2</small></h1>
-        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a title="QtPass project" href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -155,7 +155,7 @@
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/changelog.old.html b/changelog.old.html
index b9b18550..7b15b5df 100644
--- a/changelog.old.html
+++ b/changelog.old.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
 <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.0</small></h1>
-        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p><a title="QtPass GUI for pass, the standard UNIX password manager" href="https://qtpass.org/">QtPass</a> is a multi-platform GUI for <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a title="QtPass project" href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -300,7 +300,7 @@
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/downloads.html b/downloads.html
index 439b728b..1a4d75bc 100644
--- a/downloads.html
+++ b/downloads.html
@@ -45,7 +45,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
     <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +77,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.2</small></h1>
-        <p>QtPass is a multi-platform GUI for <a href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p>QtPass is a multi-platform GUI for <a href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -113,7 +113,7 @@
         <pre><code>dnf install qtpass</code></pre>
 
         <h4 id="deb">Debian, Ubuntu and derivates like Kali &amp; Raspbian</h4>
-        In <a title="Debian QtPass in testing" href="https://packages.debian.org/testing/utils/qtpass">testing</a>, <a title="Debian QtPass in unstable" href="https://packages.debian.org/unstable/utils/qtpass">sid</a> and <a title="Ubuntu QtPass in xenial" href="http://packages.ubuntu.com/xenial/utils/qtpass">xenial</a>.
+        In <a title="Debian QtPass in testing" href="https://packages.debian.org/testing/utils/qtpass">testing</a>, <a title="Debian QtPass in unstable" href="https://packages.debian.org/unstable/utils/qtpass">sid</a> and <a title="Ubuntu QtPass in xenial" href="https://packages.ubuntu.com/xenial/utils/qtpass">xenial</a>.
         <pre><code>apt-get install qtpass</code></pre>
 
         <h4 id="Gentoo">Gentoo</h4>
@@ -121,11 +121,11 @@
         <pre><code>emerge -atv qtpass</code></pre>
 
         <h4 id="Void">Void</h4>
-        Has a nie xbps <a title="Void Linux QtPass package" href="http://www.voidlinux.eu/packages/">package</a>.
+        Has a nie xbps <a title="Void Linux QtPass package" href="https://www.voidlinux.eu/packages/">package</a>.
         <pre><code>xbps-install -Su qtpass</code></pre>
 
         <h4 id="NixOS">NixOS</h4>
-        One of the first to addopt QtPass <a title="NixOS QtPass packages" href="http://nixos.org/nixos/packages.html">packages</a>
+        One of the first to addopt QtPass <a title="NixOS QtPass packages" href="https://nixos.org/nixos/packages.html">packages</a>
         <pre><code>nix-env -iA nixos.pkgs.qtpass</code></pre>
 
         <h4 id="Soleus">Soleus Project</h4>
@@ -155,7 +155,7 @@
 
         <p>Latest stable on the <a href="https://github.com/IJHack/qtpass/releases">releases page</a>, latest build via <a href="https://annejan.com/media/qtpass.php">AnneJan</a>.</p>
 
-        Via <a href="http://caskroom.io">Homebrew Cask</a> <pre><code>brew cask install qtpass</code></pre>
+        Via <a href="https://caskroom.io">Homebrew Cask</a> <pre><code>brew cask install qtpass</code></pre>
 
         <h3><a id="dependencies" class="anchor" href="#dependencies" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Dependencies</h3>
         <ul>
@@ -207,7 +207,7 @@ qmake &amp;&amp; make &amp;&amp; macdeployqt QtPass.app</code></pre>
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }
diff --git a/index.html b/index.html
index c0339e71..9eb7f73f 100644
--- a/index.html
+++ b/index.html
@@ -8,6 +8,7 @@
     <meta name="keywords" content="qtpass, pass, gpg, git, password, store, manager, security">
     <link rel="stylesheet" href="stylesheets/styles.css">
     <link rel="stylesheet" href="stylesheets/pygment_trac.css">
+    <link rel="canonical" href="https://qtpass.org">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -45,7 +46,7 @@
     <link href="https://plus.google.com/u/0/+AnneJanBrouwer" rel="publisher" />
 <script type="application/ld+json">
 {
-  "@context" : "http://schema.org",
+  "@context" : "https://schema.org",
   "@type" : "SoftwareApplication",
   "name" : "QtPass",
   "url" : "https://qtpass.org/",
@@ -77,7 +78,7 @@
 <div class="wrapper">
     <header>
         <h1>QtPass <small>1.2.1</small></h1>
-        <p>QtPass is a multi-platform GUI for <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
+        <p>QtPass is a multi-platform GUI for <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a>, the standard unix password manager.</p>
 
         <p class="view">
             <a title="QtPass project" href="https://github.com/IJHack/qtpass">View the Project on GitHub <small>IJHack/qtpass</small></a>
@@ -128,10 +129,10 @@
         </p>
 
         <ul>
-            <li>Using <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">pass</a> or git and gpg2 directly</li>
+            <li>Using <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">pass</a> or git and gpg2 directly</li>
             <li>Cross platform: Linux, BSD, OS X and Windows</li>
             <li>Using native widgets and iconography where possible</li>
-            <li>Reading pass <a title="pass, the standard unix password manager" href="http://www.passwordstore.org/">password stores</a></li>
+            <li>Reading pass <a title="pass, the standard unix password manager" href="https://www.passwordstore.org/">password stores</a></li>
             <li>Decrypting and displaying the password and related info</li>
             <li>Editing and adding of passwords and information</li>
             <li>Updating to and from a git repository</li>
@@ -167,17 +168,17 @@
 
         <h4><a href="/downloads">More options</a></h4>
 
-        <h3><a id="downloads-windows" class="anchor" href="#windows" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Windows</h3>
+        <h3><a id="windows" class="anchor" href="#windows" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Windows</h3>
 
         <p>Latest stable on the <a title="QtPass Windows releases" href="https://github.com/IJHack/qtpass/releases">releases page</a>, latest build via <a title="QtPass Windows builds" href="https://ci.appveyor.com/project/annejan/qtpass/build/artifacts">AppVeyor</a>.</p>
 
         Via <a title="choco install qtpass" href="https://chocolatey.org/packages/qtpass">Chocolatey</a> <pre><code>choco install qtpass</code></pre>
 
-        <h3><a id="downloads-osx" class="anchor" href="#osx" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>OSX</h3>
+        <h3><a id="osx" class="anchor" href="#osx" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>OSX</h3>
 
         <p>Latest stable on the <a title="QtPass MacOs releases" href="https://github.com/IJHack/qtpass/releases">releases page</a>, latest build via <a title="QtPass OSX builds" href="https://annejan.com/media/qtpass.php">AnneJan</a>.</p>
 
-        Via <a title="brew cask install qtpass" href="http://caskroom.io">Homebrew Cask</a> <pre><code>brew cask install qtpass</code></pre>
+        Via <a title="brew cask install qtpass" href="https://caskroom.io">Homebrew Cask</a> <pre><code>brew cask install qtpass</code></pre>
 
         <h3><a id="dependencies" class="anchor" href="#dependencies" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Dependencies</h3>
         <ul>
@@ -285,7 +286,7 @@ fi
         <h3><a id="can-i-import-from-keepass-lastpass-or-x" class="anchor" href="#can-i-import-from-keepass-lastpass-or-x" aria-hidden="true"><span class="octicon octicon-link"></span></a>Can I import from KeePass, LastPass or X?</h3>
 
         <ul>
-            <li>Yes, check <a href="http://www.passwordstore.org/#migration">passwordstore.org/#migration</a> for more info.</li>
+            <li>Yes, check <a href="https://www.passwordstore.org/#migration">passwordstore.org/#migration</a> for more info.</li>
         </ul>
 
         <h3><a id="current-FAQ" class="anchor" href="#current-FAQ" aria-hidden="true"><span class="octicon octicon-link"></span></a>Are there more frequently asked questions?</h3>
@@ -331,7 +332,7 @@ fi
 </div>
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
   "url": "https://qtpass.org"
 }