From efd25a6259e20bd0846ed2e930f6041bbd2a70cd Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Sun, 31 Mar 2019 23:23:30 -0500
Subject: [PATCH] Separate everything into their own pages

+ Permalinks!
---
 _config.yml                          |  2 +-
 _layouts/default.html                | 32 ++++++++++++-------------
 index.html                           |  2 ++
 browsers.html => pages/browsers.html |  1 +
 os.html => pages/os.html             |  1 +
 pages/providers/dns.html             | 10 ++++++++
 pages/providers/email.html           | 10 ++++++++
 pages/providers/hosting.html         | 10 ++++++++
 pages/providers/jurisdiction.html    | 12 ++++++++++
 pages/providers/paste.html           | 10 ++++++++
 pages/providers/search-engines.html  | 10 ++++++++
 pages/providers/social-networks.html | 10 ++++++++
 pages/providers/storage.html         | 10 ++++++++
 pages/providers/vpn.html             | 10 ++++++++
 pages/software/cal-card.html         | 10 ++++++++
 pages/software/cloud.html            | 10 ++++++++
 pages/software/email.html            | 12 ++++++++++
 pages/software/encryption.html       | 10 ++++++++
 pages/software/file-sharing.html     | 10 ++++++++
 pages/software/file-sync.html        | 10 ++++++++
 pages/software/im.html               | 10 ++++++++
 pages/software/networks.html         | 10 ++++++++
 pages/software/notebooks.html        | 10 ++++++++
 pages/software/passwords.html        | 10 ++++++++
 pages/software/productivity.html     | 10 ++++++++
 pages/software/video-voice.html      | 10 ++++++++
 providers.html                       | 27 ---------------------
 software.html                        | 35 ----------------------------
 28 files changed, 235 insertions(+), 79 deletions(-)
 rename browsers.html => pages/browsers.html (93%)
 rename os.html => pages/os.html (91%)
 create mode 100644 pages/providers/dns.html
 create mode 100644 pages/providers/email.html
 create mode 100644 pages/providers/hosting.html
 create mode 100644 pages/providers/jurisdiction.html
 create mode 100644 pages/providers/paste.html
 create mode 100644 pages/providers/search-engines.html
 create mode 100644 pages/providers/social-networks.html
 create mode 100644 pages/providers/storage.html
 create mode 100644 pages/providers/vpn.html
 create mode 100644 pages/software/cal-card.html
 create mode 100644 pages/software/cloud.html
 create mode 100644 pages/software/email.html
 create mode 100644 pages/software/encryption.html
 create mode 100644 pages/software/file-sharing.html
 create mode 100644 pages/software/file-sync.html
 create mode 100644 pages/software/im.html
 create mode 100644 pages/software/networks.html
 create mode 100644 pages/software/notebooks.html
 create mode 100644 pages/software/passwords.html
 create mode 100644 pages/software/productivity.html
 create mode 100644 pages/software/video-voice.html
 delete mode 100644 providers.html
 delete mode 100644 software.html

diff --git a/_config.yml b/_config.yml
index ce7b8c2c..9132e0aa 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,6 @@
 title: Privacy Tools - Encryption Against Global Mass Surveillance
 description: You are being watched! Knowledge, encryption and privacy tools to protect you against global mass surveillance.
-url: "https://privacytools.io"
+url: "https://www.privacytools.io"
 sass:
   style: compressed
 plugins:
diff --git a/_layouts/default.html b/_layouts/default.html
index 9e58cc40..e442d2b2 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -27,24 +27,24 @@
     {% endif %}
 
     <!-- icons -->
-    <link rel="apple-touch-icon" sizes="57x57" href="assets/img/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="assets/img/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="assets/img/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="assets/img/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="assets/img/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="assets/img/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="assets/img/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="assets/img/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="assets/img/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="assets/img/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="assets/img/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="assets/img/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="assets/img/favicons/manifest.json">
-    <link rel="shortcut icon" href="assets/img/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="/assets/img/favicons/manifest.json">
+    <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
     <!-- CSS stylesheets -->
-    <link href="assets/css/style.css?v=5" rel="stylesheet">
+    <link href="/assets/css/style.css?v=5" rel="stylesheet">
   </head>
 
   <body data-spy="scroll" data-target="#navbar">
