[git] gnupg-doc - branch, master, updated. 937bd9095d6188ba07701a34c359f8e68b1ce7de

by Werner Koch cvs at cvs.gnupg.org
Fri Apr 25 20:15:09 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  937bd9095d6188ba07701a34c359f8e68b1ce7de (commit)
       via  e8e50922912301e89be51338e205aea277ee6c6d (commit)
       via  c7de58668118e05e9caef0a947ce2b1398cedc65 (commit)
       via  ef511dacf4738adb878dc9291b6b284732962d62 (commit)
      from  b31bfbd2a4cd81b95f69d2b246777a5fb078c05c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 937bd9095d6188ba07701a34c359f8e68b1ce7de
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Apr 15 16:40:48 2014 +0200

    web: add some logo images.

diff --git a/web/misc/gnupg-sticker-on-t61.jpg b/web/misc/gnupg-sticker-on-t61.jpg
new file mode 100644
index 0000000..9165a00
Binary files /dev/null and b/web/misc/gnupg-sticker-on-t61.jpg differ
diff --git a/web/misc/gnupg-sticker.jpg b/web/misc/gnupg-sticker.jpg
new file mode 100644
index 0000000..7915230
Binary files /dev/null and b/web/misc/gnupg-sticker.jpg differ
diff --git a/web/share/gnupg-lock-20x25tr.png b/web/share/gnupg-lock-20x25tr.png
new file mode 100644
index 0000000..a3a0658
Binary files /dev/null and b/web/share/gnupg-lock-20x25tr.png differ

commit e8e50922912301e89be51338e205aea277ee6c6d
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Apr 15 16:40:48 2014 +0200

    web: Add dummy rss file.

