[git] gnupg-doc - branch, master, updated. 797c15a5758775d5d5022cc8cb8e4642bdabeb89

[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  797c15a5758775d5d5022cc8cb8e4642bdabeb89 (commit)
      from  0968808af5bf30458796921ad32e3c0abaa354f5 (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 797c15a5758775d5d5022cc8cb8e4642bdabeb89
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 19 10:34:32 2014 +0100

    web: Various changes.
    
    --

diff --git a/web/download/index.org b/web/download/index.org
index ede8133..a0ec6aa 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -101,7 +101,7 @@
    |---------+--------------------+---------------------------------------------|
    |         | <18>               |                                             |
    | Windows | [[http://gpg4win.org/download.html][Gpg4win]]            | Installers for /GnuPG stable/               |
-   |         | {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG modern/         |
+   |         | ---                | Simple installer for /GnuPG modern/         |
    |         | {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG classic/        |
    | OS X    | [[http://gpgtools.org][Mac GPG]]            | Installer from the gpgtools project         |
    | Debian  | [[https://www.debian.org][Debian site]]        | GnuPG stable and classic are part of Debian |
@@ -111,5 +111,6 @@
    | RISC OS | [[http://www.sbellon.de/gnupg.html][home page]]          | Sources and  binaries for RISC OS           |
    |---------+--------------------+---------------------------------------------|
 
+#  |         | {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG modern/         |
 
 # eof #
diff --git a/web/download/integrity_check.org b/web/download/integrity_check.org
index 7d70c7c..6bbdfb9 100644
--- a/web/download/integrity_check.org
+++ b/web/download/integrity_check.org
@@ -18,7 +18,7 @@
   this command:
 
   {{{begin_example}}}
-  gpg {{{twodashes}}}verify gnupg-{{{gnupg_ver}}}.tar.bz2.sig
+  gpg {{{twodashes}}}verify gnupg-{{{gnupg_ver}}}.tar.bz2.sig gnupg-{{{gnupg_ver}}}.tar.bz2
   {{{end_example}}}
 
   This checks whether the signature file matches the source file. You
diff --git a/web/faq/whats-new-in-2.1.org b/web/faq/whats-new-in-2.1.org
index e5e6f71..bc312da 100644
--- a/web/faq/whats-new-in-2.1.org
+++ b/web/faq/whats-new-in-2.1.org
@@ -553,16 +553,23 @@ used.  Take care: GnuPG versions before 2.1 will always use the
 keybox file.
 
 To convert an existing =pubring.gpg= file to the keybox format, you
-first rename the file to (for example) =publickeys= so it won’t be
-recognized by any GnuPG version and then you run the command
+first backup the ownertrust values, then rename the file to (for
+example) =publickeys=, so it won’t be recognized by any GnuPG version,
+then run import, and finally restore the ownertrust values:
 
 #+begin_example
+$ cd ~/.gnupg
+$ gpg --export-ownertrust >otrust.lst
+$ mv pubring.gpg publickeys
 $ gpg2 --import publickeys
+$ gpg2 --import-ownertrust otrust.lst
 #+end_example
 
 You may then rename the =publickeys= file back so that it can be used
 by older GnuPG versions.  Remember that in this case you have two
-independent copies of the public keys.
+independent copies of the public keys.  The ownertrust values are kept
+by all gpg versions in the file =trustdb.gpg= but the above
+precautions need to be taken to keep them over an import.
 
 
 ** Auto-generated revocation certificates
diff --git a/web/swdb.mac b/web/swdb.mac
index 1279c6d..05ab0df 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -49,9 +49,9 @@
 #
 # GPA
 #
-#+macro: gpa_ver  0.9.5
-#+macro: gpa_size 716k
-#+macro: gpa_sha1 ea53b934a7f5dd4e2dfb35dac2b35cafc7b54c90
+#+macro: gpa_ver  0.9.6
+#+macro: gpa_size 718k
+#+macro: gpa_sha1 c664409c7d423eccc1120fbd0d232108269c9797
 
 
 #
@@ -106,9 +106,9 @@
 #
 # LIBASSUAN
 #
-#+macro: libassuan_ver  2.1.2
+#+macro: libassuan_ver  2.1.3
 #+macro: libassuan_size 504k
-#+macro: libassuan_sha1 7aed69734ba64b63004107cada671b5861d332a4
+#+macro: libassuan_sha1 56ac91973c2818a91d4f16ed48265a2b5daf45d3
 
 
 #
@@ -126,6 +126,13 @@
 
 
 #
+# ADNS
+#
+#+macro: adns_ver  1.4-g10-4
+#+macro: adns_sha1 040aed033694aeb3a97b8e5d74b990d4cad6bc99
+
+
+#
 # zlib (mirrored at our server)
 #
 #+macro: zlib_ver     1.2.8

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

Summary of changes:
 web/download/index.org           |    3 ++-
 web/download/integrity_check.org |    2 +-
 web/faq/whats-new-in-2.1.org     |   13 ++++++++++---
 web/swdb.mac                     |   17 ++++++++++++-----
 4 files changed, 25 insertions(+), 10 deletions(-)


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