Merge branch 'master' of ssh://leap.se/leap_se

Conflicts:
	pages/about-us/partners/en.md

10 files changed, 21 insertions, 22 deletions

diff --git a/pages/about-us/news/2012/security-bingo/_table.html.haml b/pages/about-us/news/2012/security-bingo/_table.html.haml
index 9091b7b..1b90875 100644
--- a/pages/about-us/news/2012/security-bingo/_table.html.haml
+++ b/pages/about-us/news/2012/security-bingo/_table.html.haml
@@ -30,9 +30,9 @@
       %td #{link 'Cryptocat' => 'https://crypto.cat'}
     %tr
       %td Long Message
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'Gpg4win' => 'http://www.gpg4win.org/about.html'}
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'GPGMail' => 'https://www.gpgtools.org/gpgmail/index.html'}
-      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}, #{link 'Gpg4win' => 'http://www.gpg4win.org/about.html'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}, #{link 'GPGMail' => 'https://www.gpgtools.org/gpgmail/index.html'}
+      %td #{link 'Enigmail' => 'https://www.enigmail.net/'}
       %td
       %td #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'}
       %td
@@ -42,7 +42,7 @@
       %td Storage
       %td #{link 'DiskCryptor' => 'http://diskcryptor.net'}
       %td
-      %td #{link 'EncFS' => 'http://www.arg0.net/encfs'}, #{link 'eCryptfs' => 'http://ecryptfs.org/'}, #{link 'DMCrypt' => 'http://en.wikipedia.org/wiki/Dm-crypt'}
+      %td #{link 'EncFS' => 'http://www.arg0.net/encfs'}, #{link 'eCryptfs' => 'http://ecryptfs.org/'}, #{link 'DMCrypt' => 'https://en.wikipedia.org/wiki/Dm-crypt'}
       %td
       %td #{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'}
       %td #{link 'SafeWith.me' => 'https://SafeWith.me'}
@@ -89,9 +89,9 @@
       %td
     %tr
       %td Conference
-      %td{:colspan => 3} #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
+      %td{:colspan => 3} #{link 'Mumble' => 'http://mumble.info/'}
       %td
-      %td #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
+      %td #{link 'Mumble' => 'http://mumble.info/'}
       %td
     %tr
       %td Capture & Reporting
diff --git a/pages/about-us/news/2015/platform-oh-seven.md b/pages/about-us/news/2015/platform-oh-seven.md
index c6c1d31..9343892 100644
--- a/pages/about-us/news/2015/platform-oh-seven.md
+++ b/pages/about-us/news/2015/platform-oh-seven.md
@@ -1,4 +1,4 @@
-@title = "Platform release 7.0"
+@title = "Platform release 0.7"
 @author = 'Micah'
 @posted_at = '2015-06-11'
 @more = true
diff --git a/pages/about-us/partners/en.md b/pages/about-us/partners/en.md
index 01b0754..f6486e2 100644
--- a/pages/about-us/partners/en.md
+++ b/pages/about-us/partners/en.md
@@ -4,11 +4,11 @@
 
 <img src="/img/partners/thoughtworks.png">
 
