Merge branch 'master' of https://github.com/theprivacyguide/theprivac…

…yguide.org
privacytools · Sep 13, 2017 · cc51da6 · cc51da6
2 parents 2ffa418 + 68d0e9d
commit cc51da6
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 13 deletions.
diff --git a/contact.html b/contact.html
@@ -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 -->

diff --git a/donate.html b/donate.html
@@ -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 -->

diff --git a/index.html b/index.html
@@ -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 -->

diff --git a/transparency.html b/transparency.html
@@ -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>
 
@@ -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 -->

diff --git a/tutorials.html b/tutorials.html
@@ -232,7 +232,7 @@ <h4></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 -->

diff --git a/tutorials/choosing-a-vpn.html b/tutorials/choosing-a-vpn.html
@@ -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>

diff --git a/tutorials/creating-strong-passwords.html b/tutorials/creating-strong-passwords.html
@@ -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>

diff --git a/tutorials/email-client-privacy-comparison.html b/tutorials/email-client-privacy-comparison.html
@@ -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>

diff --git a/tutorials/glossary.html b/tutorials/glossary.html
@@ -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>

diff --git a/tutorials/password-managers.html b/tutorials/password-managers.html
@@ -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>

diff --git a/tutorials/threat-models.html b/tutorials/threat-models.html
@@ -160,7 +160,7 @@ <h2 class="subheading">Knowing your enemies
                             </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>

diff --git a/tutorials/understanding-cryptography.html b/tutorials/understanding-cryptography.html
@@ -159,7 +159,7 @@ <h2 class="subheading">Not repeating the WWII mistakes</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>

diff --git a/tutorials/understanding-vpns.html b/tutorials/understanding-vpns.html
@@ -159,7 +159,7 @@ <h2 class="subheading">How VPNs can provide security, privacy and Netflix to you
                             </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>
-Original file line number
+Diff line change
@@ Expand Up @@
                                 </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 @@