[git] gnupg-doc - branch, master, updated. 6c4f98c634c734de5040615fa426a80011d44410

[by Werner Koch]

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  6c4f98c634c734de5040615fa426a80011d44410 (commit)
      from  07e10cc6b24f44d0c4f55c86a0e220f8b2e99214 (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 6c4f98c634c734de5040615fa426a80011d44410
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 7 22:09:33 2013 +0100

    Enable Piwik tracking and add a privacy-policy page.
    
    Actually I don't like this tracking stuff.  However, it is JS based
    and thus people who value their privacy won't enabled JS.  Eventually
    the Net will by anonymous by default.

diff --git a/web/download/release_notes.org b/web/download/release_notes.org
index 4961290..cf94abd 100644
--- a/web/download/release_notes.org
+++ b/web/download/release_notes.org
@@ -5,7 +5,7 @@
 
 * Release Notes
 
-  Please read the NEWS file for a more complete list. {{{gnupg_ver}}
+  Please read the NEWS file for a more complete list. {{{gnupg_ver}}}
   is the stable and modern version of GnuPG. (Version {{{gnupg1_ver}}}
   is from the old GnuPG-1 series, which is still maintained and useful
   on some platforms: It is smaller than versions from the GnuPG-2
diff --git a/web/index.org b/web/index.org
index 7f24358..0af4d6b 100644
--- a/web/index.org
+++ b/web/index.org
@@ -5,6 +5,8 @@
 * The GNU Privacy Guard
 #+index: GnuPG
 #+index: GPG
+#+index: Gpg4win
+#+index: GPGTools
 
 GnuPG is the [[http://www.gnu.org/][GNU project]]'s complete and free implementation of the
 OpenPGP standard as defined by [[http://www.ietf.org/rfc/rfc4880.txt][RFC4880]]. GnuPG allows to encrypt and
diff --git a/web/privacy-policy.org b/web/privacy-policy.org
new file mode 100644
index 0000000..6ba8b62
--- /dev/null
+++ b/web/privacy-policy.org
@@ -0,0 +1,25 @@
+#+TITLE: GnuPG - Privacy Policy
+#+STARTUP: showall indent
+#+SETUPFILE: "share/setup.inc"
+
+* Privacy Policy
+#+index: privacy policy
+#+index: analytics
+#+index: Piwik
+
+** Analytics
+
+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.
+
+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.
+
+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]].
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 67438e8..cee7bd8 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -107,6 +107,7 @@
         <li><a href=\"/misc/thanks.html\"        >Thanks</a></li>
         <li><a href=\"/misc/donations.html\"     >Donations</a></li>
       </ul>
+    <li><a href=\"/privacy-policy.html\"        >Privacy Policy</a></li>
     <li><a href=\"/sitemap.html\"               >Sitemap</a></li>
   </ul>
   </nav>
@@ -132,6 +133,26 @@
   (goto-char (point-max))
   (insert "
 </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\", \"6\"]);
+    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>
 "))

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

Summary of changes:
 web/download/release_notes.org |    2 +-
 web/index.org                  |    2 ++
 web/privacy-policy.org         |   25 +++++++++++++++++++++++++
 web/share/gpgweb.el            |   21 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 web/privacy-policy.org


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