-<b><a href="http://thoughtworks.com/">ThoughtWorks</a></b> is a privately owned global software delivery and products company with 2500 employees. ThoughtWorks has hired a team to work on various free software projects related to email security as part of their [[Pixelated Project => https://pixelated-project.org/]].
+<b><a href="https://thoughtworks.com/">ThoughtWorks</a></b> is a privately owned global software delivery and products company with 2500 employees. ThoughtWorks has hired a team to work on various free software projects related to email security as part of their [[Pixelated Project => https://pixelated-project.org/]].
 
 <img src="/img/partners/greenhost.png">
 
-<b><a href="http://greenhost.net/">Greenhost</a></b> is a Dutch company that has taken a lead in sustainable hosting, and also supports various projects in the fields of education, culture and journalism.
+<b><a href="https://greenhost.net/">Greenhost</a></b> is a Dutch company that has taken a lead in sustainable hosting, and also supports various projects in the fields of education, culture and journalism.
 
 ## Financial sponsors
 
@@ -18,7 +18,7 @@
 
 <img src="/img/partners/hivos.jpg">
 
-<b><a href="http://www.hivos.org/">Hivos International</a></b> international development organisation guided by humanist values. Together with local civil society organisations in developing countries, Hivos wants to contribute to a free, fair and sustainable world. A world in which all citizens – both women and men – have equal access to opportunities and resources for development and can participate actively and equally in decision-making processes that determine their lives, their society and their future.
+<b><a href="https://www.hivos.org/">Hivos International</a></b> international development organisation guided by humanist values. Together with local civil society organisations in developing countries, Hivos wants to contribute to a free, fair and sustainable world. A world in which all citizens – both women and men – have equal access to opportunities and resources for development and can participate actively and equally in decision-making processes that determine their lives, their society and their future.
 
 <img src="/img/partners/wallace.png">
 
@@ -40,7 +40,6 @@
 
 The Shuttleworth Foundation is dedicated to building an open knowledge society and a better future organized around open principles. To help us get there, we identify amazing people with innovative ideas, give them a fellowship grant, and multiply the money they put into their own project by a factor of ten or more.
 
-
 ## Early adopters of the LEAP Platform
 
 <b><a href="https://www.calyxinstitute.org/">Calyx Institute</a></b> is a research, education and legal support group devoted to researching and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the Internet. Calyx plans to be an early adopter of the [[LEAP platform => platform]].
@@ -51,5 +50,5 @@ The Shuttleworth Foundation is dedicated to building an open knowledge society a
 
 <b><a href="http://colnodo.apc.org/">Colnodo</a></b> is a Colombian NGO working to facilitate communications and the exchange of information, experience and expertise between Colombian organizations at all levels regarding issues such as human rights, environment, housing, the betterment of women’s lives and others. Colnodo has promoted and democratized the use of ICTs among social organizations and groups (women, the youth, indigenous groups, local communities, etc.) and has been a facilitator of governmental projects regarding the promotion of ICTs. One of its principles is to develop its services based on free open source software.
 
-<b><a http://www.codigodelsur.com/>CodigoDelSur</a></b> is a mobile app development and design company, having created over 70 apps for iOS and Android.
+<b><a href="http://www.codigodelsur.com/">CodigoDelSur</a></b> is a mobile app development and design company, having created over 70 apps for iOS and Android.
 
diff --git a/pages/docs/design/nicknym-draft.md b/pages/docs/design/nicknym-draft.md
index 9398a9f..e96ce96 100644
--- a/pages/docs/design/nicknym-draft.md
+++ b/pages/docs/design/nicknym-draft.md
@@ -85,7 +85,7 @@ There are a number of established methods for binding identifier to key:
 * [X.509 Certificate Authority System](https://en.wikipedia.org/wiki/X.509)
 * Trust on First Use (TOFU)
 * Mail-back Verification
-* [Web of Trust (WOT)](http://en.wikipedia.org/wiki/Web_of_trust)
+* [Web of Trust (WOT)](https://en.wikipedia.org/wiki/Web_of_trust)
 * [DNSSEC](https://en.wikipedia.org/wiki/Dnssec)
 * [Shared Secret](https://en.wikipedia.org/wiki/Socialist_millionaire)
 * [Network Perspective](http://convergence.io/)
@@ -156,7 +156,7 @@ For a long discussion of the simple thing, see [messaging list](https://moderncr
 
 **WebID and Mozilla Persona**
 
-What about [WebID](http://www.w3.org/wiki/WebID) or [Mozilla Persona](https://www.mozilla.org/en-US/persona/)? These are both interesting standards for cryptographically proving identify, so why do we need something new?
+What about [WebID](https://www.w3.org/wiki/WebID) or [Mozilla Persona](https://www.mozilla.org/en-US/persona/)? These are both interesting standards for cryptographically proving identify, so why do we need something new?
 
 These protocols, and the poorly conceived OpenID Connect, are designed to address a fundamentally different problem: authenticating a user to a website. The problem of authenticating users to one another requires a different architecture entirely. There are some similarities, however, and in the long run a Nicknym provider could also be a WebID and Mozilla Persona provider.
 
diff --git a/pages/docs/design/nicknym.md b/pages/docs/design/nicknym.md
index 3f94875..cb638ab 100644
--- a/pages/docs/design/nicknym.md
+++ b/pages/docs/design/nicknym.md
@@ -51,7 +51,7 @@ There are a number of established methods for binding identifier to key:
 * [X.509 Certificate Authority System](https://en.wikipedia.org/wiki/X.509)
 * Trust on First Use (TOFU)
 * Mail-back Verification
-* [Web of Trust (WOT)](http://en.wikipedia.org/wiki/Web_of_trust)
+* [Web of Trust (WOT)](https://en.wikipedia.org/wiki/Web_of_trust)
 * [DNSSEC](https://en.wikipedia.org/wiki/Dnssec)
 * [Shared Secret](https://en.wikipedia.org/wiki/Socialist_millionaire)
 * [Network Perspective](http://convergence.io/)
diff --git a/pages/docs/design/soledad.md b/pages/docs/design/soledad.md
index a0eeed4..d02ae7d 100644
--- a/pages/docs/design/soledad.md
+++ b/pages/docs/design/soledad.md
@@ -66,7 +66,7 @@ Related software
 
 [Firefox Sync](https://wiki.mozilla.org/Services/Sync) - A client-encrypted data sync from Mozilla, designed to securely synchronize bookmarks and other browser settings.
 
-[U1DB](http://pythonhosted.org/u1db/) - Similar API as Soledad, without encryption.
+[U1DB](https://pythonhosted.org/u1db/) - Similar API as Soledad, without encryption.
 
 Soledad protocol
 ===================================
diff --git a/pages/docs/platform/troubleshooting/tests.md b/pages/docs/platform/troubleshooting/tests.md
index b85c19d..383fe7b 100644
--- a/pages/docs/platform/troubleshooting/tests.md
+++ b/pages/docs/platform/troubleshooting/tests.md
@@ -50,16 +50,16 @@ In order to set up a monitoring node, you simply add a `monitor` service tag to
 
 After deploying, this node will regularly poll every node to ask for the status of various health checks. These health checks include the checks run with `leap test`, plus many others.
 
-We use [Nagios](http://www.nagios.org/) together with [Check MK agent](https://en.wikipedia.org/wiki/Check_MK) for running checks on remote hosts.
+We use [Nagios](https://www.nagios.org/) together with [Check MK agent](https://en.wikipedia.org/wiki/Check_MK) for running checks on remote hosts.
 
 One nagios installation will monitor all nodes in all your environments. You can log into the monitoring web interface via [https://DOMAIN/nagios3/](https://DOMAIN/nagios3/). The username is `nagiosadmin` and the password is found in the secrets.json file in your provider directory.
 Nagios will send out mails to the `contacts` address provided in `provider.json`.
 
 
-## Nagios Frontents
+## Nagios Frontends
 
 There are other ways to check and get notified by Nagios besides regularly checking the Nagios webinterface or reading email notifications. Check out the [Frontends (GUIs and CLIs)](http://exchange.nagios.org/directory/Addons/Frontends-%28GUIs-and-CLIs%29) on the Nagios project website.
-A recommended status tray application is [Nagstamon](https://nagstamon.ifw-dresden.de/), which is available for Linux, MacOS X and Windows. It can not only notify you of hosts/services failures, you can also acknoledge or recheck these with it.
+A recommended status tray application is [Nagstamon](https://nagstamon.ifw-dresden.de/), which is available for Linux, MacOS X and Windows. It can not only notify you of hosts/services failures, you can also acknowledge or recheck them.
 
 ### Log Monitoring
 
diff --git a/pages/docs/platform/tutorials/quick-start.md b/pages/docs/platform/tutorials/quick-start.md
index a92cc9d..e9e9172 100644
--- a/pages/docs/platform/tutorials/quick-start.md
+++ b/pages/docs/platform/tutorials/quick-start.md
@@ -267,7 +267,7 @@ If you prefer, you can initalize each node, one at a time:
 Deploy the LEAP platform to the nodes
 --------------------
 
-Now you should deploy the platform recipes to the nodes. [Deployment can take a while to run](http://xkcd.com/303/), especially on the first run, as it needs to update the packages on the new machine.
+Now you should deploy the platform recipes to the nodes. [Deployment can take a while to run](https://xkcd.com/303/), especially on the first run, as it needs to update the packages on the new machine.
 
 *Important notes:* currently nodes must be deployed in a certain order. The underlying couch database node(s) must be deployed first, and then all other nodes.
 
diff --git a/pages/docs/platform/tutorials/single-node-email.md b/pages/docs/platform/tutorials/single-node-email.md
index 872d1da..a126938 100644
--- a/pages/docs/platform/tutorials/single-node-email.md
+++ b/pages/docs/platform/tutorials/single-node-email.md
@@ -164,7 +164,7 @@ This will initialize the node "node1". When `leap node init` is run, you will be
 Deploy the LEAP platform to the nodes
 --------------------
 
-Now you should deploy the platform recipes to the node. [Deployment can take a while to run](http://xkcd.com/303/), especially on the first run, as it needs to update the packages on the new machine.
+Now you should deploy the platform recipes to the node. [Deployment can take a while to run](https://xkcd.com/303/), especially on the first run, as it needs to update the packages on the new machine.
 
     $ leap deploy
 
diff --git a/pages/docs/tech/hard-problems/pt.md b/pages/docs/tech/hard-problems/pt.md
index 50c0541..7bb0637 100644
--- a/pages/docs/tech/hard-problems/pt.md
+++ b/pages/docs/tech/hard-problems/pt.md
@@ -70,7 +70,7 @@ Esta abordagem é potencialmente eficaz contra os observadores externos na rede,
 
 No longo prazo, pretendemos trabalhar com outros grupos para criar novos padrões de protocolo de criptografia que podem ser tanto assíncronos quanto permitir o sigilo futuro:
 
-  * [Extensões para sigilo futuro para o OpenPGP](http://tools.ietf.org/html/draft-brown-pgp-pfs-03).
+  * [Extensões para sigilo futuro para o OpenPGP](https://tools.ietf.org/html/draft-brown-pgp-pfs-03).
   * [Handshake Diffie-Hellman triplo com curvas elípticas](https://whispersystems.org/blog/simplifying-otr-deniability/).
 
 ### Problema do grupo