[git] gnupg-doc - branch, master, updated. 18bc4dfa1e5a6b7dff10cf99422a5369053060d5

[by NIIBE Yutaka]

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  18bc4dfa1e5a6b7dff10cf99422a5369053060d5 (commit)
      from  727bb8e879cee3c372e49e4ea5b07ae652479d42 (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 18bc4dfa1e5a6b7dff10cf99422a5369053060d5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Aug 31 10:38:12 2015 +0900

    Fix guides and people.
    
    * web/documentation/guides.org: Add a link to Email Self-Defense.
    Fix the link to Japanese doc.
    
    * web/people/index.org: Fix the link to Gnuk and add a link to MEP.

diff --git a/web/documentation/guides.org b/web/documentation/guides.org
index e6ad3b3..e25aff7 100644
--- a/web/documentation/guides.org
+++ b/web/documentation/guides.org
@@ -79,8 +79,10 @@
 
 ** Other documents
 
+   The [[https://emailselfdefense.fsf.org/][Email Self-Defense]] site is an introduction with infographic.
+
    At [[http://kldp.org/~yong/misc/gnupg/][kldp.org]] you can find some Korean language information on GnuPG.
-   [[http://hp.vector.co.jp/authors/VA019487/][Japanese language documentation]] is also available.
+   [[http://gnupg.hclippr.com/][Japanese language documentation]] is also available.
 
    Julien Francoz, alias CoCoZ, wrote a guide for French users
    entitled [[http://francoz.net/doc/gpg/gpg.html][Utilisation de GnuPG]] , which covers the basic usage of
diff --git a/web/people/index.org b/web/people/index.org
index 85ea1ee..45c8d80 100644
--- a/web/people/index.org
+++ b/web/people/index.org
@@ -76,7 +76,7 @@
 
    Niibe is a long time free software hacker who joined the GnuPG
    project in 2011 and soon took over the development of the smartcard
-   related code.  He is also the person behind the [[https://fsij.org/gnuk][gnuk token]].
+   related code.  He is also the person behind the [[http://www.fsij.org/gnuk/][Gnuk Token]] and the [[http://www.gniibe.org/memo/development/gnuk/rng/please-more-and-more-mep.html][MEP game]].
    Niibe’s work on GnuPG is financially supported by g10^code.
 
    #+HTML: <p style="clear: both"/>

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

Summary of changes:
 web/documentation/guides.org | 4 +++-
 web/people/index.org         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


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