diff --git a/web/news.en.rss b/web/news.en.rss
new file mode 100644
index 0000000..f947dd5
--- /dev/null
+++ b/web/news.en.rss
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+<channel>
+<title>GnuPG.org</title>
+<link>http://www.gnupg.org/</link>
+<description>Latest news about GNU Privacy Guard encryption software.</description>
+<copyright>Copyright 1998--2014 The GnuPG Project</copyright>
+<lastBuildDate>Fri, 11 Apr 2014 10:00:00 GMT</lastBuildDate>
+<language>en</language>
+<managingEditor>wk at gnupg.org</managingEditor>
+<webMaster>webmaster at gnupg.org</webMaster>
+<generator>handcrafted</generator>
+<ttl>1200</ttl>
+<docs>http://feedvalidator.org/docs/rss2.html</docs>
+<image>
+  <url>http://www.gnupg.org/share/gnupg-lock-20x25tr.png</url>
+  <title>GnuPG.org</title>
+  <link>http://www.gnupg.org/</link>
+  <width>20</width><height>25</height>
+  <description>GnuPG's logo</description>
+</image>
+
+<item>
+  <title>GnuPG 1.4.16 released</title>
+  <pubDate>Wed, 18 Dec 2013 12:00:00 GMT</pubDate>
+  <author>Werner Koch <wk@gnupg.org></author>
+  <description>
+  Along with the publication of an interesting new side channel attack
+  by Genkin, Shamir, and Tromer we announce the availability of a new
+  stable GnuPG release to relieve this bug: Version 1.4.16 ...
+  </description>
+  <link>http://lists.gnupg.org/pipermail/gnupg-announce/2013q4/000337.html</link>
+  <guid isPermaLink="true">http://lists.gnupg.org/pipermail/gnupg-announce/2013q4/000337.html</guid>
+</item>
+
+</channel>
+</rss>
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 0d56fd8..ac152a4 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -31,7 +31,7 @@
 
    (aput 'org-publish-project-alist "gpgweb-other"
    '(:base-directory "."
-     :base-extension "jpg\\|png\\|css\\|txt"
+     :base-extension "jpg\\|png\\|css\\|txt\\|rss"
      :recursive t
      :publishing-directory "../stage"
      :publishing-function org-publish-attachment

commit c7de58668118e05e9caef0a947ce2b1398cedc65
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Mar 12 15:38:28 2014 +0100

    Remove support for Piwik and adjust privacy policy.
    
    This is for www.gnupg.org and blogs.gnupg.org.

diff --git a/misc/blog.gnupg.org/20131030-new-blog-first-post.html b/misc/blog.gnupg.org/20131030-new-blog-first-post.html
index 476781d..d1224b6 100644
--- a/misc/blog.gnupg.org/20131030-new-blog-first-post.html
+++ b/misc/blog.gnupg.org/20131030-new-blog-first-post.html
@@ -163,20 +163,5 @@
 			</tbody>
 		</table>
 
-		<!-- Piwik -->
-		<script type="text/javascript">
-			var _paq = _paq || [];
-			_paq.push(["trackPageView"]);
-			_paq.push(["enableLinkTracking"]);
-
-			(function() {
-			var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-			_paq.push(["setTrackerUrl", u+"piwik.php"]);
-			_paq.push(["setSiteId", "2"]);
-			var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-			g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-			})();
-		</script>
-		<!-- End Piwik Code -->
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20131105-securing-the-future-of-gnupg.html b/misc/blog.gnupg.org/20131105-securing-the-future-of-gnupg.html
index 879bc07..395f9d8 100644
--- a/misc/blog.gnupg.org/20131105-securing-the-future-of-gnupg.html
+++ b/misc/blog.gnupg.org/20131105-securing-the-future-of-gnupg.html
@@ -205,20 +205,5 @@
 			</tbody>
 		</table>
 
-		<!-- Piwik -->
-		<script type="text/javascript">
-			var _paq = _paq || [];
-			_paq.push(["trackPageView"]);
-			_paq.push(["enableLinkTracking"]);
-
-			(function() {
-			var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-			_paq.push(["setTrackerUrl", u+"piwik.php"]);
-			_paq.push(["setSiteId", "2"]);
-			var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-			g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-			})();
-		</script>
-		<!-- End Piwik Code -->
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20131113-friends-tell-friends-they-love-gnupg.html b/misc/blog.gnupg.org/20131113-friends-tell-friends-they-love-gnupg.html
index d090fc7..28ebe47 100644
--- a/misc/blog.gnupg.org/20131113-friends-tell-friends-they-love-gnupg.html
+++ b/misc/blog.gnupg.org/20131113-friends-tell-friends-they-love-gnupg.html
@@ -193,20 +193,5 @@
 			</tbody>
 		</table>
 
-		<!-- Piwik -->
-		<script type="text/javascript">
-			var _paq = _paq || [];
-			_paq.push(["trackPageView"]);
-			_paq.push(["enableLinkTracking"]);
-
-			(function() {
-			var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-			_paq.push(["setTrackerUrl", u+"piwik.php"]);
-			_paq.push(["setSiteId", "2"]);
-			var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-			g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-			})();
-		</script>
-		<!-- End Piwik Code -->
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20131213-preparing-for-launch.html b/misc/blog.gnupg.org/20131213-preparing-for-launch.html
index 64963bd..cd4769e 100644
--- a/misc/blog.gnupg.org/20131213-preparing-for-launch.html
+++ b/misc/blog.gnupg.org/20131213-preparing-for-launch.html
@@ -210,20 +210,5 @@
 			</tbody>
 		</table>
 
-		<!-- Piwik -->
-		<script type="text/javascript">
-			var _paq = _paq || [];
-			_paq.push(["trackPageView"]);
-			_paq.push(["enableLinkTracking"]);
-
-			(function() {
-			var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-			_paq.push(["setTrackerUrl", u+"piwik.php"]);
-			_paq.push(["setSiteId", "2"]);
-			var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-			g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-			})();
-		</script>
-		<!-- End Piwik Code -->
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20131215-gcrypt-bench.html b/misc/blog.gnupg.org/20131215-gcrypt-bench.html
index f52e58f..4eab54c 100644
--- a/misc/blog.gnupg.org/20131215-gcrypt-bench.html
+++ b/misc/blog.gnupg.org/20131215-gcrypt-bench.html
@@ -324,21 +324,5 @@ for different buffer lengths.
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131218-getting-goteo-approval.html b/misc/blog.gnupg.org/20131218-getting-goteo-approval.html
index 9b76146..10901f9 100644
--- a/misc/blog.gnupg.org/20131218-getting-goteo-approval.html
+++ b/misc/blog.gnupg.org/20131218-getting-goteo-approval.html
@@ -187,21 +187,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.de.html b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.de.html
index 05de71f..26f60e7 100644
--- a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.de.html
+++ b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.de.html
@@ -189,21 +189,5 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.es.html b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.es.html
index 2802b06..2e058d3 100644
--- a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.es.html
+++ b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.es.html
@@ -236,21 +236,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.fr.html b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.fr.html
index a1d318c..9cee1fa 100644
--- a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.fr.html
+++ b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.fr.html
@@ -230,21 +230,5 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.html b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.html
index 4a0ea08..f36034c 100644
--- a/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.html
+++ b/misc/blog.gnupg.org/20131219-gnupg-launches-crowfunding.html
@@ -227,21 +227,5 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.html b/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.html
index 694a1c2..7f91df5 100644
--- a/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.html
+++ b/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.html
@@ -207,21 +207,6 @@ support.
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.ph.html b/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.ph.html
index fba2941..7dce99e 100644
--- a/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.ph.html
+++ b/misc/blog.gnupg.org/20131220-gnupg-turned-0x10.ph.html
@@ -161,21 +161,5 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/20131230-how-good-is-goteo.html b/misc/blog.gnupg.org/20131230-how-good-is-goteo.html
index 386355e..bbb5ece 100644
--- a/misc/blog.gnupg.org/20131230-how-good-is-goteo.html
+++ b/misc/blog.gnupg.org/20131230-how-good-is-goteo.html
@@ -220,21 +220,6 @@ Besides that, I spotted a few opportunities for improvement:
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20140127-find-fosdem.html b/misc/blog.gnupg.org/20140127-find-fosdem.html
index 30e9401..234b21b 100644
--- a/misc/blog.gnupg.org/20140127-find-fosdem.html
+++ b/misc/blog.gnupg.org/20140127-find-fosdem.html
@@ -162,21 +162,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/20140206-crowdfunding-complete.html b/misc/blog.gnupg.org/20140206-crowdfunding-complete.html
index c3b77a5..33ba7d3 100644
--- a/misc/blog.gnupg.org/20140206-crowdfunding-complete.html
+++ b/misc/blog.gnupg.org/20140206-crowdfunding-complete.html
@@ -173,21 +173,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/misc/blog.gnupg.org/entry.templ.html b/misc/blog.gnupg.org/entry.templ.html
index b66ba6d..9dbb7da 100644
--- a/misc/blog.gnupg.org/entry.templ.html
+++ b/misc/blog.gnupg.org/entry.templ.html
@@ -149,21 +149,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/index.html b/misc/blog.gnupg.org/index.html
index a6f8dc3..3d074b9 100644
--- a/misc/blog.gnupg.org/index.html
+++ b/misc/blog.gnupg.org/index.html
@@ -741,21 +741,5 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
-
 </body>
 </html>
diff --git a/misc/blog.gnupg.org/privacy-policy.en.html b/misc/blog.gnupg.org/privacy-policy.en.html
index 3ac5170..9b9dfe5 100644
--- a/misc/blog.gnupg.org/privacy-policy.en.html
+++ b/misc/blog.gnupg.org/privacy-policy.en.html
@@ -84,24 +84,9 @@
 
 <h2>Analytics</h2>
 
-   <p>This website uses Piwik, a Free Software web analytics system,
-   to monitor traffic on our Web sites. Piwik records the general
-   geographical vicinity of visitors as well as their browser and
-   operating system, and records their navigation within the
-   sites. This helps us gauge the impact of our materials and improve
-   our work.</p>
-
-   <p>Our Piwik system preserves privacy by anonymizing visitors' IP
-   addresses. This means that we will not store any personally
-   identifiable information about you, even though your visit produces
-   a record that our site was visited by someone.</p>
-
-   <p>Piwik also respects the "<a href="http://donottrack.us/"
-   target="blank">Do Not Track</a>" preference offered by some
-   browsers, so if you have this option set, Piwik will ignore your
-   visit entirely. Details of how Piwik protects privacy are
-   on <a href="http://piwik.org/privacy/" target="blank">their
-   website</a>.</p>
+   <p>Please see
+   the <a href="http://www.gnupg.org/privacy-policy.html">main page’s
+   privacy policy</a></p>
 
 <h2>Newsletter and email notifications</h2>
 
@@ -189,21 +174,6 @@
 </tbody>
 </table>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://alberti.gnupg.org/piwik/";
-  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-  _paq.push(["setSiteId", "2"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
 
 </body>
 </html>
diff --git a/web/index.org b/web/index.org
index e571fbb..34837a4 100644
--- a/web/index.org
+++ b/web/index.org
@@ -18,8 +18,8 @@ features for easy integration with other applications. A wealth of
 also provides support for S/MIME.
 
 GnuPG is [[http://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning that it respects your freedom). It can
-be freely used, modified and distributed under the terms of the [[http://www.gnu.org/copyleft/gpl.html][GNU
-General Public License]] .
+be freely used, modified and distributed under the terms of the
+[[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
 
 GnuPG comes in two flavours: [[download][{{{gnupg1_ver}}}]] is the well known and
 portable standalone version, whereas [[download][{{{gnupg_ver}}}]] is the enhanced
diff --git a/web/privacy-policy.org b/web/privacy-policy.org
index 6ba8b62..c3f4168 100644
--- a/web/privacy-policy.org
+++ b/web/privacy-policy.org
@@ -5,21 +5,27 @@
 * Privacy Policy
 #+index: privacy policy
 #+index: analytics
-#+index: Piwik
+#+index: log files
 
-** Analytics
+** Log files
 
-This website uses Piwik, a Free Software web analytics system, to
-monitor traffic on our Web sites. Piwik records the general
-geographical vicinity of visitors as well as their browser and
-operating system, and records their navigation within the sites. This
-helps us gauge the impact of our materials and improve our work.
+This website uses log files to identify problems with the site and to
+monitor traffic.  The raw log files are kept for a week and are then
+deleted.  For web analytics the data from the log files is anonymized
+by truncating the IP addresses to 40 bit for IPv6 and 20 bits for IPv4
+and send to another machine.  Neither the raw log files nor the
+anonymized data from the log file is shared with anyone; however
+system administrators have access to the log files to solve technical
+problems.  Reports on the use of this site will always be fully
+anonymized and may eventually be published at this site.
 
-Our Piwik system preserves privacy by anonymizing visitors’ IP
-addresses. This means that we will not store any personally
-identifiable information about you, even though your visit produces a
-record that our site was visited by someone.
+We have not been forced by any court order or other means not to obey
+to the above rules.
 
-Piwik also respects the “[[http://donottrack.us/][Do Not Track]]” preference offered by some
-browsers, so if you have this option set, Piwik will ignore your visit
-entirely. Details of how Piwik protects privacy are on [[http://piwik.org/privacy/][their website]].
+** History
+
+- 2013-11-07 :: Installed Piwik web analytics software and wrote a
+                privacy policy.
+
+- 2014-03-12 :: Removed the Piwik web analytics software and changed
+                the policy to allow for log file based analytics.
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 930df34..0d56fd8 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -126,38 +126,43 @@
       ><img alt=\"CC-BY-SA 3.0\" style=\"border: 0\"
             src=\"/share/cc-by-sa-3.0_80x15.png\"/></a><br/>
     These web pages are
-    Copyright 1998--2013 The GnuPG Project<a href=\"/copying.html\">¹</a>
+    Copyright 1998--2014 The GnuPG Project<a href=\"/copying.html\">¹</a>
     and licensed under a
     <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-sa/3.0/\"
     >Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.  See
-    <a href=\"/copying.html\">copying<a/> for details.
-</div>"))
-  (goto-char (point-max))
-  (insert "
+    <a href=\"/copying.html\">copying</a> for details.
+</div>
 </main>
-<script type=\"text/javascript\">
-  var _paq = _paq || [];
-  _paq.push([\"trackPageView\"]);
-  _paq.push([\"enableLinkTracking\"]);
-
-  (function() {
-    var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\")
-            + \"://alberti.gnupg.org/piwik/\";
-    _paq.push([\"setTrackerUrl\", u+\"piwik.php\"]);
-    _paq.push([\"setSiteId\", \"1\"]);
-    var d=document,
-        g=d.createElement(\"script\"),
-        s=d.getElementsByTagName(\"script\")[0];
-    g.type=\"text/javascript\";
-    g.defer=true;
-    g.async=true;
-    g.src=u+\"piwik.js\";
-    s.parentNode.insertBefore(g,s);
-  })();
-</script>
 </body>
-</html>
-"))
+</html>")))
+
+
+;;; The old pwik code.
+;;;  (insert "
+;;;<script type=\"text/javascript\">
+;;;  var _paq = _paq || [];
+;;;  _paq.push([\"trackPageView\"]);
+;;;  _paq.push([\"enableLinkTracking\"]);
+;;;
+;;;  (function() {
+;;;    var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\")
+;;;            + \"://alberti.gnupg.org/piwik/\";
+;;;    _paq.push([\"setTrackerUrl\", u+\"piwik.php\"]);
+;;;    _paq.push([\"setSiteId\", \"1\"]);
+;;;    var d=document,
+;;;        g=d.createElement(\"script\"),
+;;;        s=d.getElementsByTagName(\"script\")[0];
+;;;    g.type=\"text/javascript\";
+;;;    g.defer=true;
+;;;    g.async=true;
+;;;    g.src=u+\"piwik.js\";
+;;;    s.parentNode.insertBefore(g,s);
+;;;  })();
+;;;</script>
+;;;</main>
+;;;</body>
+;;;</html>
+;;;")
 
 ;;; Post-process the generated HTML file:
 ;;;

commit ef511dacf4738adb878dc9291b6b284732962d62
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Feb 28 14:56:19 2014 +0100

    web: Remove file: scheme from relative links.
    
    Due to a regression in org-mode, links in the form
    
      file:../foo/bar.org::a
    
    were rendered as
    
      <a href="file:///home/user/project/foo/bar.html">
    
    and editing such a link always expanded it to an absolute name.  The
    workaround I found is to leave out the file: scheme and use
    
      ../foo/bar.org::a
    
    instead.  This works as expected and creates
    
      <a href="../foo/bar.html#a">

diff --git a/web/aegypten/index.org b/web/aegypten/index.org
index 07709df..97d6987 100644
--- a/web/aegypten/index.org
+++ b/web/aegypten/index.org
@@ -78,7 +78,7 @@ Detailed list of results:
 
 ** Links
 
-   - *[[file:~/s/gnupg-web/web/aegypten2/index.org][Ägypten2 Project]]*
+   - *[[../aegypten2/index.org][Ägypten2 Project]]*
    - [[http://kmail.kde.org/][KMail]]
    - [[http://www.mutt.org/][Mutt]]
    - [[http://www.gnupg.org/][GnuPG]]
diff --git a/web/aegypten2/index.org b/web/aegypten2/index.org
index ccd128a..b2d3715 100644
--- a/web/aegypten2/index.org
+++ b/web/aegypten2/index.org
@@ -10,7 +10,7 @@
   frame as Ägypten1, started December 1st 2003 and finished in
   November 2004.
 
-  Please read the [[file:~/s/gnupg-web/web/aegypten/index.org][Ägypten1 Web-Pages]] to learn about the project that
+  Please read the [[../aegypten/index.org][Ägypten1 Web-Pages]] to learn about the project that
   initially estabslished the Sphinx (S/MIME) awareness of the MUAs
   KMail and Mutt.
 
diff --git a/web/documentation/guides.org b/web/documentation/guides.org
index 87e1d28..e6ad3b3 100644
--- a/web/documentation/guides.org
+++ b/web/documentation/guides.org
@@ -33,7 +33,7 @@
      [[../../gph/it/gph.tar.gz][it]] ·
      [[http://www.inar.ru/~zwon/gph.tar.gz][ru]] )
 
-   GPH is also available in the [[file:~/s/gnupg-web/web/download/cvs_access.org][source repository]].
+   GPH is also available in the [[../download/cvs_access.org][source repository]].
 
    There is also a [[http://geocities.yahoo.com.br/sdiasneto/gnupg/gnupg-manual-ptbr.html][brazilian portuguese version of GPH]].
 
diff --git a/web/documentation/howtos.org b/web/documentation/howtos.org
index a1b9f24..cd6b2e6 100644
--- a/web/documentation/howtos.org
+++ b/web/documentation/howtos.org
@@ -58,7 +58,7 @@
    - as one big HTML file ( [[../howtos/card-howto/en/smartcard-howto-single.html][en]] )
    - as plain text ( [[../howtos/card-howto/en/smartcard-howto.txt][en]] )
 
-   This smartcard howto is also available in the [[file:~/s/gnupg-web/web/download/cvs_access.org][source repository]].
+   This smartcard howto is also available in the [[../download/cvs_access.org][source repository]].
 
 ** PGP5-GnuPG HOWTO
 
diff --git a/web/related_software/libassuan/index.org b/web/related_software/libassuan/index.org
index a660076..31b62eb 100644
--- a/web/related_software/libassuan/index.org
+++ b/web/related_software/libassuan/index.org
@@ -42,4 +42,4 @@
   almost any transaction based environment with non-persistent
   servers.
 
-  See the [[file:~/s/gnupg-web/web/download/index.org::libassuan][download]] section for the latest tarball.
+  See the [[../../download/index.org::libassuan][download]] section for the latest tarball.
diff --git a/web/related_software/libgpg-error/index.org b/web/related_software/libgpg-error/index.org
index 78f14e3..f467f80 100644
--- a/web/related_software/libgpg-error/index.org
+++ b/web/related_software/libgpg-error/index.org
@@ -8,4 +8,4 @@
   GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard Daemon
   and possibly more in the future.
 
-  See the [[file:~/s/gnupg-web/web/download/index.org::libgpg-error][download]] section for the latest tarball.
+  See the [[file:../../download/index.org::libgpg-error][download]] section for the latest tarball.
diff --git a/web/related_software/libksba/index.org b/web/related_software/libksba/index.org
index b25e6c4..02d9a16 100644
--- a/web/related_software/libksba/index.org
+++ b/web/related_software/libksba/index.org
@@ -15,4 +15,4 @@
   hides this by providing just one API which does the Right
   Thing\trade. Support for new features will be added as needed.
 
-  See the [[file:~/s/gnupg-web/web/download/index.org::libksba][download]] section for the latest tarball.
+  See the [[../../download/index.org::libksba][download]] section for the latest tarball.
diff --git a/web/related_software/pinentry/index.org b/web/related_software/pinentry/index.org
index 0f258d3..b4c14f2 100644
--- a/web/related_software/pinentry/index.org
+++ b/web/related_software/pinentry/index.org
@@ -8,4 +8,4 @@
   versions for the common GTK and Qt toolkits as well as for the text
   terminal (Curses).
 
-  See the [[file:~/s/gnupg-web/web/download/index.org::pinentry][download]] section for the latest tarball.
+  See the [[../../download/index.org::pinentry][download]] section for the latest tarball.
diff --git a/web/related_software/swlist.org b/web/related_software/swlist.org
index d1c949a..927e0af 100644
--- a/web/related_software/swlist.org
+++ b/web/related_software/swlist.org
@@ -39,7 +39,7 @@ having to deal with GnuPG's command-line interface.
    :CUSTOM_ID: egd
    :END:
 
-Unices without a /dev/random should [[file:~/s/gnupg-web/web/download/index.org::egd][download]] and install
+Unices without a /dev/random should [[../../download/index.org::egd][download]] and install
 this Entropy Gathering Daemon.
 
 ** [[http://enigform.mozdev.org][enigform]] [Unix,Windows,OSX] MISC
@@ -184,7 +184,7 @@ handbooks for email and file encryption.
 
 Is a mail program for MAC OS X.
 
-** [[file:gpgme/index.org][GPGME]] [Unix,Windows,OSX] LIB
+** [[gpgme/index.org][GPGME]] [Unix,Windows,OSX] LIB
    :PROPERTIES:
    :CUSTOM_ID: gpgme
    :END:
@@ -362,7 +362,7 @@ PGP with GnuPG.
 
 Is a perl script to sign HTML pages.
 
-** [[file:pinentry/index.org][Pinentry]] [Unix,Windows,OSX] MISC
+** [[pinentry/index.org][Pinentry]] [Unix,Windows,OSX] MISC
    :PROPERTIES:
    :CUSTOM_ID: pinentry
    :END:

-----------------------------------------------------------------------

Summary of changes:
 .../20131030-new-blog-first-post.html              |   17 +-----
 .../20131105-securing-the-future-of-gnupg.html     |   17 +-----
 ...31113-friends-tell-friends-they-love-gnupg.html |   17 +-----
 .../20131213-preparing-for-launch.html             |   17 +-----
 misc/blog.gnupg.org/20131215-gcrypt-bench.html     |   16 -----
 .../20131218-getting-goteo-approval.html           |   15 -----
 .../20131219-gnupg-launches-crowfunding.de.html    |   16 -----
 .../20131219-gnupg-launches-crowfunding.es.html    |   15 -----
 .../20131219-gnupg-launches-crowfunding.fr.html    |   16 -----
 .../20131219-gnupg-launches-crowfunding.html       |   16 -----
 .../blog.gnupg.org/20131220-gnupg-turned-0x10.html |   15 -----
 .../20131220-gnupg-turned-0x10.ph.html             |   16 -----
 .../blog.gnupg.org/20131230-how-good-is-goteo.html |   17 +-----
 misc/blog.gnupg.org/20140127-find-fosdem.html      |   17 +-----
 .../20140206-crowdfunding-complete.html            |   17 +-----
 misc/blog.gnupg.org/entry.templ.html               |   15 -----
 misc/blog.gnupg.org/index.html                     |   16 -----
 misc/blog.gnupg.org/privacy-policy.en.html         |   36 +-----------
 web/aegypten/index.org                             |    2 +-
 web/aegypten2/index.org                            |    2 +-
 web/documentation/guides.org                       |    2 +-
 web/documentation/howtos.org                       |    2 +-
 web/index.org                                      |    4 +-
 web/misc/gnupg-sticker-on-t61.jpg                  |  Bin 0 -> 39986 bytes
 web/misc/gnupg-sticker.jpg                         |  Bin 0 -> 9785 bytes
 web/news.en.rss                                    |   37 ++++++++++++
 web/privacy-policy.org                             |   34 ++++++-----
 web/related_software/libassuan/index.org           |    2 +-
 web/related_software/libgpg-error/index.org        |    2 +-
 web/related_software/libksba/index.org             |    2 +-
 web/related_software/pinentry/index.org            |    2 +-
 web/related_software/swlist.org                    |    6 +-
 web/share/gnupg-lock-20x25tr.png                   |  Bin 0 -> 805 bytes
 web/share/gpgweb.el                                |   61 +++++++++++---------
 34 files changed, 113 insertions(+), 356 deletions(-)
 create mode 100644 web/misc/gnupg-sticker-on-t61.jpg
 create mode 100644 web/misc/gnupg-sticker.jpg
 create mode 100644 web/news.en.rss
 create mode 100644 web/share/gnupg-lock-20x25tr.png


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org




More information about the Gnupg-commits mailing list