[git] gnupg-doc - branch, master, updated. 2a68ed22be1757a9aaa19f72688c877766917253

[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  2a68ed22be1757a9aaa19f72688c877766917253 (commit)
      from  fec49fa619e7d25c5bea7dc80afcd9f353fc5b3a (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 2a68ed22be1757a9aaa19f72688c877766917253
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Sep 19 19:40:53 2017 +0200

    web: Use a CC BY-SA 4.0 for the Verein pages.

diff --git a/web/copying.org b/web/copying.org
index 3e83d1a..cb556c1 100644
--- a/web/copying.org
+++ b/web/copying.org
@@ -32,7 +32,7 @@
    Foundation; either version 3 of the License, or (at your option)
    any later version.
 
-   If you wish to allow the use of your version of theses pages only
+   If you wish to allow the use of your version of these pages only
    under the terms of one of these licenses, indicate your decision by
    deleting the respective above paragraph.
 
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index e350294..9a719f2 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -334,9 +334,21 @@ string of the source file or nil if not available."
     (goto-char (point-min))
     (unless (search-forward "<!--disable-copyright-footer-->" nil t)
       (goto-char (point-max))
-      (insert "  <div id=\"cpyright\">
+      (if (string-prefix-p "verein/" htmlfile)
+          (insert "  <div id=\"cpyright\">
+    <a rel=\"license\" href=\"https://creativecommons.org/licenses/by-sa/4.0/\"
+      ><img alt=\"CC BY-SA 4.0\" style=\"border: 0\"
+            src=\"/share/cc-by-sa_80x15.png\"/></a> 
+    This web page is
+    Copyright 2017 GnuPG e.V. and licensed under a
+    <a rel=\"license\" href=\"https://creativecommons.org/licenses/by-sa/4.0/\"
+    >Creative Commons Attribution-ShareAlike 4.0 International License</a>.  See
+    <a href=\"/copying.html\">copying</a> for details.
+    Page <a href=\"" srcfile "\">source</a> last changed on " changed ".
+  </div>\n")
+          (insert "  <div id=\"cpyright\">
     <a rel=\"license\" href=\"https://creativecommons.org/licenses/by-sa/3.0/\"
-      ><img alt=\"CC-BY-SA 3.0\" style=\"border: 0\"
+      ><img alt=\"CC BY-SA 3.0\" style=\"border: 0\"
             src=\"/share/cc-by-sa_80x15.png\"/></a> 
     These web pages are
     Copyright 1998--2017 The GnuPG Project and licensed under a
@@ -344,7 +356,7 @@ string of the source file or nil if not available."
     >Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.  See
     <a href=\"/copying.html\">copying</a> for details.
     Page <a href=\"" srcfile "\">source</a> last changed on " changed ".
-  </div>\n"))
+  </div>\n")))
   (goto-char (point-max))
   (insert "</div>
 </div><!-- end wrapper -->

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

Summary of changes:
 web/copying.org     |  2 +-
 web/share/gpgweb.el | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)


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