diff --git a/index.html b/index.html
index 62490547..1f260caa 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,8 @@ layout: default
 
   {% include sections/quotes.html %}
 
+  {% include sections/warrant-canary.html %}
+
   {% include sections/privacy-resources.html %}
 
   {% include sections/participate.html %}
diff --git a/browsers.html b/pages/browsers.html
similarity index 93%
rename from browsers.html
rename to pages/browsers.html
index c1d44a64..f54e9f8e 100644
--- a/browsers.html
+++ b/pages/browsers.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /browsers/
 ---
 
 <div class="container" role="main">
diff --git a/os.html b/pages/os.html
similarity index 91%
rename from os.html
rename to pages/os.html
index 5a90f1b2..8ab52d5b 100644
--- a/os.html
+++ b/pages/os.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /operating-systems/
 ---
 
 <div class="container" role="main">
diff --git a/pages/providers/dns.html b/pages/providers/dns.html
new file mode 100644
index 00000000..4b3e216a
--- /dev/null
+++ b/pages/providers/dns.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/dns/
+---
+
+<div class="container" role="main">
+
+{% include sections/dns.html %}
+
+</div>
diff --git a/pages/providers/email.html b/pages/providers/email.html
new file mode 100644
index 00000000..e1ef33f3
--- /dev/null
+++ b/pages/providers/email.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/email/
+---
+
+<div class="container" role="main">
+
+{% include sections/email-providers.html %}
+
+</div>
diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html
new file mode 100644
index 00000000..bc304008
--- /dev/null
+++ b/pages/providers/hosting.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/hosting/
+---
+
+<div class="container" role="main">
+
+{% include sections/hosting-provider.html %}
+
+</div>
diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html
new file mode 100644
index 00000000..4e4e3dc5
--- /dev/null
+++ b/pages/providers/jurisdiction.html
@@ -0,0 +1,12 @@
+---
+layout: default
+permalink: /providers/jurisdictions/
+---
+
+<div class="container" role="main">
+
+{% include sections/fourteen-eyes.html %}
+
+{% include sections/key-disclosure-law.html %}
+
+</div>
diff --git a/pages/providers/paste.html b/pages/providers/paste.html
new file mode 100644
index 00000000..1690ae24
--- /dev/null
+++ b/pages/providers/paste.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/paste/
+---
+
+<div class="container" role="main">
+
+{% include sections/paste-services.html %}
+
+</div>
diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html
new file mode 100644
index 00000000..cb31a635
--- /dev/null
+++ b/pages/providers/search-engines.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/search-engines/
+---
+
+<div class="container" role="main">
+
+{% include sections/search-engines.html %}
+
+</div>
diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html
new file mode 100644
index 00000000..7cf474ad
--- /dev/null
+++ b/pages/providers/social-networks.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/social-networks/
+---
+
+<div class="container" role="main">
+
+{% include sections/social-networks.html %}
+
+</div>
diff --git a/pages/providers/storage.html b/pages/providers/storage.html
new file mode 100644
index 00000000..d8370edd
--- /dev/null
+++ b/pages/providers/storage.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/cloud-storage/
+---
+
+<div class="container" role="main">
+
+{% include sections/cloud-storage.html %}
+
+</div>
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
new file mode 100644
index 00000000..baab331d
--- /dev/null
+++ b/pages/providers/vpn.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /providers/vpn/
+---
+
+<div class="container" role="main">
+
+{% include sections/vpn.html %}
+
+</div>
diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html
new file mode 100644
index 00000000..ed0d3f50
--- /dev/null
+++ b/pages/software/cal-card.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/calendar-contacts/
+---
+
+<div class="container" role="main">
+
+{% include sections/calendar-contacts-sync.html %}
+
+</div>
diff --git a/pages/software/cloud.html b/pages/software/cloud.html
new file mode 100644
index 00000000..931820c0
--- /dev/null
+++ b/pages/software/cloud.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/cloud/
+---
+
+<div class="container" role="main">
+
+{% include sections/selfhosted-cloud.html %}
+
+</div>
diff --git a/pages/software/email.html b/pages/software/email.html
new file mode 100644
index 00000000..22b4b8c2
--- /dev/null
+++ b/pages/software/email.html
@@ -0,0 +1,12 @@
+---
+layout: default
+permalink: /software/email/
+---
+
+<div class="container" role="main">
+
+{% include sections/email-clients.html %}
+
+{% include sections/email-alternatives.html %}
+
+</div>
diff --git a/pages/software/encryption.html b/pages/software/encryption.html
new file mode 100644
index 00000000..1a95c7e3
--- /dev/null
+++ b/pages/software/encryption.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/encryption-tools/
+---
+
+<div class="container" role="main">
+
+{% include sections/file-encryption.html %}
+
+</div>
diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html
new file mode 100644
index 00000000..4062eaf5
--- /dev/null
+++ b/pages/software/file-sharing.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/file-sharing/
+---
+
+<div class="container" role="main">
+
+{% include sections/file-sharing.html %}
+
+</div>
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
new file mode 100644
index 00000000..a96043f6
--- /dev/null
+++ b/pages/software/file-sync.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/file-sync/
+---
+
+<div class="container" role="main">
+
+{% include sections/file-sync.html %}
+
+</div>
diff --git a/pages/software/im.html b/pages/software/im.html
new file mode 100644
index 00000000..4be25845
--- /dev/null
+++ b/pages/software/im.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/im/
+---
+
+<div class="container" role="main">
+
+{% include sections/instant-messenger.html %}
+
+</div>
diff --git a/pages/software/networks.html b/pages/software/networks.html
new file mode 100644
index 00000000..315c08eb
--- /dev/null
+++ b/pages/software/networks.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/networks/
+---
+
+<div class="container" role="main">
+
+{% include sections/self-contained-networks.html %}
+
+</div>
diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html
new file mode 100644
index 00000000..ef0d484a
--- /dev/null
+++ b/pages/software/notebooks.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/notebooks/
+---
+
+<div class="container" role="main">
+
+{% include sections/notebooks.html %}
+
+</div>
diff --git a/pages/software/passwords.html b/pages/software/passwords.html
new file mode 100644
index 00000000..df109e78
--- /dev/null
+++ b/pages/software/passwords.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/passwords/
+---
+
+<div class="container" role="main">
+
+{% include sections/password-managers.html %}
+
+</div>
diff --git a/pages/software/productivity.html b/pages/software/productivity.html
new file mode 100644
index 00000000..4e6d0c79
--- /dev/null
+++ b/pages/software/productivity.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/productivity/
+---
+
+<div class="container" role="main">
+
+{% include sections/productivity-tools.html %}
+
+</div>
diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html
new file mode 100644
index 00000000..3d74f012
--- /dev/null
+++ b/pages/software/video-voice.html
@@ -0,0 +1,10 @@
+---
+layout: default
+permalink: /software/voip/
+---
+
+<div class="container" role="main">
+
+{% include sections/voice-video-messenger.html %}
+
+</div>
diff --git a/providers.html b/providers.html
deleted file mode 100644
index 69fb0fca..00000000
--- a/providers.html
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: default
----
-
-<div class="container" role="main">
-
-{% include sections/fourteen-eyes.html %}
-
-{% include sections/key-disclosure-law.html %}
-
-{% include sections/vpn.html %}
-
-{% include sections/email-providers.html %}
-
-{% include sections/warrant-canary.html %}
-
-{% include sections/cloud-storage.html %}
-
-{% include sections/social-networks.html %}
-
-{% include sections/dns.html %}
-
-{% include sections/search-engines.html %}
-
-{% include sections/hosting-provider.html %}
-
-</div>
diff --git a/software.html b/software.html
deleted file mode 100644
index 8399fd05..00000000
--- a/software.html
+++ /dev/null
@@ -1,35 +0,0 @@
----
-layout: default
----
-
-<div class="container" role="main">
-
-{% include sections/email-clients.html %}
-
-{% include sections/email-alternatives.html %}
-
-{% include sections/instant-messenger.html %}
-
-{% include sections/voice-video-messenger.html %}
-
-{% include sections/file-sharing.html %}
-
-{% include sections/selfhosted-cloud.html %}
-
-{% include sections/file-sync.html %}
-
-{% include sections/password-managers.html %}
-
-{% include sections/calendar-contacts-sync.html %}
-
-{% include sections/file-encryption.html %}
-
-{% include sections/self-contained-networks.html %}
-
-{% include sections/notebooks.html %}
-
-{% include sections/paste-services.html %}
-
-{% include sections/productivity-tools.html %}
-
-</div>