[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnupg-commit-watchers
Subject:    [git] gnupg-doc - branch, master, updated. 5497a0beafeaf37aba4d6911973d961c52ec51f6
From:       cvs () cvs ! gnupg ! org (by Robert J !  Hansen)
Date:       2015-08-27 17:35:57
Message-ID: E1ZV0y4-0008LP-RE () lists ! gnupg ! org
[Download RAW message or body]

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  5497a0beafeaf37aba4d6911973d961c52ec51f6 (commit)
      from  053fe7bb40f3d9c4a857fc3172ebd504067a9d51 (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 5497a0beafeaf37aba4d6911973d961c52ec51f6
Author: Robert J. Hansen <rjh@sixdemonbag.org>
Date:   Thu Aug 27 13:35:44 2015 -0400

    Clarified license.

diff --git a/web/faq/gnupg-faq.org b/web/faq/gnupg-faq.org
index db0c7fa..4b1792c 100644
--- a/web/faq/gnupg-faq.org
+++ b/web/faq/gnupg-faq.org
@@ -44,14 +44,12 @@ purposes.
    :CUSTOM_ID: documentation_license
    :END:
 
-This document is  © 2012, Robert J. Hansen \
<[[mailto:rjh@sixdemonbag.org?subject=The%20GnuPG%20FAQ][rjh@sixdemonbag.org]]> and \
+This document is  © 2012-2015, Robert J. Hansen \
<[[mailto:rjh@sixdemonbag.org?subject=The%20GnuPG%20FAQ][rjh@sixdemonbag.org]]> and  \
A.M. Kuchling <[[mailto:amk@amk.ca?subject=The%20GnuPG%20FAQ][amk@amk.ca]]>. You are \
free to make use of this document  in accordance with the \
[[http://creativecommons.org/licenses/by-sa/3.0/][Creative Commons \
                Attribution-ShareAlike 3.0
-license]], with the exception of Randall Munroe's XKCD comic, which is
-released under terms of the \
[[http://creativecommons.org/licenses/by-nc/2.5/][Creative Commons \
                Attribution-NonCommercial
-2.5]] license; alternately, you may make use of it under terms of the
+license]]; alternately, you may make use of it under terms of the
 GNU General Public License (version 3 or, at your discretion, any
-later version), again excepting Mr. Munroe's works.
+later version).
 #+HTML:<!--disable-copyright-footer-->
 
 

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

Summary of changes:
 web/faq/gnupg-faq.org | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)


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


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits@gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits


[prev in list] [next in list] [prev in thread] [next in thread]