[git] gnupg-doc - branch, master, updated. 450481c63872bf79f03399128070bff768fae5b0

[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  450481c63872bf79f03399128070bff768fae5b0 (commit)
       via  f89a36b71126c4912c904129d7cfe0910043d1ad (commit)
      from  47aa329b0ba798717e09a413f197ca6a0fc7e403 (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 450481c63872bf79f03399128070bff768fae5b0
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 22 18:32:15 2014 +0100

    web: Minor content changes.

diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index d477d69..9ab6e26 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -8,6 +8,7 @@ usage()
 Usage: $0 [OPTIONS]
 Options:
 	--force    Force re-creation of files.
+        --verbose  Run in verbose mode
         --test     Run in test environment
 EOF
     exit $1
@@ -15,6 +16,7 @@ EOF
 
 
 force=no
+verbose=no
 testmode=no
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -31,6 +33,9 @@ while [ $# -gt 0 ]; do
 	--force)
 	    force=yes
 	    ;;
+        --verbose)
+            verbose=yes
+            ;;
         --test)
             testmode=yes
             ;;
@@ -90,7 +95,7 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
      year=${file#$htdocs/donate/kudos-}
      year=${year%.html}
    fi
-   echo "processing $file" >&2
+   [ $verbose = yes ] && echo "processing $file" >&2
    [ -f "$file.tmp" ] && rm "$file.tmp"
    awk -F: -v year=$year -v donors="$donors" \
            -v monyear="$monyear" -v euro="$euro" -v euroyr="$euroyr" \
diff --git a/web/donate/index.org b/web/donate/index.org
index 793af3b..f4cc20b 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -42,6 +42,9 @@
   be listed on our [[https://www.gnupg.org/donate/kudos.html][thank you]] page you should indicate this by adding a
   comment of the form =List me as: NAME= to your donation.
 
+  If you like to donate Bitcoins you may use the [[https://www.wauland.de/en/donation.html#61][Wau Holland Stiftung]]
+  account too.
+
   If you represent a company, you may also enter into a support
   contract with [[https://g10code.com][g10^code]] or ask for other service options.
 
diff --git a/web/index.org b/web/index.org
index 7eaae07..b21c029 100644
--- a/web/index.org
+++ b/web/index.org
@@ -10,7 +10,7 @@ maintaining GnuPG so to keep it strong and secure against the ever
 increasing mass surveillance we need your support.  Until the end of
 November we received a total of 6584\thinsp\euro (~5500 net) donations
 for this year.  Along with the 18000\thinsp\euro net from the [[https://www.gnupg.org/blog/20140512-rewards-sent.html][Goteo
-campaign]] this paid for less less than 50% of the costs for one
+campaign]] this paid for less than 50% of the costs for one
 developer.
 
 #+BEGIN_HTML
@@ -31,9 +31,9 @@ style="width: 0%"><!--REPLACE-PROGRESS-PERCENT-->
 For a critical project of this size two experienced developers are
 required for proper operation.  This requires gross revenues of 120000
 Euro per year.  Unfortunately there is currently only one underpaid
-full time developer who is barely able to keep up with the work.
-Please help to secure the future of GnuPG and consider to [[file:donate/index.org][donate]] to
-this project [[file:donate/index.org][now]].
+full time developer who is barely able to keep up with the work; see
+this [[file:blog/20141214-gnupg-and-g10.org][blog entry]] for some backgound.  Please help to secure the
+future of GnuPG and consider to [[file:donate/index.org][donate]] to this project [[file:donate/index.org][now]].
 
 
 * The GNU Privacy Guard

commit f89a36b71126c4912c904129d7cfe0910043d1ad
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Dec 19 16:52:19 2014 +0100

    web: Move hover menu slightly up
    
    --
        This prevents the hover menu from closing when moving
        the mouse down over the border.

diff --git a/web/share/site.css b/web/share/site.css
index c2b816a..48815f3 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -279,7 +279,7 @@ nav ul li:hover ul.sub-menu {
     z-index: 99;
     border-radius: 0px;
     position: absolute;
-    top: 41px;
+    top: 39px;
     left: 0;
 }
 nav ul ul li {

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

Summary of changes:
 tools/mkkudos.sh     |    7 ++++++-
 web/donate/index.org |    3 +++
 web/index.org        |    8 ++++----
 web/share/site.css   |    2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)


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