Merge pull request #77 from konklone/patch-1

Fixes a typo, links to CC0, updates a link to be https
This commit is contained in:
Joshua Tauberer 2014-06-23 14:15:33 -04:00
commit 0e8fe7f01d
1 changed files with 4 additions and 4 deletions

View File

@ -157,7 +157,7 @@ sudo setup/start.sh</pre>
<p>Mass electronic surveillance by governments revealed over the last year has spurred a new movement to <a href="http://redecentralize.org/">re-decentralize the web</a>: to empower individuals to be their own service providers again.</p> <p>Mass electronic surveillance by governments revealed over the last year has spurred a new movement to <a href="http://redecentralize.org/">re-decentralize the web</a>: to empower individuals to be their own service providers again.</p>
<p>Although the core protocal of email, <a href="http://www.faqs.org/rfcs/rfc821.html">SMTP</a>, is completely decentralized, in practice email has become highly centralized because it is so damn difficult to implement the dozens of modern protocols that surround it. </p> <p>Although the core protocol of email, <a href="http://www.faqs.org/rfcs/rfc821.html">SMTP</a>, is completely decentralized, in practice email has become highly centralized because it is so damn difficult to implement the dozens of modern protocols that surround it. </p>
<h2>A mail server in a box</h2> <h2>A mail server in a box</h2>
@ -182,11 +182,11 @@ sudo setup/start.sh</pre>
<p>Thank you to the contributors!</p> <p>Thank you to the contributors!</p>
<p>Mail-in-a-Box is dedicated to the public domain using CC0.</p> <p>Mail-in-a-Box is dedicated to the public domain using [CC0](https://creativecommons.org/publicdomain/zero/1.0/).</p>
<h2>Acknowledgements</h2> <h2>Acknowledgements</h2>
<p>This project was inspired in part by the <a href="http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/">"NSA-proof your email in 2 hours"</a> blog post by Drew Crawford, <a href="https://github.com/al3x/sovereign">Sovereign</a> by Alex Payne, and conversations with <a href="http://twitter.com/shevski" target="_blank">@shevski</a>, <a href="https://github.com/konklone" target="_blank">@konklone</a>, and <a href="https://github.com/gregelin" target="_blank">@GregElin</a>.</p> <p>This project was inspired in part by the <a href="http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/">"NSA-proof your email in 2 hours"</a> blog post by Drew Crawford, <a href="https://github.com/al3x/sovereign">Sovereign</a> by Alex Payne, and conversations with <a href="https://twitter.com/shevski" target="_blank">@shevski</a>, <a href="https://github.com/konklone" target="_blank">@konklone</a>, and <a href="https://github.com/gregelin" target="_blank">@GregElin</a>.</p>
<p>Mail-in-a-Box is similar to <a href="http://www.iredmail.org/">iRedMail</a>.</p> <p>Mail-in-a-Box is similar to <a href="http://www.iredmail.org/">iRedMail</a>.</p>
@ -234,4 +234,4 @@ sudo setup/start.sh</pre>
}) })
</script> </script>
</body> </body>
</html> </html>