Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1 from theprivacyguide/master
Browse files Browse the repository at this point in the history
Update fork
  • Loading branch information
shifterovich2 authored Sep 14, 2017
2 parents e298d9b + 1ffba64 commit f929816
Show file tree
Hide file tree
Showing 19 changed files with 336 additions and 13 deletions.
1 change: 1 addition & 0 deletions compile/compile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
./compile_tutorial ../tutorials/understanding-cryptography
./compile_tutorial ../tutorials/creating-strong-passwords
./compile_tutorial ../tutorials/password-managers
./compile_tutorial ../tutorials/pgp
./compile_tutorial ../tutorials/threat-models
./compile_tutorial ../tutorials/email-client-privacy-comparison
2 changes: 1 addition & 1 deletion contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h1 class="page-header">Contact
<footer>
<div class="row">
<div class="col-lg-12">
<p><a href="transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p><a href="transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
<!-- /.row -->
Expand Down
2 changes: 1 addition & 1 deletion donate.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h2>Bitcoin address:</h2>
<footer>
<div class="row">
<div class="col-lg-12">
<p><a href="transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p><a href="transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
<!-- /.row -->
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ <h1 class="page-header">About
<footer>
<div class="row">
<div class="col-lg-12">
<p><a href="transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p><a href="transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
<!-- /.row -->
Expand Down
6 changes: 5 additions & 1 deletion transparency.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ <h2>Finance</h2>
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0%">$0/13</div>
</div>

<h2>License</h2>
<p>Since we don't believe in intellectual property, this work is available under the <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 Public Domain</a> license.</p>
<p>If you use our content, we'll appreciate if you credit this website, but won't sue you if you don't.</p>

<h2>Affiliation with providers</h2>
<p>We're not affiliated with providers in any way. It might occur that we mention some providers more often than other (we obviously don't mention many at all &mdash; it's not possible), but that's mostly just due to having experience with some providers. Adding more examples and generally increasing the provider diversity in tutorials is welcome and appreciated.</p>

Expand All @@ -132,7 +136,7 @@ <h2>Third-party content</h2>
<footer>
<div class="row">
<div class="col-lg-12">
<p><a href="transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p><a href="transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
<!-- /.row -->
Expand Down
18 changes: 17 additions & 1 deletion tutorials.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,22 @@ <h4>How forgetting passwords can be a good thing</h4>
</div>
</div>

<hr>

<div class="row">
<div class="col-md-7">
<a href="tutorials/pgp.html">
<img class="img-responsive tutorial_pic" src="img/cipher_73.jpg">
</a>
</div>
<div class="col-md-5">
<h3>PGP</h3>
<h4></h4>
<p></p>
<a class="btn btn-primary" href="tutorials/pgp.html">Read <span class="glyphicon glyphicon-chevron-right"></span></a>
</div>
</div>

<!-- /.row -->

<!-- <hr> -->
Expand Down Expand Up @@ -216,7 +232,7 @@ <h4>How forgetting passwords can be a good thing</h4>
<footer>
<div class="row">
<div class="col-lg-12">
<p><a href="transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p><a href="transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
<!-- /.row -->
Expand Down
2 changes: 1 addition & 1 deletion tutorials/choosing-a-vpn.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h2 class="subheading">How picking a good service can make the difference in kee
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/creating-strong-passwords.html
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ <h2 class="subheading"></h2>
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/email-client-privacy-comparison.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h2 class="subheading">
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/glossary.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ <h2 class="section-heading">Basic</h2>
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
Expand Down
Binary file added tutorials/img/communication_over_pgp_signed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tutorials/img/initial_contact_over_pgp_signed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tutorials/password-managers.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h2 class="subheading">How forgetting passwords can be a good thing
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">Copyright</a> &copy; The Privacy Guide 2017</p>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
Expand Down
180 changes: 180 additions & 0 deletions tutorials/pgp.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<!DOCTYPE html>
<!-- This file is based on a template created by Blackrock Digital LLC, licensed under the MIT license. More info: theprivacyguide.org/transparency.html -->
<html lang="en">

<head>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">

<title>PGP | The Privacy Guide </title>

<!-- Bootstrap Core CSS -->
<link href="/css/bootstrap.min.css" rel="stylesheet">

<!-- Theme CSS -->
<link href="css/clean-blog.min.css" rel="stylesheet">

<!-- Custom Fonts -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href='/fonts/lora.css' rel='stylesheet' type='text/css'>
<link href='/fonts/opensans.css' rel='stylesheet' type='text/css'>

<link rel="apple-touch-icon" sizes="57x57" href="/img/icons/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/img/icons/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/img/icons/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/img/icons/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/img/icons/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/img/icons/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/img/icons/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/img/icons/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/img/icons/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/img/icons/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/img/icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png">
<link rel="manifest" href="/img/icons/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/img/icons/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->

</head>

<body>

<!-- Navigation -->
<nav class="navbar navbar-default navbar-custom navbar-fixed-top">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
Menu <i class="fa fa-bars"></i>
</button>
<a class="navbar-brand" href="/index.html">The Privacy Guide</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/index.html">About</a>
</li>
<li>
<a href="/tutorials.html">Tutorials</a>
</li>
<li>
<a href="/transparency.html">Transparency</a>
</li>
<li>
<a href="/contact.html">Contact</a>
</li>
<li>
<a href="/donate.html">Donate</a>
</li>
<li>
<a href="glossary.html">Glossary</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>

<!-- Page Header -->
<!-- Set your background image for this header on the line below. -->
<header class="intro-header" style="background-color: black">
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="post-heading">
<h1>PGP</h1>
<h2 class="subheading">
</h2>
</div>
</div>
</div>
</div>
</header>

<!-- Post Content -->
<article>
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
---MARKDOWN GOES HERE---
</div>
</div>
</div>
</article>

<hr>

<!-- Footer -->
<footer>
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center">
<li>
<a href="https://twitter.com/theprivacyguide">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="/contact.html">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="/donate.html">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-heart fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="https://github.com/theprivacyguide/theprivacyguide.org/">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<p class="copyright text-muted"><a href="/transparency.html">CC0 Public Domain</a> &copy; The Privacy Guide 2017</p>
</div>
</div>
</div>
</footer>

<!-- jQuery -->
<script src="/js/jquery.js"></script>

<!-- Bootstrap Core JavaScript -->
<script src="/js/bootstrap.min.js"></script>

<!-- Theme JavaScript -->
<script src="js/clean-blog.min.js"></script>

</body>

</html>
Loading

0 comments on commit f929816

Please sign in to comment.